@volar/typescript 2.0.1 → 2.0.3

package/lib/node/decorateLanguageService.js

@@ -421,18 +421,41 @@ function decorateLanguageService(files, languageService) {
     languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
+            let mainResult;
+            let additionalResults = [];
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
+                    const isAdditional = typeof mapping.data.completion === 'object' && mapping.data.completion.isAdditional;
+                    if (!isAdditional && mainResult) {
+                        continue;
+                    }
                     const result = getCompletionsAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength(), options, formattingSettings);
                     if (result) {
                         for (const entry of result.entries) {
                             entry.replacementSpan = (0, transform_1.transformSpan)(files, fileName, entry.replacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
                         }
                         result.optionalReplacementSpan = (0, transform_1.transformSpan)(files, fileName, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
+                        if (isAdditional) {
+                            additionalResults.push(result);
+                        }
+                        else {
+                            mainResult = result;
+                        }
                     }
-                    return result;
                 }
             }
+            if (!mainResult && additionalResults.length) {
+                mainResult = additionalResults.shift();
+            }
+            if (mainResult) {
+                return {
+                    ...mainResult,
+                    entries: [
+                        ...mainResult.entries,
+                        ...additionalResults.map(additionalResult => additionalResult.entries).flat(),
+                    ],
+                };
+            }
         }
         else {
             return getCompletionsAtPosition(fileName, position, options, formattingSettings);

package/lib/node/decorateLanguageServiceHost.d.ts

@@ -1,4 +1,4 @@
-import type { FileRegistry } from '@volar/language-core';
+import { type FileRegistry } from '@volar/language-core';
 import type * as ts from 'typescript';
 export declare function decorateLanguageServiceHost(virtualFiles: FileRegistry, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript')): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];

package/lib/node/decorateLanguageServiceHost.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
-const language_service_1 = require("@volar/language-service");
+const language_core_1 = require("@volar/language-core");
 function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
     let extraProjectVersion = 0;
     const exts = virtualFiles.languagePlugins
@@ -118,7 +118,7 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
             const snapshot = getScriptSnapshot(fileName);
             if (snapshot) {
                 extraProjectVersion++;
-                const sourceFile = virtualFiles.set(fileName, (0, language_service_1.resolveCommonLanguageId)(fileName), snapshot);
+                const sourceFile = virtualFiles.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
                 if (sourceFile.generated) {
                     const text = snapshot.getText(0, snapshot.getLength());
                     let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');

package/lib/protocol/createProject.js

@@ -62,8 +62,9 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
                 const result = ts.resolveModuleName(moduleName, containingFile, options, {
                     ...languageServiceHost,
                     fileExists(fileName) {
-                        if (extraFileExtension && fileName.endsWith('.d.ts')) {
-                            const patchResult = languageServiceHost.fileExists(fileName.slice(0, -5));
+                        if (extraFileExtension && fileName.endsWith(`.d.${extraFileExtension}.ts`)) {
+                            const patchResult = languageServiceHost.fileExists(fileName.slice(0, -`.d.${extraFileExtension}.ts`.length)
+                                + `.${extraFileExtension}`);
                             if (patchResult) {
                                 isPatchResult = true;
                                 return true;
@@ -73,7 +74,9 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
                     },
                 }, moduleCache, redirectedReference, sourceFile.impliedNodeFormat);
                 if (isPatchResult && result.resolvedModule) {
-                    result.resolvedModule.resolvedFileName = result.resolvedModule.resolvedFileName.slice(0, -5);
+                    result.resolvedModule.resolvedFileName = result.resolvedModule.resolvedFileName
+                        .slice(0, -`.d.${extraFileExtension}.ts`.length)
+                        + `.${extraFileExtension}`;
                     const sourceFile = files.get(fileNameToFileId(result.resolvedModule.resolvedFileName));
                     if (sourceFile?.generated) {
                         const tsCode = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
@@ -108,10 +111,11 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
             getCurrentDirectory: projectHost.getCurrentDirectory,
             getCompilationSettings() {
                 const options = projectHost.getCompilationSettings();
-                if (languagePlugins.some(language => language.typescript?.extraFileExtensions.length)
-                    && !options.allowNonTsExtensions) {
-                    console.warn('`allowNonTsExtensions` must be `true`.');
+                if (languagePlugins.some(language => language.typescript?.extraFileExtensions.length)) {
                     options.allowNonTsExtensions ??= true;
+                    if (!options.allowNonTsExtensions) {
+                        console.warn('`allowNonTsExtensions` must be `true`.');
+                    }
                 }
                 return options;
             },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.0.1",
+	"version": "2.0.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.1",
+		"@volar/language-core": "2.0.3",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.0.1"
+		"@volar/language-service": "2.0.3"
 	},
-	"gitHead": "b1fbf6eed522624ccccfb17a8999edfbc1d8d9bb"
+	"gitHead": "d8a6dc056d37779ff6486f545f45bc57b22c02e4"
 }