@volar/vscode 2.0.0-alpha.0 → 2.0.0-alpha.10

package/index.d.ts

@@ -8,15 +8,19 @@ export { activate as activateTsConfigStatusItem } from './lib/features/tsconfig'
 export { activate as activateServerSys } from './lib/features/serverSys';
 export { activate as activateTsVersionStatusItem, getTsdk } from './lib/features/tsVersion';
 export * from 'vscode-languageclient';
-export declare function takeOverModeActive(context: vscode.ExtensionContext): boolean;
 import type { BaseLanguageClient, Middleware } from 'vscode-languageclient';
 export declare const middleware: Middleware;
 export declare function parseServerCommand(command: vscode.Command): vscode.Command;
-export declare const supportLabsVersion: 2;
-export interface ExportsInfoForLabs {
+export declare const currentLabsVersion = "2.0.0-alpha.9";
+export declare function createLabsInfo(languageServerProtocol: typeof import('@volar/language-server/protocol')): {
+    extensionExports: LabsInfo;
+    addLanguageClient(languageClient: BaseLanguageClient): void;
+};
+export interface LabsInfo {
     volarLabs: {
-        version: typeof supportLabsVersion;
+        version: typeof currentLabsVersion;
         languageClients: BaseLanguageClient[];
+        onDidAddLanguageClient: vscode.Event<BaseLanguageClient>;
         languageServerProtocol: typeof import('@volar/language-server/protocol');
         codegenStackSupport?: boolean;
     };

package/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.supportLabsVersion = exports.parseServerCommand = exports.middleware = exports.takeOverModeActive = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateServerSys = exports.activateTsConfigStatusItem = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateWriteVirtualFiles = exports.activateDocumentDropEdit = exports.activateAutoInsertion = void 0;
+exports.createLabsInfo = exports.currentLabsVersion = exports.parseServerCommand = exports.middleware = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateServerSys = exports.activateTsConfigStatusItem = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateWriteVirtualFiles = exports.activateDocumentDropEdit = exports.activateAutoInsertion = void 0;
 const vscode = require("vscode");
 var autoInsertion_1 = require("./lib/features/autoInsertion");
 Object.defineProperty(exports, "activateAutoInsertion", { enumerable: true, get: function () { return autoInsertion_1.activate; } });
@@ -34,24 +34,7 @@ var tsVersion_1 = require("./lib/features/tsVersion");
 Object.defineProperty(exports, "activateTsVersionStatusItem", { enumerable: true, get: function () { return tsVersion_1.activate; } });
 Object.defineProperty(exports, "getTsdk", { enumerable: true, get: function () { return tsVersion_1.getTsdk; } });
 __exportStar(require("vscode-languageclient"), exports);
-function takeOverModeActive(context) {
-    if (vscode.workspace.getConfiguration('volar').get('takeOverMode.extension') === context.extension.id) {
-        return !vscode.extensions.getExtension('vscode.typescript-language-features');
-    }
-    return false;
-}
-exports.takeOverModeActive = takeOverModeActive;
 exports.middleware = {
-    async provideHover(document, position, token, next) {
-        const hover = await next(document, position, token);
-        for (const content of hover?.contents ?? []) {
-            if (content instanceof vscode.MarkdownString) {
-                content.isTrusted = true;
-                content.supportHtml = true;
-            }
-        }
-        return hover;
-    },
     async provideCodeActions(document, range, context, token, next) {
         let actions = await next(document, range, context, token);
         actions = actions?.map(action => {
@@ -113,5 +96,24 @@ function parseServerCommand(command) {
     return command;
 }
 exports.parseServerCommand = parseServerCommand;
-exports.supportLabsVersion = 2.0;
+exports.currentLabsVersion = '2.0.0-alpha.9';
+function createLabsInfo(languageServerProtocol) {
+    const onDidAddLanguageClientEmitter = new vscode.EventEmitter();
+    const extensionExports = {
+        volarLabs: {
+            version: exports.currentLabsVersion,
+            languageClients: [],
+            languageServerProtocol,
+            onDidAddLanguageClient: onDidAddLanguageClientEmitter.event,
+        },
+    };
+    return {
+        extensionExports,
+        addLanguageClient(languageClient) {
+            extensionExports.volarLabs.languageClients.push(languageClient);
+            onDidAddLanguageClientEmitter.fire(languageClient);
+        },
+    };
+}
+exports.createLabsInfo = createLabsInfo;
 //# sourceMappingURL=index.js.map

package/lib/features/autoInsertion.d.ts

@@ -1,3 +1,3 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(clients: BaseLanguageClient[], active: (document: vscode.TextDocument) => boolean): vscode.Disposable;
+export declare function activate(selector: vscode.DocumentSelector, client: BaseLanguageClient): vscode.Disposable;

package/lib/features/autoInsertion.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = void 0;
 const vscode = require("vscode");
 const protocol_1 = require("@volar/language-server/protocol");
-function activate(clients, active) {
+function activate(selector, client) {
     let isEnabled = false;
     let timeout;
     updateEnabledState();
@@ -17,7 +17,7 @@ function activate(clients, active) {
             return;
         }
         let document = editor.document;
-        if (!active(document)) {
+        if (!vscode.languages.match(selector, document)) {
             return;
         }
         isEnabled = true;
@@ -32,24 +32,22 @@ function activate(clients, active) {
         }
         const lastChange = contentChanges[contentChanges.length - 1];
         doAutoInsert(document, lastChange, async (document, position, lastChange, isCancel) => {
-            for (const client of clients) {
-                const params = {
-                    ...client.code2ProtocolConverter.asTextDocumentPositionParams(document, position),
-                    lastChange: {
-                        text: lastChange.text,
-                        range: client.code2ProtocolConverter.asRange(lastChange.range),
-                    },
-                };
-                if (isCancel())
-                    return;
-                const result = await client.sendRequest(protocol_1.AutoInsertRequest.type, params);
-                if (result !== undefined && result !== null) {
-                    if (typeof result === 'string') {
-                        return result;
-                    }
-                    else {
-                        return client.protocol2CodeConverter.asTextEdit(result);
-                    }
+            const params = {
+                ...client.code2ProtocolConverter.asTextDocumentPositionParams(document, position),
+                lastChange: {
+                    text: lastChange.text,
+                    range: client.code2ProtocolConverter.asRange(lastChange.range),
+                },
+            };
+            if (isCancel())
+                return;
+            const result = await client.sendRequest(protocol_1.AutoInsertRequest.type, params);
+            if (result !== undefined && result !== null) {
+                if (typeof result === 'string') {
+                    return result;
+                }
+                else {
+                    return client.protocol2CodeConverter.asTextEdit(result);
                 }
             }
         });

package/lib/features/documentDropEdits.js

@@ -34,6 +34,19 @@ function activate(selector, client) {
                 if (result.additionalEdit) {
                     edit.additionalEdit = await client.protocol2CodeConverter.asWorkspaceEdit(result.additionalEdit);
                 }
+                if (result.createDataTransferFile) {
+                    edit.additionalEdit ??= new vscode.WorkspaceEdit();
+                    for (const create of result.createDataTransferFile) {
+                        const file = dataTransfer.get(create.contentsMimeType)?.asFile();
+                        if (file) {
+                            edit.additionalEdit.createFile(client.protocol2CodeConverter.asUri(create.uri), {
+                                ignoreIfExists: create.options?.ignoreIfExists,
+                                overwrite: create.options?.overwrite,
+                                contents: await file.data(),
+                            });
+                        }
+                    }
+                }
                 return edit;
             }
         },

package/lib/features/reloadProject.d.ts

@@ -1,3 +1,3 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(cmd: string, clients: BaseLanguageClient[]): vscode.Disposable;
+export declare function activate(cmd: string, client: BaseLanguageClient): vscode.Disposable;

package/lib/features/reloadProject.js

@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = void 0;
 const vscode = require("vscode");
 const protocol_1 = require("@volar/language-server/protocol");
-function activate(cmd, clients) {
+function activate(cmd, client) {
     return vscode.commands.registerCommand(cmd, () => {
         if (vscode.window.activeTextEditor) {
-            for (const client of clients) {
-                client.sendNotification(protocol_1.ReloadProjectNotification.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
-            }
+            client.sendNotification(protocol_1.ReloadProjectNotification.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
         }
     });
 }

package/lib/features/tsVersion.d.ts

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

package/lib/features/tsVersion.js

@@ -5,7 +5,7 @@ const path = require("path-browserify");
 const vscode = require("vscode");
 const common_1 = require("../common");
 const defaultTsdkPath = 'node_modules/typescript/lib';
-function activate(cmd, context, client, shouldStatusBarShow, resolveStatusText, disableTakeOverMode) {
+function activate(selector, cmd, context, client, resolveStatusText) {
     const subscriptions = [];
     const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
     statusBar.command = cmd;
@@ -37,19 +37,10 @@ function activate(cmd, context, client, shouldStatusBarShow, resolveStatusText,
                     detail: defaultTsdkPath,
                 } : undefined,
             },
-            ...(disableTakeOverMode ? [] : [{
-                    takeover: {
-                        label: 'What is Takeover Mode?',
-                    },
-                }])
         ]);
         if (select === undefined) {
             return; // cancel
         }
-        if (select === 'takeover') {
-            vscode.env.openExternal(vscode.Uri.parse('https://vuejs.org/guide/typescript/overview.html#volar-takeover-mode'));
-            return;
-        }
         if (select === 'useDefaultWorkspaceTsdk') {
             await vscode.workspace.getConfiguration('typescript').update('tsdk', defaultTsdkPath);
         }
@@ -67,7 +58,7 @@ function activate(cmd, context, client, shouldStatusBarShow, resolveStatusText,
     }
     async function updateStatusBar() {
         if (!vscode.window.activeTextEditor
-            || !shouldStatusBarShow(vscode.window.activeTextEditor.document)) {
+            || !vscode.languages.match(selector, vscode.window.activeTextEditor.document)) {
             statusBar.hide();
         }
         else {

package/lib/features/tsconfig.d.ts

@@ -1,3 +1,3 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(cmd: string, client: BaseLanguageClient, shouldStatusBarShow: (document: vscode.TextDocument) => boolean): void;
+export declare function activate(selector: vscode.DocumentSelector, cmd: string, client: BaseLanguageClient): void;

package/lib/features/tsconfig.js

@@ -4,7 +4,7 @@ exports.activate = void 0;
 const vscode = require("vscode");
 const protocol_1 = require("@volar/language-server/protocol");
 const path = require("path-browserify");
-function activate(cmd, client, shouldStatusBarShow) {
+function activate(selector, cmd, client) {
     const subscriptions = [];
     const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
     let currentTsconfigUri;
@@ -19,7 +19,7 @@ function activate(cmd, client, shouldStatusBarShow) {
     subscriptions.push(...subscriptions);
     async function updateStatusBar() {
         if (!vscode.window.activeTextEditor
-            || !shouldStatusBarShow(vscode.window.activeTextEditor.document)) {
+            || !vscode.languages.match(selector, vscode.window.activeTextEditor.document)) {
             statusBar.hide();
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.0.0-alpha.0",
+	"version": "2.0.0-alpha.10",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.0.0-alpha.0",
+		"@volar/language-server": "2.0.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": "6a6be45a3b7983148d90541e7c68ef84c9155a7a"
+	"gitHead": "f320632bcffa06981de169ee3cdad79c29ecc1b5"
 }