jsdoc import type completions

Author: a-tarasyuk

src/compiler/checker.ts

@@ -47625,6 +47625,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 if (
                     (isExternalModuleImportEqualsDeclaration(node.parent.parent) && getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
                     ((node.parent.kind === SyntaxKind.ImportDeclaration || node.parent.kind === SyntaxKind.ExportDeclaration) && (node.parent as ImportDeclaration).moduleSpecifier === node) ||
+                    (isInJSFile(node) && isJSDocImportTypeTag(node.parent) && node.parent.moduleSpecifier === node) ||
                     ((isInJSFile(node) && isRequireCall(node.parent, /*requireStringLiteralLikeArgument*/ false)) || isImportCall(node.parent)) ||
                     (isLiteralTypeNode(node.parent) && isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)
                 ) {

src/services/completions.ts

@@ -3172,6 +3172,7 @@ function getCompletionData(
     log("getCompletionData: Is inside comment: " + (timestamp() - start));
 
     let insideJsDocTagTypeExpression = false;
+    let insideJsDocImportTypeTag = false;
     let isInSnippetScope = false;
     if (insideComment) {
         if (hasDocComment(sourceFile, position)) {
@@ -3212,25 +3213,30 @@ function getCompletionData(
             if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                 return { kind: CompletionDataKind.JsDocTagName };
             }
-            const typeExpression = tryGetTypeExpressionFromTag(tag);
-            if (typeExpression) {
-                currentToken = getTokenAtPosition(sourceFile, position);
-                if (
-                    !currentToken ||
-                    (!isDeclarationName(currentToken) &&
-                        (currentToken.parent.kind !== SyntaxKind.JSDocPropertyTag ||
-                            (currentToken.parent as JSDocPropertyTag).name !== currentToken))
-                ) {
-                    // Use as type location if inside tag's type expression
-                    insideJsDocTagTypeExpression = isCurrentlyEditingNode(typeExpression);
-                }
+            if (isJSDocImportTypeTag(tag)) {
+                insideJsDocImportTypeTag = true;
             }
-            if (!insideJsDocTagTypeExpression && isJSDocParameterTag(tag) && (nodeIsMissing(tag.name) || tag.name.pos <= position && position <= tag.name.end)) {
-                return { kind: CompletionDataKind.JsDocParameterName, tag };
+            else {
+                const typeExpression = tryGetTypeExpressionFromTag(tag);
+                if (typeExpression) {
+                    currentToken = getTokenAtPosition(sourceFile, position);
+                    if (
+                        !currentToken ||
+                        (!isDeclarationName(currentToken) &&
+                            (currentToken.parent.kind !== SyntaxKind.JSDocPropertyTag ||
+                                (currentToken.parent as JSDocPropertyTag).name !== currentToken))
+                    ) {
+                        // Use as type location if inside tag's type expression
+                        insideJsDocTagTypeExpression = isCurrentlyEditingNode(typeExpression);
+                    }
+                }
+                if (!insideJsDocTagTypeExpression && isJSDocParameterTag(tag) && (nodeIsMissing(tag.name) || tag.name.pos <= position && position <= tag.name.end)) {
+                    return { kind: CompletionDataKind.JsDocParameterName, tag };
+                }
             }
         }
 
-        if (!insideJsDocTagTypeExpression) {
+        if (!insideJsDocTagTypeExpression && !insideJsDocImportTypeTag) {
             // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal
             // comment or the plain text part of a jsDoc comment, so no completion should be available
             log("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment.");
@@ -3241,7 +3247,7 @@ function getCompletionData(
     start = timestamp();
     // The decision to provide completion depends on the contextToken, which is determined through the previousToken.
     // Note: 'previousToken' (and thus 'contextToken') can be undefined if we are the beginning of the file
-    const isJsOnlyLocation = !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile);
+    const isJsOnlyLocation = !insideJsDocTagTypeExpression && !insideJsDocImportTypeTag && isSourceFileJS(sourceFile);
     const tokens = getRelevantTokens(position, sourceFile);
     const previousToken = tokens.previousToken!;
     let contextToken = tokens.contextToken!;
@@ -3922,6 +3928,7 @@ function getCompletionData(
 
     function isTypeOnlyCompletion(): boolean {
         return insideJsDocTagTypeExpression
+            || insideJsDocImportTypeTag
             || !!importStatementCompletion && isTypeOnlyImportOrExportDeclaration(location.parent)
             || !isContextTokenValueLocation(contextToken) &&
                 (isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)

src/services/stringCompletions.ts

@@ -418,6 +418,7 @@ function getStringLiteralCompletionEntries(sourceFile: SourceFile, node: StringL
         case SyntaxKind.ImportDeclaration:
         case SyntaxKind.ExportDeclaration:
         case SyntaxKind.ExternalModuleReference:
+        case SyntaxKind.JSDocImportTypeTag:
             // Get all known external module names or complete a path to a module
             // i.e. import * as ns from "/*completion position*/";
             //      var y = import("/*completion position*/");

tests/baselines/reference/jsdocImportTypeTagCompletion2.baseline

@@ -0,0 +1,48 @@
+// === Completions ===
+=== /b.js ===
+// /**
+//  * @importType {  } from "./a"
+//                  ^
+// | ----------------------------------------------------------------------
+// | interface A
+// | ----------------------------------------------------------------------
+//  */
+
+[
+  {
+    "marker": {
+      "fileName": "/b.js",
+      "position": 21,
+      "name": ""
+    },
+    "item": {
+      "flags": 0,
+      "isGlobalCompletion": false,
+      "isMemberCompletion": true,
+      "isNewIdentifierLocation": false,
+      "entries": [
+        {
+          "name": "A",
+          "kind": "interface",
+          "kindModifiers": "export",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "interface",
+              "kind": "keyword"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "A",
+              "kind": "interfaceName"
+            }
+          ],
+          "documentation": []
+        }
+      ]
+    }
+  }
+]

tests/baselines/reference/jsdocImportTypeTagCompletion3.baseline

@@ -0,0 +1,51 @@
+// === Completions ===
+=== /tests/cases/fourslash/./c.js ===
+// /**
+//  * @importType * as types from "./"
+//                                   ^
+// | ----------------------------------------------------------------------
+// | a
+// | b
+// | ----------------------------------------------------------------------
+//  */
+
+[
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/./c.js",
+      "position": 38,
+      "name": ""
+    },
+    "item": {
+      "isGlobalCompletion": false,
+      "isMemberCompletion": false,
+      "isNewIdentifierLocation": true,
+      "entries": [
+        {
+          "name": "a",
+          "kind": "script",
+          "kindModifiers": ".ts",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "a",
+              "kind": "text"
+            }
+          ]
+        },
+        {
+          "name": "b",
+          "kind": "script",
+          "kindModifiers": ".ts",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "b",
+              "kind": "text"
+            }
+          ]
+        }
+      ]
+    }
+  }
+]

tests/cases/fourslash/jsdocImportTypeTagCompletion2.ts

@@ -0,0 +1,14 @@
+///<reference path="fourslash.ts" />
+
+// @allowJS: true
+// @checkJs: true
+
+// @filename: /a.ts
+////export interface A {}
+
+// @filename: /b.js
+/////**
+//// * @importType { /**/ } from "./a"
+//// */
+
+verify.baselineCompletions();

tests/cases/fourslash/jsdocImportTypeTagCompletion3.ts

@@ -0,0 +1,18 @@
+///<reference path="fourslash.ts" />
+
+// @allowJS: true
+// @checkJs: true
+// @module: esnext
+
+// @filename: ./a.ts
+////export interface A {}
+
+// @filename: ./b.ts
+////export interface B {}
+
+// @filename: ./c.js
+/////**
+//// * @importType * as types from ".//**/"
+//// */
+
+verify.baselineCompletions();