From 8819771fd12ad88ff7612419523c80a5b181742a Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Fri, 22 Apr 2022 16:15:05 -0700
Subject: [PATCH 1/2] Allow type keywords with the same names as other
 completions

---
 src/services/completions.ts                   |  4 +-
 ...rtProvider_namespaceSameNameAsIntrinsic.ts | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 42821f5dcccb5..d6af14e41a7c4 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -164,7 +164,7 @@ namespace ts.Completions {
         TypeAssertionKeywords,
         TypeKeywords,
         TypeKeyword,                    // Literally just `type`
-        Last = TypeKeywords
+        Last = TypeKeyword
     }
 
     const enum GlobalsSearch { Continue, Success, Fail }
@@ -552,7 +552,7 @@ namespace ts.Completions {
         if (keywordFilters !== KeywordCompletionFilters.None) {
             const entryNames = new Set(entries.map(e => e.name));
             for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
-                if (!entryNames.has(keywordEntry.name)) {
+                if (isTypeKeyword(stringToToken(keywordEntry.name)!) || !entryNames.has(keywordEntry.name)) {
                     insertSorted(entries, keywordEntry, compareCompletionEntries, /*allowDuplicates*/ true);
                 }
             }
diff --git a/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts b/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts
new file mode 100644
index 0000000000000..f4c6342f44ecd
--- /dev/null
+++ b/tests/cases/fourslash/server/autoImportProvider_namespaceSameNameAsIntrinsic.ts
@@ -0,0 +1,39 @@
+/// <reference path="../fourslash.ts" />
+
+// @Filename: /node_modules/fp-ts/package.json
+//// { "name": "fp-ts", "version": "0.10.4" }
+
+// @Filename: /node_modules/fp-ts/index.d.ts
+//// export * as string from "./lib/string";
+
+// @Filename: /node_modules/fp-ts/lib/string.d.ts
+//// export declare const fromString: (s: string) => string;
+//// export type SafeString = string;
+
+// @Filename: /package.json
+//// { "dependencies": { "fp-ts": "^0.10.4" } }
+
+// @Filename: /tsconfig.json
+//// { "compilerOptions": { "module": "commonjs" } }
+
+// @Filename: /index.ts
+//// type A = { name: string/**/ }
+
+goTo.marker("");
+verify.completions({
+  marker: "",
+  includes: [{
+    name: "string",
+    sortText: completion.SortText.GlobalsOrKeywords,
+  }, {
+    name: "string",
+    sortText: completion.SortText.AutoImportSuggestions,
+    source: "fp-ts",
+    sourceDisplay: "fp-ts",
+    hasAction: true,
+  }],
+  preferences: {
+    includeCompletionsForModuleExports: true,
+    allowIncompleteCompletions: true,
+  },
+});

From 4f82f7b198d7b194c5e0b43088c6e8780801aaa4 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Tue, 3 May 2022 10:46:34 -0700
Subject: [PATCH 2/2] Only add type keywords that are the same as other
 completions in type locations

---
 src/services/completions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index d6af14e41a7c4..eee800d1236b4 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -552,7 +552,7 @@ namespace ts.Completions {
         if (keywordFilters !== KeywordCompletionFilters.None) {
             const entryNames = new Set(entries.map(e => e.name));
             for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
-                if (isTypeKeyword(stringToToken(keywordEntry.name)!) || !entryNames.has(keywordEntry.name)) {
+                if (isTypeOnlyLocation && isTypeKeyword(stringToToken(keywordEntry.name)!) || !entryNames.has(keywordEntry.name)) {
                     insertSorted(entries, keywordEntry, compareCompletionEntries, /*allowDuplicates*/ true);
                 }
             }