wip

Author: Andy Hanson

src/compiler/moduleSpecifiers.ts

@@ -105,12 +105,10 @@ namespace ts.moduleSpecifiers {
 
         const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, moduleResolutionKind, addJsExtension);
         const fromPaths = paths && tryGetModuleNameFromPaths(removeFileExtension(relativeToBaseUrl), importRelativeToBaseUrl, paths);
-        if (fromPaths) {
-            return [fromPaths];
-        }
+        const nonRelative = fromPaths === undefined ? importRelativeToBaseUrl : fromPaths;
 
         if (preferences.importModuleSpecifierPreference === "non-relative") {
-            return [importRelativeToBaseUrl];
+            return [nonRelative];
         }
 
         if (preferences.importModuleSpecifierPreference !== undefined) Debug.assertNever(preferences.importModuleSpecifierPreference);
@@ -120,8 +118,8 @@ namespace ts.moduleSpecifiers {
         }
 
         // Prefer a relative import over a baseUrl import if it has fewer components.
-        const relativeFirst = countPathComponents(relativePath) < countPathComponents(importRelativeToBaseUrl);
-        return relativeFirst ? [relativePath, importRelativeToBaseUrl] : [importRelativeToBaseUrl, relativePath];
+        const relativeFirst = countPathComponents(relativePath) < countPathComponents(nonRelative);
+        return relativeFirst ? [relativePath, nonRelative] : [nonRelative, relativePath];
     }
 
     function countPathComponents(path: string): number {

tests/cases/fourslash/importNameCodeFix_preferRelativePathOverPathMapping.ts

@@ -0,0 +1,27 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /tsconfig.json
+////{
+////    "compilerOptions": {
+////        "baseUrl": "./src",
+////        "paths": {
+////            "features/*": ["features/*"]
+////        }
+////    }
+////}
+
+// @Filename: /src/features/feature1/file1.ts
+////foo;
+
+// @Filename: /src/features/feature1/file2.ts
+////export const foo = 0;
+
+goTo.file("/src/features/feature1/file1.ts");
+verify.importFixAtPosition([
+`import { foo } from "./file2";
+
+foo;`,
+`import { foo } from "features/feature1/file2";
+
+foo;`,
+]);