@volar/typescript 2.2.0 → 2.2.1

package/lib/node/decorateLanguageService.js

@@ -316,7 +316,10 @@ function decorateLanguageService(language, languageService) {
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
             let failed;
-            for (const generateOffset of (0, transform_1.forEachGeneratedOffset)(sourceScript, map, position, language_core_1.isRenameEnabled)) {
+            for (const [generateOffset, mapping] of (0, transform_1.toGeneratedOffsets)(sourceScript, map, position)) {
+                if (!(0, language_core_1.isRenameEnabled)(mapping.data)) {
+                    continue;
+                }
                 const info = getRenameInfo(fileName, generateOffset, options);
                 if (info.canRename) {
                     const span = (0, transform_1.transformTextSpan)(sourceScript, map, info.triggerSpan, language_core_1.isRenameEnabled);
@@ -529,44 +532,37 @@ function decorateLanguageService(language, languageService) {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            let mainResult;
-            let additionalResults = [];
-            let isAdditional;
-            const generatedOffset = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, data => {
-                if (!(0, language_core_1.isCompletionEnabled)(data)) {
-                    return false;
-                }
-                isAdditional = typeof data.completion === 'object' && data.completion.isAdditional;
-                if (!isAdditional && mainResult) {
-                    return false;
+            const results = [];
+            for (const [generatedOffset, mapping] of (0, transform_1.toGeneratedOffsets)(sourceScript, map, position)) {
+                if (!(0, language_core_1.isCompletionEnabled)(mapping.data)) {
+                    continue;
                 }
-                return true;
-            });
-            if (generatedOffset !== undefined) {
                 const result = getCompletionsAtPosition(fileName, generatedOffset, options, formattingSettings);
-                if (result) {
-                    for (const entry of result.entries) {
-                        entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
-                    }
-                    result.optionalReplacementSpan = result.optionalReplacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
-                    if (isAdditional) {
-                        additionalResults.push(result);
-                    }
-                    else {
-                        mainResult = result;
-                    }
+                if (!result || !result.entries.length) {
+                    continue;
+                }
+                if (typeof mapping.data.completion === 'object' && mapping.data.completion.onlyImport) {
+                    result.entries = result.entries.filter(entry => !!entry.sourceDisplay);
+                }
+                for (const entry of result.entries) {
+                    entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceScript, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
+                }
+                result.optionalReplacementSpan = result.optionalReplacementSpan
+                    && (0, transform_1.transformTextSpan)(sourceScript, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
+                const isAdditional = typeof mapping.data.completion === 'object' && mapping.data.completion.isAdditional;
+                if (isAdditional) {
+                    results.push(result);
+                }
+                else {
+                    results.splice(0, 0, result);
                 }
             }
-            if (!mainResult && additionalResults.length) {
-                mainResult = additionalResults.shift();
-            }
-            if (mainResult) {
+            if (results.length) {
                 return {
-                    ...mainResult,
-                    entries: [
-                        ...mainResult.entries,
-                        ...additionalResults.map(additionalResult => additionalResult.entries).flat(),
-                    ],
+                    ...results[0],
+                    entries: results
+                        .map(additionalResult => additionalResult.entries)
+                        .flat(),
                 };
             }
         }

package/lib/node/transform.d.ts

@@ -13,4 +13,4 @@ export declare function transformTextChange(sourceScript: SourceScript, map: Sou
 export declare function transformTextSpan(sourceScript: SourceScript, map: SourceMap<CodeInformation>, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): ts.TextSpan | undefined;
 export declare function toSourceOffset(sourceScript: SourceScript, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
 export declare function toGeneratedOffset(sourceScript: SourceScript, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
-export declare function forEachGeneratedOffset(sourceScript: SourceScript, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): Generator<number, void, unknown>;
+export declare function toGeneratedOffsets(sourceScript: SourceScript, map: SourceMap<CodeInformation>, position: number): Generator<readonly [number, import("@volar/language-core").Mapping<CodeInformation>], void, unknown>;

package/lib/node/transform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forEachGeneratedOffset = exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.toGeneratedOffsets = exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
@@ -172,12 +172,10 @@ function toGeneratedOffset(sourceScript, map, position, filter) {
     }
 }
 exports.toGeneratedOffset = toGeneratedOffset;
-function* forEachGeneratedOffset(sourceScript, map, position, filter) {
+function* toGeneratedOffsets(sourceScript, map, position) {
     for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-        if (filter(mapping.data)) {
-            yield generateOffset + sourceScript.snapshot.getLength();
-        }
+        yield [generateOffset + sourceScript.snapshot.getLength(), mapping];
     }
 }
-exports.forEachGeneratedOffset = forEachGeneratedOffset;
+exports.toGeneratedOffsets = toGeneratedOffsets;
 //# sourceMappingURL=transform.js.map

package/package.json

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