Skip to content

Commit 2b875bb

Browse files
andrewbranchandrewbranch
committed
Rename option value
1 parent cdc1c9e commit 2b875bb

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/compiler/moduleSpecifiers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace ts.moduleSpecifiers {
1616
relativePreference:
1717
importModuleSpecifierPreference === "relative" ? RelativePreference.Relative :
1818
importModuleSpecifierPreference === "non-relative" ? RelativePreference.NonRelative :
19-
importModuleSpecifierPreference === "external-non-relative" ? RelativePreference.ExternalNonRelative :
19+
importModuleSpecifierPreference === "project-relative" ? RelativePreference.ExternalNonRelative :
2020
RelativePreference.Shortest,
2121
ending: getEnding(),
2222
};

‎src/compiler/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8149,7 +8149,7 @@ namespace ts {
81498149
readonly includeCompletionsForModuleExports?: boolean;
81508150
readonly includeAutomaticOptionalChainCompletions?: boolean;
81518151
readonly includeCompletionsWithInsertText?: boolean;
8152-
readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
8152+
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
81538153
/** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
81548154
readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
81558155
readonly allowTextChangesInNewFiles?: boolean;

‎src/server/protocol.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3217,7 +3217,7 @@ namespace ts.server.protocol {
32173217
* values, with insertion text to replace preceding `.` tokens with `?.`.
32183218
*/
32193219
readonly includeAutomaticOptionalChainCompletions?: boolean;
3220-
readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
3220+
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
32213221
/** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
32223222
readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
32233223
readonly allowTextChangesInNewFiles?: boolean;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3868,7 +3868,7 @@ declare namespace ts {
38683868
readonly includeCompletionsForModuleExports?: boolean;
38693869
readonly includeAutomaticOptionalChainCompletions?: boolean;
38703870
readonly includeCompletionsWithInsertText?: boolean;
3871-
readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
3871+
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
38723872
/** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
38733873
readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
38743874
readonly allowTextChangesInNewFiles?: boolean;
@@ -8984,7 +8984,7 @@ declare namespace ts.server.protocol {
89848984
* values, with insertion text to replace preceding `.` tokens with `?.`.
89858985
*/
89868986
readonly includeAutomaticOptionalChainCompletions?: boolean;
8987-
readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
8987+
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
89888988
/** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
89898989
readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
89908990
readonly allowTextChangesInNewFiles?: boolean;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3868,7 +3868,7 @@ declare namespace ts {
38683868
readonly includeCompletionsForModuleExports?: boolean;
38693869
readonly includeAutomaticOptionalChainCompletions?: boolean;
38703870
readonly includeCompletionsWithInsertText?: boolean;
3871-
readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
3871+
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
38723872
/** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
38733873
readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
38743874
readonly allowTextChangesInNewFiles?: boolean;

‎tests/cases/fourslash/fourslash.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ declare namespace FourSlashInterface {
610610
readonly includeCompletionsForModuleExports?: boolean;
611611
readonly includeInsertTextCompletions?: boolean;
612612
readonly includeAutomaticOptionalChainCompletions?: boolean;
613-
readonly importModuleSpecifierPreference?: "shortest" | "external-non-relative" | "relative" | "non-relative";
613+
readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
614614
readonly importModuleSpecifierEnding?: "minimal" | "index" | "js";
615615
}
616616
interface CompletionsOptions {

‎tests/cases/fourslash/server/importNameCodeFix_externalNonRelateive2.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ format.setOption("newline", "\n");
3030

3131
goTo.marker("internal2external");
3232
verify.importFixAtPosition([`import { shared } from "shared/constants";\n\nshared`], /*errorCode*/ undefined, {
33-
importModuleSpecifierPreference: "external-non-relative"
33+
importModuleSpecifierPreference: "project-relative"
3434
});
3535

3636
goTo.marker("internal2internal");
3737
verify.importFixAtPosition([`import { utils } from "./utils";\n\nutils`], /*errorCode*/ undefined, {
38-
importModuleSpecifierPreference: "external-non-relative"
38+
importModuleSpecifierPreference: "project-relative"
3939
});
4040

4141
goTo.marker("external2external");
4242
verify.importFixAtPosition([`import { shared } from "./constants";\n\nshared`], /*errorCode*/ undefined, {
43-
importModuleSpecifierPreference: "external-non-relative"
43+
importModuleSpecifierPreference: "project-relative"
4444
});

‎tests/cases/fourslash/server/importNameCodeFix_externalNonRelative1.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ format.setOption("newline", "\n");
4949

5050
goTo.marker("external");
5151
verify.importFixAtPosition([`import { Pkg2 } from "pkg-2/utils";\n\nPkg2`], /*errorCode*/ undefined, {
52-
importModuleSpecifierPreference: "external-non-relative"
52+
importModuleSpecifierPreference: "project-relative"
5353
});
5454

5555
goTo.marker("internal");
5656
verify.importFixAtPosition([`import { Pkg2 } from "../../utils";\n\nPkg2`], /*errorCode*/ undefined, {
57-
importModuleSpecifierPreference: "external-non-relative"
57+
importModuleSpecifierPreference: "project-relative"
5858
});

0 commit comments

Comments
 (0)