chore(lint): fix lint config for extensions/vscode/tsconfig.json

extensions/vscode/package.json

@@ -263,7 +263,7 @@
 					"items": {
 						"type": "string"
 					},
-					"default": [],
+					"default": [ ],
 					"description": "List any additional file extensions that should be processed as Vue files (requires restart)."
 				},
 				"vue.doctor.status": {
@@ -495,7 +495,6 @@
 		"esbuild-plugin-copy": "latest",
 		"esbuild-visualizer": "latest",
 		"semver": "^7.5.4",
-		"vsce": "latest",
-		"vscode-languageclient": "^9.0.1"
+		"vsce": "latest"
 	}
 }

extensions/vscode/src/common.ts

@@ -1,15 +1,6 @@
-import {
-	activateAutoInsertion,
-	activateDocumentDropEdit,
-	activateServerSys,
-	activateWriteVirtualFiles,
-	activateTsConfigStatusItem,
-	activateTsVersionStatusItem,
-	getTsdk,
-} from '@volar/vscode';
 import { DiagnosticModel, VueInitializationOptions } from '@vue/language-server';
 import * as vscode from 'vscode';
-import type * as lsp from 'vscode-languageclient';
+import * as lsp from '@volar/vscode';
 import { config } from './config';
 import * as doctor from './features/doctor';
 import * as nameCasing from './features/nameCasing';
@@ -76,14 +67,14 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 	splitEditors.register(context, client);
 	doctor.register(context, client);
 
-	activateAutoInsertion(selectors, client);
-	activateDocumentDropEdit(selectors, client);
-	activateWriteVirtualFiles('vue.action.writeVirtualFiles', client);
-	activateServerSys(client);
+	lsp.activateAutoInsertion(selectors, client);
+	lsp.activateDocumentDropEdit(selectors, client);
+	lsp.activateWriteVirtualFiles('vue.action.writeVirtualFiles', client);
+	lsp.activateServerSys(client);
 
 	if (!config.server.hybridMode) {
-		activateTsConfigStatusItem(selectors, 'vue.tsconfig', client);
-		activateTsVersionStatusItem(selectors, 'vue.tsversion', context, client, text => 'TS ' + text);
+		lsp.activateTsConfigStatusItem(selectors, 'vue.tsconfig', client);
+		lsp.activateTsVersionStatusItem(selectors, 'vue.tsversion', context, client, text => 'TS ' + text);
 	}
 
 	const hybridModeStatus = vscode.languages.createLanguageStatusItem('vue-hybrid-mode', selectors);
@@ -189,7 +180,7 @@ async function getInitializationOptions(
 	return {
 		// volar
 		diagnosticModel: config.server.diagnosticModel === 'pull' ? DiagnosticModel.Pull : DiagnosticModel.Push,
-		typescript: { tsdk: (await getTsdk(context)).tsdk },
+		typescript: { tsdk: (await lsp.getTsdk(context)).tsdk },
 		maxFileSize: config.server.maxFileSize,
 		semanticTokensLegend: {
 			tokenTypes: ['component'],

extensions/vscode/src/features/doctor.ts

@@ -1,8 +1,7 @@
-import { getTsdk } from '@volar/vscode';
+import { BaseLanguageClient, getTsdk } from '@volar/vscode';
 import { ParseSFCRequest } from '@vue/language-server';
 import * as semver from 'semver';
 import * as vscode from 'vscode';
-import type { BaseLanguageClient } from 'vscode-languageclient';
 import { config } from '../config';
 
 const scheme = 'vue-doctor';

extensions/vscode/src/features/nameCasing.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import { quickPick } from '@volar/vscode/lib/common';
-import { BaseLanguageClient, State } from 'vscode-languageclient';
+import { BaseLanguageClient, State } from '@volar/vscode';
 import { AttrNameCasing, TagNameCasing, DetectNameCasingRequest, GetConvertAttrCasingEditsRequest, GetConvertTagCasingEditsRequest } from '@vue/language-server';
 import { config } from '../config';
 

extensions/vscode/src/features/splitEditors.ts

@@ -1,6 +1,6 @@
+import type { BaseLanguageClient } from '@volar/vscode';
 import { ParseSFCRequest } from '@vue/language-server';
 import * as vscode from 'vscode';
-import type { BaseLanguageClient } from 'vscode-languageclient';
 import { config } from '../config';
 
 type SFCBlock = ParseSFCRequest.ResponseType['descriptor']['customBlocks'][number];

extensions/vscode/src/middleware.ts

@@ -1,11 +1,10 @@
-import { middleware as baseMiddleware } from '@volar/vscode';
 import { AttrNameCasing, TagNameCasing } from '@vue/language-server';
 import * as vscode from 'vscode';
-import type * as lsp from 'vscode-languageclient';
+import * as lsp from '@volar/vscode';
 import { attrNameCasings, tagNameCasings } from './features/nameCasing';
 
 export const middleware: lsp.Middleware = {
-	...baseMiddleware,
+	...lsp.middleware,
 	async resolveCodeAction(item, token, next) {
 		if (item.kind?.value === 'refactor.move.newFile.dumb') {
 			const inputName = await vscode.window.showInputBox({ value: (item as any).data.original.data.newName });
@@ -14,7 +13,7 @@ export const middleware: lsp.Middleware = {
 			}
 			(item as any).data.original.data.newName = inputName;
 		}
-		return await (baseMiddleware.resolveCodeAction?.(item, token, next) ?? next(item, token));
+		return await (lsp.middleware.resolveCodeAction?.(item, token, next) ?? next(item, token));
 	},
 	workspace: {
 		configuration(params, token, next) {

extensions/vscode/src/nodeClientMain.ts

@@ -2,7 +2,7 @@ import { createLabsInfo } from '@volar/vscode';
 import * as serverLib from '@vue/language-server';
 import * as fs from 'fs';
 import * as vscode from 'vscode';
-import * as lsp from 'vscode-languageclient/node';
+import * as lsp from '@volar/vscode/node';
 import { activate as commonActivate, deactivate as commonDeactivate } from './common';
 import { config } from './config';
 import { middleware } from './middleware';

package.json

@@ -14,7 +14,7 @@
 		"release:next-base": "npm run release:base -- --dist-tag next",
 		"release:next-vue": "cd ./extensions/vscode && npm run release:next",
 		"test": "vitest run",
-		"lint": "tsl --projects packages/*/tsconfig.json",
+		"lint": "tsl --projects {packages/*/tsconfig.json,extensions/*/tsconfig.json}",
 		"lint:fix": "npm run lint -- --fix",
 		"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode ../volar-starter"
 	},

tsl.config.ts

@@ -1 +1,16 @@
-export { default } from '@volar/tsl-config';
+import VolarLintConfig from '@volar/tsl-config';
+import { defineConfig } from 'tsl';
+
+export default defineConfig({
+	...VolarLintConfig,
+	plugins: [
+		ctx => ({
+			resolveRules(rules) {
+				if (ctx.tsconfig.endsWith('extensions/vscode/tsconfig.json')) {
+					delete rules['missing-dependency'];
+				}
+				return rules;
+			},
+		}),
+	]
+});