@volar/typescript 2.2.1 → 2.2.3

package/lib/node/decorateLanguageService.js

@@ -193,19 +193,60 @@ function decorateLanguageService(language, languageService) {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript) {
-            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceScript, map, position, language_core_1.isHoverEnabled);
-            if (generatePosition !== undefined) {
-                const result = getQuickInfoAtPosition(fileName, generatePosition);
-                if (result) {
-                    const textSpan = (0, transform_1.transformTextSpan)(sourceScript, map, result.textSpan, language_core_1.isHoverEnabled);
+            const infos = [];
+            for (const [generatePosition, mapping] of (0, transform_1.toGeneratedOffsets)(sourceScript, map, position)) {
+                if (!(0, language_core_1.isHoverEnabled)(mapping.data)) {
+                    continue;
+                }
+                const info = getQuickInfoAtPosition(fileName, generatePosition);
+                if (info) {
+                    const textSpan = (0, transform_1.transformTextSpan)(sourceScript, map, info.textSpan, language_core_1.isHoverEnabled);
                     if (textSpan) {
-                        return {
-                            ...result,
+                        infos.push({
+                            ...info,
                             textSpan,
-                        };
+                        });
                     }
                 }
             }
+            if (infos.length === 1) {
+                return infos[0];
+            }
+            else if (infos.length >= 2) {
+                const combine = { ...infos[0] };
+                combine.displayParts = combine.displayParts?.slice();
+                combine.documentation = combine.documentation?.slice();
+                combine.tags = combine.tags?.slice();
+                const displayPartsStrs = new Set([displayPartsToString(infos[0].displayParts)]);
+                const documentationStrs = new Set([displayPartsToString(infos[0].documentation)]);
+                const tagsStrs = new Set();
+                for (const tag of infos[0].tags ?? []) {
+                    tagsStrs.add(tag.name + '__volar__' + displayPartsToString(tag.text));
+                }
+                for (let i = 1; i < infos.length; i++) {
+                    const { displayParts, documentation, tags } = infos[i];
+                    if (displayParts?.length && !displayPartsStrs.has(displayPartsToString(displayParts))) {
+                        displayPartsStrs.add(displayPartsToString(displayParts));
+                        combine.displayParts ??= [];
+                        combine.displayParts.push({ ...displayParts[0], text: '\n\n' + displayParts[0].text });
+                        combine.displayParts.push(...displayParts.slice(1));
+                    }
+                    if (documentation?.length && !documentationStrs.has(displayPartsToString(documentation))) {
+                        documentationStrs.add(displayPartsToString(documentation));
+                        combine.documentation ??= [];
+                        combine.documentation.push({ ...documentation[0], text: '\n\n' + documentation[0].text });
+                        combine.documentation.push(...documentation.slice(1));
+                    }
+                    for (const tag of tags ?? []) {
+                        if (!tagsStrs.has(tag.name + '__volar__' + displayPartsToString(tag.text))) {
+                            tagsStrs.add(tag.name + '__volar__' + displayPartsToString(tag.text));
+                            combine.tags ??= [];
+                            combine.tags.push(tag);
+                        }
+                    }
+                }
+                return combine;
+            }
         }
         else {
             return getQuickInfoAtPosition(fileName, position);
@@ -538,7 +579,7 @@ function decorateLanguageService(language, languageService) {
                     continue;
                 }
                 const result = getCompletionsAtPosition(fileName, generatedOffset, options, formattingSettings);
-                if (!result || !result.entries.length) {
+                if (!result) {
                     continue;
                 }
                 if (typeof mapping.data.completion === 'object' && mapping.data.completion.onlyImport) {
@@ -554,7 +595,7 @@ function decorateLanguageService(language, languageService) {
                     results.push(result);
                 }
                 else {
-                    results.splice(0, 0, result);
+                    results.unshift(result);
                 }
             }
             if (results.length) {
@@ -678,4 +719,10 @@ function decorateLanguageService(language, languageService) {
     }
 }
 exports.decorateLanguageService = decorateLanguageService;
+function displayPartsToString(displayParts) {
+    if (displayParts) {
+        return displayParts.map(displayPart => displayPart.text).join('');
+    }
+    return '';
+}
 //# sourceMappingURL=decorateLanguageService.js.map

package/package.json

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