volar-service-typescript 0.0.37 → 0.0.39

package/lib/configs/getUserPreferences.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type { SharedContext } from '../semanticFeatures/types';
-export declare function getUserPreferences(ctx: SharedContext, document: TextDocument): Promise<ts.UserPreferences>;
+import type { ServiceContext } from '@volar/language-service';
+export declare function getUserPreferences(ctx: ServiceContext, document: TextDocument): Promise<ts.UserPreferences>;
 //# sourceMappingURL=getUserPreferences.d.ts.map

package/lib/configs/getUserPreferences.js

@@ -4,6 +4,10 @@ exports.getUserPreferences = void 0;
 const path = require("path-browserify");
 const shared_1 = require("../shared");
 async function getUserPreferences(ctx, document) {
+    let currentDirectory = '';
+    if (ctx.language.typescript) {
+        currentDirectory = ctx.language.typescript.languageServiceHost.getCurrentDirectory();
+    }
     const config = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document)) ?? {};
     const preferencesConfig = config?.preferences ?? {};
     const preferences = {
@@ -22,7 +26,7 @@ async function getUserPreferences(ctx, document) {
         includeCompletionsWithSnippetText: config.suggest?.includeCompletionsWithSnippetText ?? true,
         includeCompletionsWithClassMemberSnippets: config.suggest?.classMemberSnippets?.enabled ?? true,
         includeCompletionsWithObjectLiteralMethodSnippets: config.suggest?.objectLiteralMethodSnippets?.enabled ?? true,
-        autoImportFileExcludePatterns: getAutoImportFileExcludePatternsPreference(preferencesConfig, ctx.languageServiceHost.getCurrentDirectory()),
+        autoImportFileExcludePatterns: getAutoImportFileExcludePatternsPreference(preferencesConfig, currentDirectory),
         useLabelDetailsInCompletionEntries: true,
         allowIncompleteCompletions: true,
         displayPartsForJSDoc: true,

package/lib/plugins/syntactic.d.ts

@@ -1,12 +1,12 @@
 import type { ProviderResult, ServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function create(ts: typeof import('typescript'), { isFormattingEnabled, isAutoClosingTagsEnabled, }?: {
-    isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-}): LanguageServicePlugin;
 import type * as ts from 'typescript';
 export declare function getLanguageServiceByDocument(ts: typeof import('typescript'), document: TextDocument): {
     languageService: ts.LanguageService;
     fileName: string;
 };
+export declare function create(ts: typeof import('typescript'), { isFormattingEnabled, isAutoClosingTagsEnabled, }?: {
+    isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+}): LanguageServicePlugin;
 //# sourceMappingURL=syntactic.d.ts.map

package/lib/plugins/syntactic.js

@@ -1,10 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLanguageServiceByDocument = exports.create = void 0;
+exports.create = exports.getLanguageServiceByDocument = void 0;
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const shared_1 = require("../shared");
 const lspConverters_1 = require("../utils/lspConverters");
 const syntacticLanguageService_1 = require("../syntacticLanguageService");
+const snapshots = new WeakMap();
+let created;
+function getLanguageServiceByDocument(ts, document) {
+    if (!created) {
+        created = (0, syntacticLanguageService_1.createLanguageService)(ts, true);
+    }
+    let cache = snapshots.get(document);
+    if (!cache || cache[0] !== document.version) {
+        const snapshot = ts.ScriptSnapshot.fromString(document.getText());
+        cache = [document.version, snapshot];
+        snapshots.set(document, cache);
+        created.updateFile(document.uri, cache[1], document.languageId === 'javascript'
+            ? ts.ScriptKind.JS
+            : document.languageId === 'javascriptreact'
+                ? ts.ScriptKind.JSX
+                : document.languageId === 'typescriptreact'
+                    ? ts.ScriptKind.TSX
+                    : ts.ScriptKind.TS);
+    }
+    return {
+        languageService: created.languageService,
+        fileName: document.uri,
+    };
+}
+exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
 function create(ts, { isFormattingEnabled = async (document, context) => {
     return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format.enable') ?? true;
 }, isAutoClosingTagsEnabled = async (document, context) => {
@@ -16,12 +41,16 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
         autoFormatTriggerCharacters: [';', '}', '\n'],
         create(context) {
             return {
-                async provideAutoInsertionEdit(document, position, lastChange) {
+                async provideAutoInsertionEdit(document, selection, change) {
+                    // selection must at end of change
+                    if (document.offsetAt(selection) !== change.rangeOffset + change.text.length) {
+                        return;
+                    }
                     if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
-                        && lastChange.text.endsWith('>')
+                        && change.text.endsWith('>')
                         && await isAutoClosingTagsEnabled(document, context)) {
                         const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
-                        const close = languageService.getJsxClosingTagAtPosition(fileName, document.offsetAt(position));
+                        const close = languageService.getJsxClosingTagAtPosition(fileName, document.offsetAt(selection));
                         if (close) {
                             return '$0' + close.newText;
                         }
@@ -96,15 +125,4 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
     };
 }
 exports.create = create;
-const snapshots = new WeakMap();
-function getLanguageServiceByDocument(ts, document) {
-    let cache = snapshots.get(document);
-    if (!cache || cache[0] !== document.version) {
-        const snapshot = ts.ScriptSnapshot.fromString(document.getText());
-        cache = [document.version, snapshot];
-        snapshots.set(document, cache);
-    }
-    return (0, syntacticLanguageService_1.getLanguageService)(ts, cache[1], document.languageId, true);
-}
-exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
 //# sourceMappingURL=syntactic.js.map

package/lib/syntacticLanguageService.d.ts

@@ -1,6 +1,6 @@
 import type * as ts from 'typescript';
-export declare function getLanguageService(ts: typeof import('typescript'), snapshot: ts.IScriptSnapshot, languageId: string, syntaxOnly: boolean): {
+export declare function createLanguageService(ts: typeof import('typescript'), syntaxOnly: boolean): {
     languageService: ts.LanguageService;
-    fileName: string;
+    updateFile: (fileName: string, snapshot: ts.IScriptSnapshot, scriptKind: ts.ScriptKind) => void;
 };
 //# sourceMappingURL=syntacticLanguageService.d.ts.map

package/lib/syntacticLanguageService.js

@@ -1,45 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLanguageService = void 0;
-let currentProjectVersion = -1;
-let currentFileName = '';
-let currentSnapshot;
-let languageService;
-let syntaxOnlyLanguageService;
-const host = {
-    getProjectVersion: () => currentProjectVersion.toString(),
-    getScriptFileNames: () => [currentFileName],
-    getScriptVersion: () => currentProjectVersion.toString(),
-    getScriptSnapshot: fileName => fileName === currentFileName ? currentSnapshot : undefined,
-    getCompilationSettings: () => ({}),
-    getCurrentDirectory: () => '',
-    getDefaultLibFileName: () => '',
-    readFile: () => undefined,
-    fileExists: fileName => fileName === currentFileName,
-};
-function getLanguageService(ts, snapshot, languageId, syntaxOnly) {
-    if (currentSnapshot !== snapshot) {
-        currentSnapshot = snapshot;
-        currentFileName = '/tmp.' + (languageId === 'javascript' ? 'js' :
-            languageId === 'typescriptreact' ? 'tsx' :
-                languageId === 'javascriptreact' ? 'jsx' :
-                    'ts');
+exports.createLanguageService = void 0;
+function createLanguageService(ts, syntaxOnly) {
+    let currentProjectVersion = -1;
+    let fileNames = [];
+    const scriptInfos = new Map();
+    const host = {
+        getProjectVersion: () => currentProjectVersion.toString(),
+        getScriptFileNames: () => fileNames,
+        getScriptVersion: () => currentProjectVersion.toString(),
+        getScriptSnapshot: fileName => scriptInfos.get(fileName)?.snapshot,
+        getCompilationSettings: () => ({}),
+        getCurrentDirectory: () => '',
+        getDefaultLibFileName: () => '',
+        readFile: () => undefined,
+        fileExists: fileName => scriptInfos.has(fileName),
+    };
+    return {
+        languageService: syntaxOnly
+            ? ts.createLanguageService(host, undefined, ts.LanguageServiceMode.Syntactic)
+            : ts.createLanguageService(host),
+        updateFile,
+    };
+    function updateFile(fileName, snapshot, scriptKind) {
+        let scriptInfo = scriptInfos.get(fileName);
+        if (scriptInfo?.snapshot === snapshot && scriptInfo.kind === scriptKind) {
+            return;
+        }
         currentProjectVersion++;
-    }
-    if (syntaxOnly) {
-        syntaxOnlyLanguageService ??= ts.createLanguageService(host, undefined, ts.LanguageServiceMode.Syntactic);
-        return {
-            languageService: syntaxOnlyLanguageService,
-            fileName: currentFileName,
-        };
-    }
-    else {
-        languageService ??= ts.createLanguageService(host);
-        return {
-            languageService,
-            fileName: currentFileName,
+        scriptInfo = {
+            snapshot,
+            kind: scriptKind,
+            version: (scriptInfo?.version ?? 0) + 1,
         };
+        const filesChanged = !scriptInfos.has(fileName);
+        scriptInfos.set(fileName, scriptInfo);
+        if (filesChanged) {
+            fileNames = [...scriptInfos.keys()];
+        }
     }
 }
-exports.getLanguageService = getLanguageService;
+exports.createLanguageService = createLanguageService;
 //# sourceMappingURL=syntacticLanguageService.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.37",
+	"version": "0.0.39",
 	"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.1"
+		"@volar/language-service": "~2.2.0-alpha.4"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "ee14afba19f419a31c4b70e5a34f88cefb59ac49"
+	"gitHead": "69bf117b9fddb1d485396d484948485183c6d40a"
 }