Rename option value

Author: andrewbranch

src/compiler/moduleSpecifiers.ts

@@ -16,7 +16,7 @@ namespace ts.moduleSpecifiers {
             relativePreference:
                 importModuleSpecifierPreference === "relative" ? RelativePreference.Relative :
                 importModuleSpecifierPreference === "non-relative" ? RelativePreference.NonRelative :
-                importModuleSpecifierPreference === "external-non-relative" ? RelativePreference.ExternalNonRelative :
+                importModuleSpecifierPreference === "project-relative" ? RelativePreference.ExternalNonRelative :
                 RelativePreference.Shortest,
             ending: getEnding(),
         };

src/compiler/types.ts

@@ -8149,7 +8149,7 @@ namespace ts {
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
-        readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
+        readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
         readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
         readonly allowTextChangesInNewFiles?: boolean;

src/server/protocol.ts

@@ -3217,7 +3217,7 @@ namespace ts.server.protocol {
          * values, with insertion text to replace preceding `.` tokens with `?.`.
          */
         readonly includeAutomaticOptionalChainCompletions?: boolean;
-        readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
+        readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
         readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
         readonly allowTextChangesInNewFiles?: boolean;

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -3868,7 +3868,7 @@ declare namespace ts {
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
-        readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
+        readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
         readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
         readonly allowTextChangesInNewFiles?: boolean;
@@ -8984,7 +8984,7 @@ declare namespace ts.server.protocol {
          * values, with insertion text to replace preceding `.` tokens with `?.`.
          */
         readonly includeAutomaticOptionalChainCompletions?: boolean;
-        readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
+        readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
         readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
         readonly allowTextChangesInNewFiles?: boolean;

tests/baselines/reference/api/typescript.d.ts

@@ -3868,7 +3868,7 @@ declare namespace ts {
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
-        readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
+        readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
         readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
         readonly allowTextChangesInNewFiles?: boolean;

tests/cases/fourslash/fourslash.ts

@@ -610,7 +610,7 @@ declare namespace FourSlashInterface {
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeInsertTextCompletions?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
-        readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
+        readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         readonly importModuleSpecifierEnding?: "minimal" | "index" | "js";
     }
     interface CompletionsOptions {

tests/cases/fourslash/server/importNameCodeFix_externalNonRelateive2.ts

@@ -30,15 +30,15 @@ format.setOption("newline", "\n");
 
 goTo.marker("internal2external");
 verify.importFixAtPosition([`import { shared } from "shared/constants";\n\nshared`], /*errorCode*/ undefined, {
-  importModuleSpecifierPreference: "external-non-relative"
+  importModuleSpecifierPreference: "project-relative"
 });
 
 goTo.marker("internal2internal");
 verify.importFixAtPosition([`import { utils } from "./utils";\n\nutils`], /*errorCode*/ undefined, {
-  importModuleSpecifierPreference: "external-non-relative"
+  importModuleSpecifierPreference: "project-relative"
 });
 
 goTo.marker("external2external");
 verify.importFixAtPosition([`import { shared } from "./constants";\n\nshared`], /*errorCode*/ undefined, {
-  importModuleSpecifierPreference: "external-non-relative"
+  importModuleSpecifierPreference: "project-relative"
 });

tests/cases/fourslash/server/importNameCodeFix_externalNonRelative1.ts

@@ -49,10 +49,10 @@ format.setOption("newline", "\n");
 
 goTo.marker("external");
 verify.importFixAtPosition([`import { Pkg2 } from "pkg-2/utils";\n\nPkg2`], /*errorCode*/ undefined, {
-  importModuleSpecifierPreference: "external-non-relative"
+  importModuleSpecifierPreference: "project-relative"
 });
 
 goTo.marker("internal");
 verify.importFixAtPosition([`import { Pkg2 } from "../../utils";\n\nPkg2`], /*errorCode*/ undefined, {
-  importModuleSpecifierPreference: "external-non-relative"
+  importModuleSpecifierPreference: "project-relative"
 });