@volar/vscode 2.2.0-alpha.1 → 2.2.0-alpha.10

package/lib/features/autoInsertion.js

@@ -32,9 +32,6 @@ function activate(selector, client) {
         if (document !== activeDocument) {
             return;
         }
-        if (timeout) {
-            clearTimeout(timeout);
-        }
         const lastChange = contentChanges[contentChanges.length - 1];
         doAutoInsert(document, lastChange);
     }
@@ -44,42 +41,35 @@ function activate(selector, client) {
             timeout = undefined;
         }
         const version = document.version;
+        const isCancel = () => document !== vscode.window.activeTextEditor?.document
+            || vscode.window.activeTextEditor?.document.version !== version;
         timeout = setTimeout(async () => {
             timeout = undefined;
-            const isCancel = () => document !== vscode.window.activeTextEditor?.document
-                || vscode.window.activeTextEditor?.document.version !== version;
             if (isCancel()) {
                 return;
             }
-            const rangeStart = lastChange.range.start;
-            const position = new vscode.Position(rangeStart.line, rangeStart.character + lastChange.text.length);
+            const activeEditor = vscode.window.activeTextEditor;
+            if (!activeEditor) {
+                return;
+            }
+            const newTextRange = new vscode.Range(lastChange.range.start, document.positionAt(document.offsetAt(lastChange.range.start)
+                + lastChange.text.length));
+            const selection = activeEditor.selections.find(selection => newTextRange.contains(selection.active))?.active;
+            if (!selection) {
+                return;
+            }
             const params = {
-                ...client.code2ProtocolConverter.asTextDocumentPositionParams(document, position),
-                lastChange: {
+                textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
+                selection: client.code2ProtocolConverter.asPosition(selection),
+                change: {
+                    rangeLength: lastChange.rangeLength,
+                    rangeOffset: lastChange.rangeOffset,
                     text: lastChange.text,
-                    range: client.code2ProtocolConverter.asRange(lastChange.range),
                 },
             };
             const insertion = await client.sendRequest(protocol_1.AutoInsertRequest.type, params);
-            const activeEditor = vscode.window.activeTextEditor;
-            if (insertion !== undefined
-                && insertion !== null
-                && isEnabled
-                && !isCancel()
-                && activeEditor) {
-                if (typeof insertion === 'string') {
-                    const selections = activeEditor.selections;
-                    if (selections.length && selections.some(s => s.active.isEqual(position))) {
-                        activeEditor.insertSnippet(new vscode.SnippetString(insertion), selections.map(s => s.active));
-                    }
-                    else {
-                        activeEditor.insertSnippet(new vscode.SnippetString(insertion), position);
-                    }
-                }
-                else {
-                    const edit = client.protocol2CodeConverter.asTextEdit(insertion);
-                    activeEditor.insertSnippet(new vscode.SnippetString(edit.newText), edit.range);
-                }
+            if (insertion && isEnabled && !isCancel()) {
+                activeEditor.insertSnippet(new vscode.SnippetString(insertion));
             }
         }, 100);
     }

package/lib/features/tsconfig.js

@@ -8,8 +8,12 @@ function activate(selector, cmd, client) {
     const subscriptions = [];
     const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
     let currentTsconfigUri;
+    let updateStatus;
     updateStatusBar();
-    vscode.window.onDidChangeActiveTextEditor(updateStatusBar, undefined, subscriptions);
+    vscode.window.onDidChangeActiveTextEditor(() => {
+        clearTimeout(updateStatus);
+        updateStatus = setTimeout(() => updateStatusBar, 100);
+    }, undefined, subscriptions);
     subscriptions.push(vscode.commands.registerCommand(cmd, async () => {
         if (currentTsconfigUri) {
             const document = await vscode.workspace.openTextDocument(currentTsconfigUri);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.2.0-alpha.1",
+	"version": "2.2.0-alpha.10",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.2.0-alpha.1",
+		"@volar/language-server": "2.2.0-alpha.10",
 		"path-browserify": "^1.0.1",
 		"vscode-languageclient": "^9.0.1",
 		"vscode-nls": "^5.2.0"
@@ -22,5 +22,5 @@
 		"@types/path-browserify": "latest",
 		"@types/vscode": "^1.82.0"
 	},
-	"gitHead": "e6dcb83ecadcfcc9e22083eea61e1ee817a9d483"
+	"gitHead": "aedd2230883c457f703be93ed150917a3efde75c"
 }