volar-service-typescript 0.0.37 → 0.0.38

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.js

@@ -16,12 +16,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;
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.37",
+	"version": "0.0.38",
 	"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": "65ba3d69ae39a3c780622c62a410ecff495e36a7"
 }