From d9db5948098939cd8d4148b59cb24e6f938752bc Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 10 Feb 2020 15:16:27 -0800 Subject: [PATCH 1/3] Expose importModuleSpecifierEnding to protocol --- src/server/protocol.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/protocol.ts b/src/server/protocol.ts index 5fe3fbd0fa28b..b849c718d119e 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -3131,6 +3131,8 @@ namespace ts.server.protocol { */ readonly includeAutomaticOptionalChainCompletions?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; + /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ + readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly lazyConfiguredProjectsFromExternalProject?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; From 2f8c0bc9d681c0187ec4c2ec295bc91dabe322fc Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Wed, 19 Feb 2020 08:34:34 -0800 Subject: [PATCH 2/3] Update API baselines --- tests/baselines/reference/api/tsserverlibrary.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index dbc336fccce23..b0c810eeb896b 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -8527,6 +8527,8 @@ declare namespace ts.server.protocol { */ readonly includeAutomaticOptionalChainCompletions?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; + /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ + readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly lazyConfiguredProjectsFromExternalProject?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; From 9dc268bb65bc2e6280df2170a0105efb6df507e3 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Wed, 19 Feb 2020 08:41:32 -0800 Subject: [PATCH 3/3] Add explicit auto setting --- src/compiler/types.ts | 2 +- src/server/protocol.ts | 2 +- tests/baselines/reference/api/tsserverlibrary.d.ts | 4 ++-- tests/baselines/reference/api/typescript.d.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 32a36306a17d5..641b1b2e7f3c0 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -6629,7 +6629,7 @@ namespace ts { readonly includeCompletionsWithInsertText?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ - readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; + readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; } diff --git a/src/server/protocol.ts b/src/server/protocol.ts index b849c718d119e..5418f6ccce4a1 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -3132,7 +3132,7 @@ namespace ts.server.protocol { readonly includeAutomaticOptionalChainCompletions?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ - readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; + readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly lazyConfiguredProjectsFromExternalProject?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index b0c810eeb896b..87a0ef2017a50 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3259,7 +3259,7 @@ declare namespace ts { readonly includeCompletionsWithInsertText?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ - readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; + readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; } @@ -8528,7 +8528,7 @@ declare namespace ts.server.protocol { readonly includeAutomaticOptionalChainCompletions?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ - readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; + readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly lazyConfiguredProjectsFromExternalProject?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 8b600f90fdd41..f3bd48b312a81 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -3259,7 +3259,7 @@ declare namespace ts { readonly includeCompletionsWithInsertText?: boolean; readonly importModuleSpecifierPreference?: "auto" | "relative" | "non-relative"; /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */ - readonly importModuleSpecifierEnding?: "minimal" | "index" | "js"; + readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; }