@volar/typescript 2.4.0-alpha.17 → 2.4.0-alpha.19

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/runTsc.d.ts

@@ -8,3 +8,14 @@ export declare function runTsc(tscPath: string, options: string[] | {
     extraSupportedExtensions: string[];
     extraExtensionsToRemove: string[];
 }, _getLanguagePlugins: typeof getLanguagePlugins): void;
+/**
+ * Replaces the code of typescript to add support for additional extensions and language plugins.
+ *
+ * @param tsc - The original code of typescript.
+ * @param proxyApiPath - The path to the proxy API.
+ * @param extraSupportedExtensions - An array of additional supported extensions.
+ * @param extraExtensionsToRemove - An array of extensions to remove.
+ * @param getLanguagePluginsFile - The file to get language plugins from.
+ * @returns The modified typescript code.
+ */
+export declare function transformTscContent(tsc: string, proxyApiPath: string, extraSupportedExtensions: string[], extraExtensionsToRemove: string[], getLanguagePluginsFile?: string): string;

package/lib/quickstart/runTsc.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLanguagePlugins = void 0;
 exports.runTsc = runTsc;
+exports.transformTscContent = transformTscContent;
 const fs = require("fs");
 let getLanguagePlugins = () => [];
 exports.getLanguagePlugins = getLanguagePlugins;
@@ -22,38 +23,7 @@ function runTsc(tscPath, options, _getLanguagePlugins) {
                 extraSupportedExtensions = options.extraSupportedExtensions;
                 extraExtensionsToRemove = options.extraExtensionsToRemove;
             }
-            const needPatchExtenstions = extraSupportedExtensions.filter(ext => !extraExtensionsToRemove.includes(ext));
-            // Add allow extensions
-            if (extraSupportedExtensions.length) {
-                const extsText = extraSupportedExtensions.map(ext => `"${ext}"`).join(', ');
-                tsc = replace(tsc, /supportedTSExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
-                tsc = replace(tsc, /supportedJSExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
-                tsc = replace(tsc, /allSupportedExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
-            }
-            // Use to emit basename.xxx to basename.d.ts instead of basename.xxx.d.ts
-            if (extraExtensionsToRemove.length) {
-                const extsText = extraExtensionsToRemove.map(ext => `"${ext}"`).join(', ');
-                tsc = replace(tsc, /extensionsToRemove = .*(?=;)/, s => s + `.concat([${extsText}])`);
-            }
-            // Support for basename.xxx to basename.xxx.d.ts
-            if (needPatchExtenstions.length) {
-                const extsText = needPatchExtenstions.map(ext => `"${ext}"`).join(', ');
-                tsc = replace(tsc, /function changeExtension\(/, s => `function changeExtension(path, newExtension) {
-					return [${extsText}].some(ext => path.endsWith(ext))
-						? path + newExtension
-						: _changeExtension(path, newExtension)
-					}\n` + s.replace('changeExtension', '_changeExtension'));
-            }
-            // proxy createProgram
-            tsc = replace(tsc, /function createProgram\(.+\) {/, s => `var createProgram = require(${JSON.stringify(proxyApiPath)}).proxyCreateProgram(`
-                + [
-                    `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } )`,
-                    `_createProgram`,
-                    `require(${JSON.stringify(__filename)}).getLanguagePlugins`,
-                ].join(', ')
-                + `);\n`
-                + s.replace('createProgram', '_createProgram'));
-            return tsc;
+            return transformTscContent(tsc, proxyApiPath, extraSupportedExtensions, extraExtensionsToRemove);
         }
         return readFileSync(...args);
     };
@@ -65,6 +35,50 @@ function runTsc(tscPath, options, _getLanguagePlugins) {
         delete require.cache[tscPath];
     }
 }
+/**
+ * Replaces the code of typescript to add support for additional extensions and language plugins.
+ *
+ * @param tsc - The original code of typescript.
+ * @param proxyApiPath - The path to the proxy API.
+ * @param extraSupportedExtensions - An array of additional supported extensions.
+ * @param extraExtensionsToRemove - An array of extensions to remove.
+ * @param getLanguagePluginsFile - The file to get language plugins from.
+ * @returns The modified typescript code.
+ */
+function transformTscContent(tsc, proxyApiPath, extraSupportedExtensions, extraExtensionsToRemove, getLanguagePluginsFile = __filename) {
+    const neededPatchExtenstions = extraSupportedExtensions.filter(ext => !extraExtensionsToRemove.includes(ext));
+    // Add allow extensions
+    if (extraSupportedExtensions.length) {
+        const extsText = extraSupportedExtensions.map(ext => `"${ext}"`).join(', ');
+        tsc = replace(tsc, /supportedTSExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
+        tsc = replace(tsc, /supportedJSExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
+        tsc = replace(tsc, /allSupportedExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
+    }
+    // Use to emit basename.xxx to basename.d.ts instead of basename.xxx.d.ts
+    if (extraExtensionsToRemove.length) {
+        const extsText = extraExtensionsToRemove.map(ext => `"${ext}"`).join(', ');
+        tsc = replace(tsc, /extensionsToRemove = .*(?=;)/, s => s + `.concat([${extsText}])`);
+    }
+    // Support for basename.xxx to basename.xxx.d.ts
+    if (neededPatchExtenstions.length) {
+        const extsText = neededPatchExtenstions.map(ext => `"${ext}"`).join(', ');
+        tsc = replace(tsc, /function changeExtension\(/, s => `function changeExtension(path, newExtension) {
+			return [${extsText}].some(ext => path.endsWith(ext))
+				? path + newExtension
+				: _changeExtension(path, newExtension)
+			}\n` + s.replace('changeExtension', '_changeExtension'));
+    }
+    // proxy createProgram
+    tsc = replace(tsc, /function createProgram\(.+\) {/, s => `var createProgram = require(${JSON.stringify(proxyApiPath)}).proxyCreateProgram(`
+        + [
+            `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } )`,
+            `_createProgram`,
+            `require(${JSON.stringify(getLanguagePluginsFile)}).getLanguagePlugins`,
+        ].join(', ')
+        + `);\n`
+        + s.replace('createProgram', '_createProgram'));
+    return tsc;
+}
 function replace(text, ...[search, replace]) {
     const before = text;
     text = text.replace(search, replace);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.17",
+	"version": "2.4.0-alpha.19",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.17",
+		"@volar/language-core": "2.4.0-alpha.19",
 		"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.17"
+		"@volar/language-service": "2.4.0-alpha.19"
 	},
-	"gitHead": "d0c3954d27f67f9867ea1e7c89bbf7f8365cab7a"
+	"gitHead": "cbb14a44f72c365c1e8d52eff9580fb4e9765f15"
 }