volar-service-typescript 0.0.35 → 0.0.36

package/lib/plugins/docCommentTemplate.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const nls = require("vscode-nls");
 const shared_1 = require("../shared");
-const syntacticLanguageService_1 = require("../syntacticLanguageService");
 const lspConverters_1 = require("../utils/lspConverters");
+const syntactic_1 = require("./syntactic");
 const localize = nls.loadMessageBundle(); // TODO: not working
 const defaultJsDoc = `/**\n * $0\n */`;
 function create(ts) {
     return {
         name: 'typescript-doc-comment-template',
         triggerCharacters: ['*'],
-        create() {
+        create(context) {
             return {
                 provideCompletionItems(document, position) {
                     if (!(0, shared_1.isTsDocument)(document)) {
@@ -20,7 +20,7 @@ function create(ts) {
                     if (!isPotentiallyValidDocCompletionPosition(document, position)) {
                         return;
                     }
-                    const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
+                    const { languageService, fileName } = (0, syntactic_1.getLanguageServiceByDocument)(context, ts, document);
                     const offset = document.offsetAt(position);
                     const docCommentTemplate = languageService.getDocCommentTemplateAtPosition(fileName, offset);
                     if (!docCommentTemplate) {

package/lib/plugins/syntactic.d.ts

@@ -4,4 +4,8 @@ export declare function create(ts: typeof import('typescript'), { isFormattingEn
     isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
     isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
 }): LanguageServicePlugin;
+export declare function getLanguageServiceByDocument(context: ServiceContext, ts: typeof import('typescript'), document: TextDocument): {
+    languageService: import("typescript").LanguageService;
+    fileName: string;
+};
 //# sourceMappingURL=syntactic.d.ts.map

package/lib/plugins/syntactic.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.getLanguageServiceByDocument = exports.create = void 0;
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const shared_1 = require("../shared");
 const lspConverters_1 = require("../utils/lspConverters");
@@ -20,7 +20,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
                         && lastChange.text.endsWith('>')
                         && await isAutoClosingTagsEnabled(document, context)) {
-                        const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
+                        const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
                         const close = languageService.getJsxClosingTagAtPosition(fileName, document.offsetAt(position));
                         if (close) {
                             return '$0' + close.newText;
@@ -31,7 +31,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     if (!(0, shared_1.isTsDocument)(document)) {
                         return;
                     }
-                    const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
+                    const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
                     const outliningSpans = (0, shared_1.safeCall)(() => languageService.getOutliningSpans(fileName));
                     if (!outliningSpans) {
                         return [];
@@ -42,7 +42,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     if (!(0, shared_1.isTsDocument)(document)) {
                         return;
                     }
-                    const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
+                    const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
                     const barItems = (0, shared_1.safeCall)(() => languageService.getNavigationTree(fileName));
                     if (!barItems) {
                         return [];
@@ -64,7 +64,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     if (codeOptions) {
                         tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
                     }
-                    const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
+                    const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
                     const scriptEdits = range
                         ? (0, shared_1.safeCall)(() => languageService.getFormattingEditsForRange(fileName, document.offsetAt(range.start), document.offsetAt(range.end), tsOptions))
                         : (0, shared_1.safeCall)(() => languageService.getFormattingEditsForDocument(fileName, tsOptions));
@@ -84,7 +84,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     if (codeOptions) {
                         tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
                     }
-                    const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
+                    const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
                     const scriptEdits = (0, shared_1.safeCall)(() => languageService.getFormattingEditsAfterKeystroke(fileName, document.offsetAt(position), key, tsOptions));
                     if (!scriptEdits) {
                         return [];
@@ -96,4 +96,23 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
     };
 }
 exports.create = create;
+function getLanguageServiceByDocument(context, ts, document) {
+    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+    if (decoded) {
+        const embeddedCode = context.language.scripts
+            .get(decoded[0])?.generated?.embeddedCodes
+            .get(decoded[1]);
+        if (embeddedCode) {
+            return (0, syntacticLanguageService_1.getLanguageService)(ts, embeddedCode.snapshot, document.languageId, true);
+        }
+    }
+    else {
+        const sourceScript = context.language.scripts.get(document.uri);
+        if (sourceScript) {
+            return (0, syntacticLanguageService_1.getLanguageService)(ts, sourceScript.snapshot, document.languageId, true);
+        }
+    }
+    throw new Error(`No language service for ${document.uri}`);
+}
+exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
 //# sourceMappingURL=syntactic.js.map

package/lib/syntacticLanguageService.d.ts

@@ -1,6 +1,5 @@
 import type * as ts from 'typescript';
-import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function getLanguageService(ts: typeof import('typescript'), document: TextDocument): {
+export declare function getLanguageService(ts: typeof import('typescript'), snapshot: ts.IScriptSnapshot, languageId: string, syntaxOnly: boolean): {
     languageService: ts.LanguageService;
     fileName: string;
 };

package/lib/syntacticLanguageService.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLanguageService = void 0;
 let currentProjectVersion = -1;
-let currentDocument;
-let currentDocumentVersion;
 let currentFileName = '';
 let currentSnapshot;
 let languageService;
+let syntaxOnlyLanguageService;
 const host = {
     getProjectVersion: () => currentProjectVersion.toString(),
     getScriptFileNames: () => [currentFileName],
@@ -18,21 +17,29 @@ const host = {
     readFile: () => undefined,
     fileExists: fileName => fileName === currentFileName,
 };
-function getLanguageService(ts, document) {
-    if (currentDocument !== document || currentDocumentVersion !== document.version) {
-        currentDocument = document;
-        currentFileName = '/tmp.' + (document.languageId === 'javascript' ? 'js' :
-            document.languageId === 'typescriptreact' ? 'tsx' :
-                document.languageId === 'javascriptreact' ? 'jsx' :
+function getLanguageService(ts, snapshot, languageId, syntaxOnly) {
+    if (currentSnapshot !== snapshot) {
+        currentSnapshot = snapshot;
+        currentFileName = '/tmp.' + (languageId === 'javascript' ? 'js' :
+            languageId === 'typescriptreact' ? 'tsx' :
+                languageId === 'javascriptreact' ? 'jsx' :
                     'ts');
-        currentSnapshot = ts.ScriptSnapshot.fromString(document.getText());
         currentProjectVersion++;
     }
-    languageService ??= ts.createLanguageService(host, undefined, 2);
-    return {
-        languageService,
-        fileName: currentFileName,
-    };
+    if (syntaxOnly) {
+        syntaxOnlyLanguageService ??= ts.createLanguageService(host, undefined, ts.LanguageServiceMode.Syntactic);
+        return {
+            languageService: syntaxOnlyLanguageService,
+            fileName: currentFileName,
+        };
+    }
+    else {
+        languageService ??= ts.createLanguageService(host);
+        return {
+            languageService,
+            fileName: currentFileName,
+        };
+    }
 }
 exports.getLanguageService = getLanguageService;
 //# sourceMappingURL=syntacticLanguageService.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.35",
+	"version": "0.0.36",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -35,12 +35,12 @@
 		"vscode-nls": "^5.2.0"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.2.0-alpha.0"
+		"@volar/language-service": "~2.2.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "cbd8ef0ada6eae9656286535599c9b289134d1e3"
+	"gitHead": "044667b7f2df07a2eafd915dd71265ce66c1566e"
 }