@volar/typescript 2.4.0-alpha.16 → 2.4.0-alpha.18

package/lib/node/proxyLanguageService.js

@@ -29,6 +29,7 @@ function createProxyLanguageService(languageService) {
                     case 'getDocumentHighlights': return getDocumentHighlights(language, target[p]);
                     case 'getApplicableRefactors': return getApplicableRefactors(language, target[p]);
                     case 'getEditsForRefactor': return getEditsForRefactor(language, target[p]);
+                    case 'getCombinedCodeFix': return getCombinedCodeFix(language, target[p]);
                     case 'getRenameInfo': return getRenameInfo(language, target[p]);
                     case 'getCodeFixesAtPosition': return getCodeFixesAtPosition(language, target[p]);
                     case 'getEncodedSemanticClassifications': return getEncodedSemanticClassifications(language, target[p]);
@@ -46,6 +47,7 @@ function createProxyLanguageService(languageService) {
                     case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, target[p]);
                     case 'provideInlayHints': return provideInlayHints(language, target[p]);
                     case 'getFileReferences': return getFileReferences(language, target[p]);
+                    case 'getNavigateToItems': return getNavigateToItems(language, target[p]);
                 }
             };
         },
@@ -467,6 +469,13 @@ function getEditsForRefactor(language, getEditsForRefactor) {
         }
     };
 }
+function getCombinedCodeFix(language, getCombinedCodeFix) {
+    return (...args) => {
+        const codeActions = getCombinedCodeFix(...args);
+        codeActions.changes = (0, transform_1.transformFileTextChanges)(language, codeActions.changes, language_core_1.isCodeActionsEnabled);
+        return codeActions;
+    };
+}
 function getRenameInfo(language, getRenameInfo) {
     return (filePath, position, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
@@ -861,6 +870,15 @@ function getFileReferences(language, getFileReferences) {
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
 }
+function getNavigateToItems(language, getNavigateToItems) {
+    return (...args) => {
+        const unresolved = getNavigateToItems(...args);
+        const resolved = unresolved
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
+            .filter(s => !!s);
+        return (0, dedupe_1.dedupeDocumentSpans)(resolved);
+    };
+}
 function linkedCodeFeatureWorker(language, fileName, position, filter, worker, getLinkedCodes) {
     const results = [];
     const processedFilePositions = new Set();

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -36,7 +36,8 @@ function createAsyncLanguageServicePlugin(extensions, getScriptKindForExtraExten
                     if (getScriptKind) {
                         info.languageServiceHost.getScriptKind = fileName => {
                             if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
-                                // TODO: bypass upstream bug
+                                // bypass upstream bug https://github.com/microsoft/TypeScript/issues/57631
+                                // TODO: check if the bug is fixed in 5.5
                                 if (typeof getScriptKindForExtraExtensions === 'function') {
                                     return getScriptKindForExtraExtensions(fileName);
                                 }
@@ -58,17 +59,11 @@ function createAsyncLanguageServicePlugin(extensions, getScriptKindForExtraExten
                     const { proxy, initialize } = (0, proxyLanguageService_1.createProxyLanguageService)(info.languageService);
                     info.languageService = proxy;
                     create(ts, info).then(({ languagePlugins, setup }) => {
-                        const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                         const language = (0, language_core_1.createLanguage)([
                             ...languagePlugins,
                             { getLanguageId: common_1.resolveFileLanguageId },
                         ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
-                            const version = getScriptVersion(fileName);
-                            if (syncedScriptVersions.get(fileName) === version) {
-                                return;
-                            }
-                            syncedScriptVersions.set(fileName, version);
-                            const snapshot = getScriptSnapshot(fileName);
+                            const snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
                             if (snapshot) {
                                 language.scripts.set(fileName, snapshot);
                             }

package/lib/quickstart/createLanguageServicePlugin.js

@@ -25,19 +25,11 @@ function createLanguageServicePlugin(create) {
                         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
                         .flat();
                     exports.projectExternalFileExtensions.set(info.project, extensions);
-                    const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
-                    const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                     const language = (0, language_core_1.createLanguage)([
                         ...languagePlugins,
                         { getLanguageId: common_1.resolveFileLanguageId },
                     ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
-                        const version = getScriptVersion(fileName);
-                        if (syncedScriptVersions.get(fileName) === version) {
-                            return;
-                        }
-                        syncedScriptVersions.set(fileName, version);
-                        const snapshot = getScriptSnapshot(fileName);
+                        const snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
                         if (snapshot) {
                             language.scripts.set(fileName, snapshot);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.16",
+	"version": "2.4.0-alpha.18",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.16",
+		"@volar/language-core": "2.4.0-alpha.18",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.4.0-alpha.16"
+		"@volar/language-service": "2.4.0-alpha.18"
 	},
-	"gitHead": "ad1f693295aa0a7b1a800e0a0d05f414c6fef351"
+	"gitHead": "ea2e22ca17116b4274d661a014cff040c1d206cb"
 }