@volar/typescript 2.0.0-alpha.6 → 2.0.0-alpha.7

package/lib/node/decorateLanguageService.js

@@ -438,10 +438,22 @@ function decorateLanguageService(files, languageService) {
         }
     };
     languageService.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
-        const details = getCompletionEntryDetails(fileName, position, entryName, formatOptions, source, preferences, data);
+        let details;
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualFile) {
+            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+                if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
+                    details = getCompletionEntryDetails(fileName, generateOffset + sourceFile.snapshot.getLength(), entryName, formatOptions, source, preferences, data);
+                    break;
+                }
+            }
+        }
+        else {
+            return getCompletionEntryDetails(fileName, position, entryName, formatOptions, source, preferences, data);
+        }
         if (details?.codeActions) {
             for (const codeAction of details.codeActions) {
-                codeAction.changes = codeAction.changes.map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeLensEnabled)).filter(utils_1.notEmpty);
+                codeAction.changes = codeAction.changes.map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCompletionEnabled)).filter(utils_1.notEmpty);
             }
         }
         return details;

package/lib/node/transform.js

@@ -127,7 +127,7 @@ function transformRange(sourceFile, map, start, end, filter) {
     for (const sourceStart of map.getSourceOffsets(start - sourceFile.snapshot.getLength())) {
         if (filter(sourceStart[1].data)) {
             for (const sourceEnd of map.getSourceOffsets(end - sourceFile.snapshot.getLength())) {
-                if (sourceEnd > sourceStart && filter(sourceEnd[1].data)) {
+                if (sourceEnd[0] >= sourceStart[0] && filter(sourceEnd[1].data)) {
                     return [sourceStart[0], sourceEnd[0]];
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.0.0-alpha.6",
+	"version": "2.0.0-alpha.7",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.6",
+		"@volar/language-core": "2.0.0-alpha.7",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.0.0-alpha.6"
+		"@volar/language-service": "2.0.0-alpha.7"
 	},
-	"gitHead": "e81e8f70e54967242922891b7e825a5e40b56459"
+	"gitHead": "5b45f34fb8da1795a9c45242a0e184323b6b14c8"
 }