[pull] master from vuejs:master

extensions/vscode/src/features/doctor.ts

@@ -265,7 +265,7 @@ function getPackageJsonOfWorkspacePackage(folder: string, pkg: string) {
 		const path = require.resolve(pkg + '/package.json', { paths: [folder] });
 		return {
 			path,
-			json: require(path) as { version: string },
+			json: require(path) as { version: string; },
 		};
 	} catch { }
 }

extensions/vscode/src/hybridMode.ts

@@ -28,7 +28,7 @@ export const enabledHybridMode = computed(() => {
 		return true;
 	}
 	return config.server.hybridMode;
-})
+});
 
 export const enabledTypeScriptPlugin = computed(() => {
 	return (

package.json

@@ -16,14 +16,17 @@
 		"test": "vitest run",
 		"test:update": "vitest run --update",
 		"lint": "tsslint --projects {tsconfig.json,packages/*/tsconfig.json,extensions/*/tsconfig.json}",
-		"lint:fix": "pnpm run lint -- --fix",
+		"lint:fix": "pnpm run lint -- --fix --vscode-settings .vscode/settings.json",
 		"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode ../volar-starter"
 	},
 	"devDependencies": {
 		"@lerna-lite/cli": "latest",
 		"@lerna-lite/publish": "latest",
 		"@tsslint/cli": "latest",
 		"@tsslint/config": "latest",
+		"@tsslint/eslint": "latest",
+		"@typescript-eslint/eslint-plugin": "latest",
+		"@vue/language-core": "2.2.0",
 		"typescript": "latest",
 		"vitest": "latest"
 	}

packages/language-core/lib/codegen/script/template.ts

@@ -57,7 +57,7 @@ function* generateTemplateComponents(options: ScriptCodegenOptions): Generator<C
 
 	if (options.sfc.script && options.scriptRanges?.exportDefault?.componentsOption) {
 		const { componentsOption } = options.scriptRanges.exportDefault;
-		yield `const __VLS_componentsOption = `
+		yield `const __VLS_componentsOption = `;
 		yield [
 			options.sfc.script.content.slice(componentsOption.start, componentsOption.end),
 			'script',

packages/language-core/lib/codegen/template/interpolation.ts

@@ -9,7 +9,7 @@ export function* generateInterpolation(
 	options: {
 		ts: typeof ts,
 		destructuredPropNames: Set<string> | undefined,
-		templateRefNames: Set<string> | undefined
+		templateRefNames: Set<string> | undefined;
 	},
 	ctx: TemplateCodegenContext,
 	source: string,

packages/language-core/lib/parsers/scriptSetupRanges.ts

@@ -20,35 +20,35 @@ type DefineProp = {
 	defaultValue?: TextRange;
 	required?: boolean;
 	isModel?: boolean;
-}
+};
 
 type DefineProps = CallExpressionRange & {
 	name?: string;
 	destructured?: Set<string>;
 	destructuredRest?: string;
 	statement: TextRange;
-}
+};
 
 type WithDefaults = Pick<CallExpressionRange, 'callExp' | 'exp' | 'arg'>;
 
 type DefineEmits = CallExpressionRange & {
 	name?: string;
 	hasUnionTypeArg?: boolean;
 	statement: TextRange;
-}
+};
 
 type DefineSlots = CallExpressionRange & {
 	name?: string;
 	isObjectBindingPattern?: boolean;
 	statement: TextRange;
-}
+};
 
 type DefineExpose = CallExpressionRange;
 
 type DefineOptions = {
 	name?: string;
 	inheritAttrs?: string;
-}
+};
 
 type UseAttrs = CallExpressionRange;
 
@@ -58,7 +58,7 @@ type UseSlots = CallExpressionRange;
 
 type UseTemplateRef = CallExpressionRange & {
 	name?: string;
-}
+};
 
 export interface ScriptSetupRanges extends ReturnType<typeof parseScriptSetupRanges> { }