In JSDoc, resolve import types as values too (microsoft#26066)

sandersn · web-flow · commit a21ac115828c · 2018-07-31T11:07:06.000-07:00
* In JSDoc, resolve import types as values too This is something that we probably should have been doing for some time. Fixes microsoft#26049 * Fix whitespace lint
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -8189,7 +8189,7 @@ namespace ts {
         }
 
         function isJSDocTypeReference(node: Node): node is TypeReferenceNode {
-            return !!(node.flags & NodeFlags.JSDoc) && node.kind === SyntaxKind.TypeReference;
+            return !!(node.flags & NodeFlags.JSDoc) && (node.kind === SyntaxKind.TypeReference || node.kind === SyntaxKind.ImportType);
         }
 
         function checkNoTypeArguments(node: NodeWithTypeArguments, symbol?: Symbol) {
@@ -9462,7 +9462,7 @@ namespace ts {
                     links.resolvedSymbol = unknownSymbol;
                     return links.resolvedType = errorType;
                 }
-                const targetMeaning = node.isTypeOf ? SymbolFlags.Value : SymbolFlags.Type;
+                const targetMeaning = node.isTypeOf ? SymbolFlags.Value : node.flags & NodeFlags.JSDoc ? SymbolFlags.Value | SymbolFlags.Type : SymbolFlags.Type;
                 // TODO: Future work: support unions/generics/whatever via a deferred import-type
                 const innerModuleSymbol = resolveExternalModuleName(node, node.argument.literal);
                 if (!innerModuleSymbol) {
diff --git a/tests/baselines/reference/enumTagImported.symbols b/tests/baselines/reference/enumTagImported.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/jsdoc/type.js ===
+/** @typedef {import("./mod1").TestEnum} TE */
+/** @type {TE} */
+const test = 'add'
+>test : Symbol(test, Decl(type.js, 2, 5))
+
+/** @type {import("./mod1").TestEnum} */
+const tost = 'remove'
+>tost : Symbol(tost, Decl(type.js, 4, 5))
+
+=== tests/cases/conformance/jsdoc/value.js ===
+import { TestEnum } from "./mod1"
+>TestEnum : Symbol(TestEnum, Decl(value.js, 0, 8))
+
+/** @type {TestEnum} */
+const tist = TestEnum.ADD
+>tist : Symbol(tist, Decl(value.js, 2, 5))
+>TestEnum.ADD : Symbol(ADD, Decl(mod1.js, 1, 25))
+>TestEnum : Symbol(TestEnum, Decl(value.js, 0, 8))
+>ADD : Symbol(ADD, Decl(mod1.js, 1, 25))
+
+
+=== tests/cases/conformance/jsdoc/mod1.js ===
+/** @enum {string} */
+export const TestEnum = {
+>TestEnum : Symbol(TestEnum, Decl(mod1.js, 1, 12))
+
+    ADD: 'add',
+>ADD : Symbol(ADD, Decl(mod1.js, 1, 25))
+
+    REMOVE: 'remove'
+>REMOVE : Symbol(REMOVE, Decl(mod1.js, 2, 15))
+}
+
diff --git a/tests/baselines/reference/enumTagImported.types b/tests/baselines/reference/enumTagImported.types
@@ -0,0 +1,39 @@
+=== tests/cases/conformance/jsdoc/type.js ===
+/** @typedef {import("./mod1").TestEnum} TE */
+/** @type {TE} */
+const test = 'add'
+>test : string
+>'add' : "add"
+
+/** @type {import("./mod1").TestEnum} */
+const tost = 'remove'
+>tost : string
+>'remove' : "remove"
+
+=== tests/cases/conformance/jsdoc/value.js ===
+import { TestEnum } from "./mod1"
+>TestEnum : { ADD: string; REMOVE: string; }
+
+/** @type {TestEnum} */
+const tist = TestEnum.ADD
+>tist : string
+>TestEnum.ADD : string
+>TestEnum : { ADD: string; REMOVE: string; }
+>ADD : string
+
+
+=== tests/cases/conformance/jsdoc/mod1.js ===
+/** @enum {string} */
+export const TestEnum = {
+>TestEnum : { ADD: string; REMOVE: string; }
+>{    ADD: 'add',    REMOVE: 'remove'} : { ADD: string; REMOVE: string; }
+
+    ADD: 'add',
+>ADD : string
+>'add' : "add"
+
+    REMOVE: 'remove'
+>REMOVE : string
+>'remove' : "remove"
+}
+
diff --git a/tests/cases/conformance/jsdoc/enumTagImported.ts b/tests/cases/conformance/jsdoc/enumTagImported.ts
@@ -0,0 +1,23 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: type.js
+/** @typedef {import("./mod1").TestEnum} TE */
+/** @type {TE} */
+const test = 'add'
+/** @type {import("./mod1").TestEnum} */
+const tost = 'remove'
+
+// @Filename: value.js
+import { TestEnum } from "./mod1"
+/** @type {TestEnum} */
+const tist = TestEnum.ADD
+
+
+// @Filename: mod1.js
+
+/** @enum {string} */
+export const TestEnum = {
+    ADD: 'add',
+    REMOVE: 'remove'
+}

Original file line number	Diff line number	Diff line change
`@@ -8189,7 +8189,7 @@ namespace ts {`
`8189`	`8189`	`}`
`8190`	`8190`
`8191`	`8191`	`function isJSDocTypeReference(node: Node): node is TypeReferenceNode {`
`8192`		`- return !!(node.flags & NodeFlags.JSDoc) && node.kind === SyntaxKind.TypeReference;`
	`8192`	`+ return !!(node.flags & NodeFlags.JSDoc) && (node.kind === SyntaxKind.TypeReference \|\| node.kind === SyntaxKind.ImportType);`
`8193`	`8193`	`}`
`8194`	`8194`
`8195`	`8195`	`function checkNoTypeArguments(node: NodeWithTypeArguments, symbol?: Symbol) {`
`@@ -9462,7 +9462,7 @@ namespace ts {`
`9462`	`9462`	`links.resolvedSymbol = unknownSymbol;`
`9463`	`9463`	`return links.resolvedType = errorType;`
`9464`	`9464`	`}`
`9465`		`- const targetMeaning = node.isTypeOf ? SymbolFlags.Value : SymbolFlags.Type;`
	`9465`	`+ const targetMeaning = node.isTypeOf ? SymbolFlags.Value : node.flags & NodeFlags.JSDoc ? SymbolFlags.Value \| SymbolFlags.Type : SymbolFlags.Type;`
`9466`	`9466`	`// TODO: Future work: support unions/generics/whatever via a deferred import-type`
`9467`	`9467`	`const innerModuleSymbol = resolveExternalModuleName(node, node.argument.literal);`
`9468`	`9468`	`if (!innerModuleSymbol) {`