feat: add volar.takeOverMode.extension setting to handle multiple takeOverMode extensions

Author: johnsoncodehk

angular-language-tools/vscode-angular/README.md

@@ -33,11 +33,11 @@ We have only one stubborn way to setup (that has the best performance) because t
 
    2. Right click and select "Disable (Workspace)"
 
-3. Create / Open `.vscode/settings.json` in workspace and put following setting to avoid "Vue Language Features (Volar)" auto active with takeover mode
+3. Create / Open `.vscode/settings.json` in workspace and put following setting.
 
    ```json
 	{
-		"volar.takeOverMode.enabled": false
+		"volar.takeOverMode.extension": "johnsoncodehk.vscode-angular"
 	}
    ```
 

angular-language-tools/vscode-angular/package.json

@@ -64,6 +64,11 @@
 			"type": "object",
 			"title": "Volar-Angular",
 			"properties": {
+				"volar.takeOverMode.extension": {
+					"type": "string",
+					"default": "johnsoncodehk.vscode-angular",
+					"description": "The extension that take over language support for *.ts."
+				},
 				"volar-angular-language-server.trace.server": {
 					"scope": "window",
 					"type": "string",

angular-language-tools/vscode-angular/src/client.ts

@@ -6,6 +6,7 @@ import {
 	registerShowVirtualFiles,
 	registerTsConfig,
 	registerTsVersion,
+	takeOverModeActive,
 } from '@volar/vscode-language-client';
 import * as os from 'os';
 import * as fs from 'fs';
@@ -14,6 +15,26 @@ let client: lsp.BaseLanguageClient;
 
 export async function activate(context: vscode.ExtensionContext) {
 
+	const stopCheck = vscode.window.onDidChangeActiveTextEditor(tryActivate);
+	tryActivate();
+
+	function tryActivate() {
+
+		if (!vscode.window.activeTextEditor) {
+			return;
+		}
+
+		const currentLangId = vscode.window.activeTextEditor.document.languageId;
+		const takeOverMode = takeOverModeActive(context);
+		if (takeOverMode && ['javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'html'].includes(currentLangId)) {
+			doActivate(context);
+			stopCheck.dispose();
+		}
+	}
+}
+
+async function doActivate(context: vscode.ExtensionContext) {
+
 	const cancellationPipeName = path.join(os.tmpdir() as path.OsPath, `vscode-${context.extension.id}-cancellation-pipe.tmp` as path.PosixPath);
 	const isSupportDoc = (document: vscode.TextDocument) => documentSelector.some(selector => selector.language === document.languageId);
 	let cancellationPipeUpdateKey: string | undefined;

package.json

@@ -9,11 +9,12 @@
 		"watch:typescript-vue-plugin": "cd ./vue-language-tools/vscode-typescript-vue-plugin && npm run watch",
 		"prerelease": "npm run build && npm run test",
 		"version:test": "lerna version --exact --force-publish --yes --sync-workspace-lock --no-push --no-git-tag-version",
-		"release": "npm run release:base && npm run release:vue && npm run release:pug && npm run release:typescript-vue-plugin",
+		"release": "npm run release:base && npm run release:vue && npm run release:pug && npm run release:angular && npm run release:typescript-vue-plugin",
 		"release:base": "lerna publish --exact --force-publish --yes --sync-workspace-lock",
 		"release:base-next": "lerna publish --exact --force-publish --yes --sync-workspace-lock --dist-tag next",
 		"release:vue": "cd ./vue-language-tools/vscode-vue && npm run release",
 		"release:pug": "cd ./pug-language-tools/vscode-pug && npm run release",
+		"release:angular": "cd ./angular-language-tools/vscode-angular && npm run release",
 		"release:typescript-vue-plugin": "cd ./vue-language-tools/vscode-typescript-vue-plugin && npm run release",
 		"test": "vitest run",
 		"docs:dev": "cd docs && npm run dev",

packages/vscode-language-client/src/index.ts

@@ -1,3 +1,5 @@
+import * as vscode from 'vscode';
+
 export { register as registerAutoInsertion } from './features/autoInsertion';
 export { register as registerShowVirtualFiles } from './features/showVirtualFiles';
 export { register as registerWriteVirtualFiles } from './features/writeVirtualFiles';
@@ -8,3 +10,10 @@ export { register as registerTsConfig } from './features/tsconfig';
 export { register as registerShowReferences } from './features/showReferences';
 export { register as registerServerSys } from './features/serverSys';
 export { register as registerTsVersion, getTsdk } from './features/tsVersion';
+
+export function takeOverModeActive(context: vscode.ExtensionContext) {
+	if (vscode.workspace.getConfiguration('volar').get<string>('takeOverMode.extension') === context.extension.id) {
+		return !vscode.extensions.getExtension('vscode.typescript-language-features');
+	}
+	return false;
+}

vue-language-tools/vscode-vue/package.json

@@ -420,7 +420,7 @@
 					"items": {
 						"type": "string"
 					},
-					"default": [],
+					"default": [ ],
 					"description": "List any additional file extensions that should be processed as Vue files (requires restart)."
 				},
 				"volar.codeLens.references": {
@@ -526,21 +526,10 @@
 						}
 					}
 				},
-				"volar.takeOverMode.enabled": {
-					"type": [
-						"boolean",
-						"string"
-					],
-					"enum": [
-						"auto",
-						false
-					],
-					"enumDescriptions": [
-						"Auto enable take over mode when built-in TS extension disabled.",
-						"Never enable take over mode."
-					],
-					"default": "auto",
-					"description": "Take over language support for *.ts."
+				"volar.takeOverMode.extension": {
+					"type": "string",
+					"default": "Vue.volar",
+					"description": "The extension that take over language support for *.ts."
 				},
 				"volar.completion.preferredTagNameCase": {
 					"type": "string",

vue-language-tools/vscode-vue/src/common.ts

@@ -10,6 +10,7 @@ import {
 	registerServerSys,
 	registerTsVersion,
 	getTsdk,
+	takeOverModeActive,
 } from '@volar/vscode-language-client';
 import { DiagnosticModel, ServerMode, VueServerInitializationOptions } from '@volar/vue-language-server';
 import * as vscode from 'vscode';
@@ -56,7 +57,7 @@ export async function activate(context: vscode.ExtensionContext, createLc: Creat
 			stopCheck.dispose();
 		}
 
-		const takeOverMode = takeOverModeEnabled();
+		const takeOverMode = takeOverModeActive(context);
 		if (takeOverMode && ['javascript', 'typescript', 'javascriptreact', 'typescriptreact'].includes(currentLangId)) {
 			doActivate(context, createLc);
 			stopCheck.dispose();
@@ -71,15 +72,15 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 	semanticClient = createLc(
 		'vue-semantic-server',
 		'Vue Semantic Server',
-		getDocumentSelector(ServerMode.Semantic),
+		getDocumentSelector(context, ServerMode.Semantic),
 		getInitializationOptions(ServerMode.Semantic, context),
 		getFillInitializeParams([LanguageFeaturesKind.Semantic]),
 		6009,
 	);
 	syntacticClient = createLc(
 		'vue-syntactic-server',
 		'Vue Syntactic Server',
-		getDocumentSelector(ServerMode.Syntactic),
+		getDocumentSelector(context, ServerMode.Syntactic),
 		getInitializationOptions(ServerMode.Syntactic, context),
 		getFillInitializeParams([LanguageFeaturesKind.Syntactic]),
 		6011,
@@ -113,7 +114,7 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 				|| (processMd() && document.languageId === 'markdown')
 				|| (processHtml() && document.languageId === 'html')
 				|| (
-					takeOverModeEnabled()
+					takeOverModeActive(context)
 					&& ['javascript', 'typescript', 'javascriptreact', 'typescriptreact'].includes(document.languageId)
 				);
 		},
@@ -126,14 +127,12 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 				|| (processMd() && document.languageId === 'markdown')
 				|| (processHtml() && document.languageId === 'html')
 				|| (
-					takeOverModeEnabled()
+					takeOverModeActive(context)
 					&& ['javascript', 'typescript', 'javascriptreact', 'typescriptreact'].includes(document.languageId)
 				);
 		},
 		text => {
-			if (takeOverModeEnabled()) {
-				text += ' (vue)';
-			}
+			text += ' (vue)';
 			if (noProjectReferences()) {
 				text += ' (noProjectReferences)';
 			}
@@ -191,16 +190,8 @@ export function deactivate(): Thenable<any> | undefined {
 	]);
 }
 
-export function takeOverModeEnabled() {
-	const status = vscode.workspace.getConfiguration('volar').get<false | 'auto'>('takeOverMode.enabled');
-	if (status /* true | 'auto' */) {
-		return !vscode.extensions.getExtension('vscode.typescript-language-features');
-	}
-	return false;
-}
-
-export function getDocumentSelector(serverMode: ServerMode) {
-	const takeOverMode = takeOverModeEnabled();
+export function getDocumentSelector(context: vscode.ExtensionContext, serverMode: ServerMode) {
+	const takeOverMode = takeOverModeActive(context);
 	const langs = takeOverMode ? [
 		'vue',
 		'javascript',

vue-language-tools/vscode-vue/src/nodeClientMain.ts

@@ -11,7 +11,7 @@ import * as preview from './features/preview';
 export function activate(context: vscode.ExtensionContext) {
 
 	const cancellationPipeName = path.join(os.tmpdir(), `vscode-${context.extension.id}-cancellation-pipe.tmp`);
-	const langs = getDocumentSelector(ServerMode.Semantic);
+	const langs = getDocumentSelector(context, ServerMode.Semantic);
 	let cancellationPipeUpdateKey: string | undefined;
 
 	vscode.workspace.onDidChangeTextDocument((e) => {