path completions adjustments

Author: weswigham

src/compiler/moduleSpecifiers.ts

@@ -32,6 +32,7 @@ import {
     forEach,
     forEachAncestorDirectory,
     GetCanonicalFileName,
+    getBaseFileName,
     getDirectoryPath,
     getEmitModuleResolutionKind,
     getImpliedNodeFormatForFile,
@@ -84,6 +85,7 @@ import {
     pathIsBareSpecifier,
     pathIsRelative,
     PropertyAccessExpression,
+    removeExtension,
     removeFileExtension,
     removeSuffix,
     ResolutionMode,
@@ -1043,8 +1045,7 @@ function removeExtensionAndIndexPostFix(fileName: string, ending: Ending, option
     if (fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Dcts, Extension.Cts])) return noExtension + getJSExtensionForFile(fileName, options);
     else if (!fileExtensionIsOneOf(fileName, [Extension.Dts]) && fileExtensionIsOneOf(fileName, [Extension.Ts]) && stringContains(fileName, ".d.")) {
         // `foo.d.json.ts` and the like - remap back to `foo.json`
-        const ext = noExtension.substring(noExtension.lastIndexOf("."));
-        return noExtension.substring(0, noExtension.indexOf(".d.")) + ext;
+        return tryGetRealFileNameForNonJsDeclarationFileName(fileName)!;
     }
     switch (ending) {
         case Ending.Minimal:
@@ -1068,6 +1069,16 @@ function getJSExtensionForFile(fileName: string, options: CompilerOptions): Exte
     return tryGetJSExtensionForFile(fileName, options) ?? Debug.fail(`Extension ${extensionFromPath(fileName)} is unsupported:: FileName:: ${fileName}`);
 }
 
+
+/** @internal */
+export function tryGetRealFileNameForNonJsDeclarationFileName(fileName: string) {
+    const baseName = getBaseFileName(fileName);
+    if (!endsWith(fileName, Extension.Ts) || !stringContains(baseName, ".d.") || fileExtensionIsOneOf(baseName, [Extension.Dts])) return undefined;
+    const noExtension = removeExtension(fileName, Extension.Ts);
+    const ext = noExtension.substring(noExtension.lastIndexOf("."));
+    return noExtension.substring(0, noExtension.indexOf(".d.")) + ext;
+}
+
 /** @internal */
 export function tryGetJSExtensionForFile(fileName: string, options: CompilerOptions): Extension | undefined {
     const ext = tryGetExtensionFromPath(fileName);

src/services/stringCompletions.ts

@@ -690,6 +690,10 @@ function getCompletionEntriesForDirectoryFragment(
 }
 
 function getFilenameWithExtensionOption(name: string, compilerOptions: CompilerOptions, includeExtensionsOption: IncludeExtensionsOption): { name: string, extension: Extension | undefined } {
+    const nonJsResult = moduleSpecifiers.tryGetRealFileNameForNonJsDeclarationFileName(name);
+    if (nonJsResult) {
+        return { name: nonJsResult, extension: undefined };
+    }
     const outputExtension = moduleSpecifiers.tryGetJSExtensionForFile(name, compilerOptions);
     if (includeExtensionsOption === IncludeExtensionsOption.Exclude && !fileExtensionIsOneOf(name, [Extension.Json, Extension.Mts, Extension.Cts, Extension.Dmts, Extension.Dcts, Extension.Mjs, Extension.Cjs])) {
         return { name: removeFileExtension(name), extension: tryGetExtensionFromPath(name) };

tests/baselines/reference/nonJsDeclarationFilePathCompletions.baseline

@@ -0,0 +1,69 @@
+[
+  {
+    "marker": {
+      "fileName": "/project/usage.ts",
+      "position": 35,
+      "name": "1"
+    },
+    "completionList": {
+      "isGlobalCompletion": false,
+      "isMemberCompletion": false,
+      "isNewIdentifierLocation": true,
+      "entries": [
+        {
+          "name": "mod.html",
+          "kind": "script",
+          "kindModifiers": "",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "mod.html",
+              "kind": "text"
+            }
+          ],
+          "tags": []
+        },
+        {
+          "name": "node_modules",
+          "kind": "directory",
+          "kindModifiers": "",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "node_modules",
+              "kind": "text"
+            }
+          ],
+          "tags": []
+        }
+      ]
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/project/usage.ts",
+      "position": 86,
+      "name": "2"
+    },
+    "completionList": {
+      "isGlobalCompletion": false,
+      "isMemberCompletion": false,
+      "isNewIdentifierLocation": true,
+      "entries": [
+        {
+          "name": "mod.html",
+          "kind": "script",
+          "kindModifiers": "",
+          "sortText": "11",
+          "displayParts": [
+            {
+              "text": "mod.html",
+              "kind": "text"
+            }
+          ],
+          "tags": []
+        }
+      ]
+    }
+  }
+]

tests/cases/fourslash/server/nonJsDeclarationFilePathCompletions.ts

@@ -0,0 +1,14 @@
+/// <reference path="../fourslash.ts" />
+
+// @allowNonJsExtensions: true
+// @Filename: /project/mod.d.html.ts
+////export declare class HtmlModuleThing {}
+
+// @Filename: /project/node_modules/package/mod.d.html.ts
+////export declare class PackageHtmlModuleThing {}
+
+// @Filename: /project/usage.ts
+////import { HtmlModuleThing } from ".//*1*/";
+////import { PackageHtmlModuleThing } from "package//*2*/";
+
+verify.baselineCompletions();