@volar/vscode 2.2.4 → 2.3.0-alpha.0

package/index.d.ts

@@ -22,6 +22,5 @@ export interface LabsInfo {
         languageClients: BaseLanguageClient[];
         onDidAddLanguageClient: vscode.Event<BaseLanguageClient>;
         languageServerProtocol: typeof import('@volar/language-server/protocol');
-        codegenStackSupport?: boolean;
     };
 }

package/lib/features/autoInsertion.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = void 0;
-const vscode = require("vscode");
 const protocol_1 = require("@volar/language-server/protocol");
+const vscode = require("vscode");
 function activate(selector, client) {
     let isEnabled = false;
     let timeout;
@@ -41,8 +41,30 @@ function activate(selector, client) {
             timeout = undefined;
         }
         const version = document.version;
-        const isCancel = () => document !== vscode.window.activeTextEditor?.document
-            || vscode.window.activeTextEditor?.document.version !== version;
+        const lastCharacter = lastChange.text[lastChange.text.length - 1];
+        const isCancel = () => {
+            if (document !== vscode.window.activeTextEditor?.document) {
+                return true;
+            }
+            if (vscode.window.activeTextEditor?.document.version !== version) {
+                return true;
+            }
+            const initializeResult = client.initializeResult;
+            if (initializeResult?.autoInsertion) {
+                for (let i = 0; i < initializeResult.autoInsertion.triggerCharacters.length; i++) {
+                    const char = initializeResult.autoInsertion.triggerCharacters[i];
+                    if (!lastCharacter.match(new RegExp(char))) {
+                        continue;
+                    }
+                    const configurationSection = initializeResult.autoInsertion.configurationSections[i];
+                    if (configurationSection && !vscode.workspace.getConfiguration().get(configurationSection)) {
+                        continue;
+                    }
+                    return false;
+                }
+            }
+            return true;
+        };
         timeout = setTimeout(async () => {
             timeout = undefined;
             if (isCancel()) {

package/lib/features/tsVersion.d.ts

@@ -1,6 +1,5 @@
 import * as vscode from 'vscode';
-import type { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(selector: vscode.DocumentSelector, cmd: string, context: vscode.ExtensionContext, client: BaseLanguageClient, resolveStatusText: (text: string) => string): vscode.Disposable;
+export declare function activate(selector: vscode.DocumentSelector, cmd: string, context: vscode.ExtensionContext, resolveStatusText: (text: string) => string, onRestart?: () => void): vscode.Disposable;
 export declare function getTsdk(context: vscode.ExtensionContext): Promise<{
     tsdk: string;
     version: string | undefined;

package/lib/features/tsVersion.js

@@ -6,7 +6,7 @@ const vscode = require("vscode");
 const common_1 = require("../common");
 const fs = require("../fs");
 const defaultTsdkPath = 'node_modules/typescript/lib';
-function activate(selector, cmd, context, client, resolveStatusText) {
+function activate(selector, cmd, context, resolveStatusText, onRestart) {
     const subscriptions = [];
     const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
     statusBar.command = {
@@ -51,13 +51,13 @@ function activate(selector, cmd, context, client, resolveStatusText) {
         const useWorkspaceTsdk = select === 'useConfigWorkspaceTsdk' || select === 'useDefaultWorkspaceTsdk';
         if (useWorkspaceTsdk !== isUseWorkspaceTsdk(context)) {
             context.workspaceState.update('typescript.useWorkspaceTsdk', useWorkspaceTsdk);
-            reloadServers();
+            onRestart?.();
         }
         updateStatusBar();
     }
     function onDidChangeConfiguration(e) {
         if (e.affectsConfiguration('typescript.tsdk') && isUseWorkspaceTsdk(context)) {
-            reloadServers();
+            onRestart?.();
         }
     }
     async function updateStatusBar() {
@@ -65,15 +65,6 @@ function activate(selector, cmd, context, client, resolveStatusText) {
         statusBar.text = tsVersion ?? 'x.x.x';
         statusBar.text = resolveStatusText(statusBar.text);
     }
-    async function reloadServers() {
-        const tsPaths = await getTsdk(context);
-        const newInitOptions = {
-            ...client.clientOptions.initializationOptions,
-            typescript: tsPaths,
-        };
-        client.clientOptions.initializationOptions = newInitOptions;
-        vscode.commands.executeCommand('volar.action.restartServer');
-    }
 }
 exports.activate = activate;
 async function getTsdk(context) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.2.4",
+	"version": "2.3.0-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.2.4",
+		"@volar/language-server": "2.3.0-alpha.0",
 		"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": "71a58c8b9c3a3e420b95df9ffb4a50be37cb31bc"
+	"gitHead": "f17c19f712651acde33cc2171a112e64db0b460e"
 }