Account for JS file type-only exports

microsoft · Apr 18, 2023 · 5644a4f · Andarist · Apr 18, 2023 · JoshuaKGoldberg
1 parent e344ec8
commit 5644a4f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -2405,7 +2405,7 @@ export function getCompletionEntriesFromSymbols(
         }
 
         // When in a value location in a JS file, ignore symbols that definitely seem to be type-only
-        if (!isTypeOnlyLocation && isInJSFile(sourceFile) && !(symbol.flags & SymbolFlags.Value) && !isInJSFile(symbol.declarations?.[0]?.getSourceFile())) {
+        if (!isTypeOnlyLocation && isInJSFile(sourceFile) && symbolAppearsToBeTypeOnly(symbol)) {
             continue;
         }
 
@@ -2503,6 +2503,10 @@ export function getCompletionEntriesFromSymbols(
         // expressions are value space (which includes the value namespaces)
         return !!(allFlags & SymbolFlags.Value);
     }
+
+    function symbolAppearsToBeTypeOnly(symbol: Symbol): boolean {
+        return !(symbol.flags & SymbolFlags.Value) && (!isInJSFile(symbol.declarations?.[0]?.getSourceFile()) || !!(symbol.flags & SymbolFlags.Type));
+    }
 }
 
 function getLabelCompletionAtPosition(node: BreakOrContinueStatement): CompletionInfo | undefined {

diff --git a/tests/cases/fourslash/javascriptModulesTypeImportAsValue.ts b/tests/cases/fourslash/javascriptModulesTypeImportAsValue.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+// @allowJs: true
+
+// @Filename: types.js
+//// /**
+////  * @typedef {Object} Pet
+////  * @prop {string} name
+////  */
+//// module.exports = { a: 1 };
+
+// @Filename: app.js
+//// import { /**/ } from "./types"
+
+verify.completions({ marker: "", excludes: "Pet" });