Merge branch 'master' into fix-marketplace-page

.github/workflows/update-html-data.yml

@@ -1,6 +1,9 @@
 name: update-html-data
 
 on:
+  push:
+    branches:
+    - 'master'
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'

CHANGELOG.md

@@ -97,7 +97,7 @@
 
 - **language-core:** split `__VLS_templateResult` (#4781) - Thanks to @KazariEX!
 - **language-core:** wrap template virtual code into a function (#4784)
-- **language-core:** move `templateRef` into `composibles` (#4791) - Thanks to @KazariEX!
+- **language-core:** move `templateRef` into `composables` (#4791) - Thanks to @KazariEX!
 - **language-core:** generate global types for the first parsed Vue component if cannot write global types file
 
 ### Tests

extensions/vscode/README.md

@@ -277,6 +277,7 @@ Finally you need to make VS Code recognize your new extension and automatically
 | ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------- | ----------------------------------- |
 | `vue.trace.server`                    | Traces the communication between VS Code and the language server.                                                                                                  | `string`         | `"off"`                             |
 | `vue.server.hybridMode`               | Vue language server only handles CSS and HTML language support, and tsserver takes over TS language support via TS plugin.                                         | `boolean,string` | `"auto"`                            |
+| `vue.server.compatibleExtensions`     | Set compatible extensions to skip automatic detection of Hybrid Mode.                                                                                              | `array`          | `[]`                                |
 | `vue.server.includeLanguages`         |                                                                                                                                                                    | `array`          | `["vue"]`                           |
 | `vue.server.maxOldSpaceSize`          | Set --max-old-space-size option on server process. If you have problem on frequently "Request textDocument/** failed." error, try setting higher memory(MB) on it. | `number,null`    | `null`                              |
 | `vue.doctor.status`                   | Show known problems in status bar.                                                                                                                                 | `boolean`        | `true`                              |

extensions/vscode/package.json

@@ -274,6 +274,14 @@
 					],
 					"description": "Vue language server only handles CSS and HTML language support, and tsserver takes over TS language support via TS plugin."
 				},
+				"vue.server.compatibleExtensions": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": [],
+					"description": "Set compatible extensions to skip automatic detection of Hybrid Mode."
+				},
 				"vue.server.includeLanguages": {
 					"type": "array",
 					"items": {
@@ -557,14 +565,14 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.4.9",
+		"@volar/vscode": "~2.4.11",
 		"@vscode/vsce": "latest",
 		"@vue/language-core": "2.1.10",
 		"@vue/language-server": "2.1.10",
 		"@vue/typescript-plugin": "2.1.10",
 		"esbuild": "latest",
 		"esbuild-visualizer": "latest",
-		"reactive-vscode": "0.2.7",
+		"reactive-vscode": "^0.2.9",
 		"semver": "^7.5.4",
 		"vscode-ext-gen": "^0.5.0",
 		"vscode-tmlanguage-snapshot": "latest"

extensions/vscode/src/compatibility.ts

@@ -1,6 +1,29 @@
 import { computed, useAllExtensions } from 'reactive-vscode';
 import * as semver from 'semver';
 import * as vscode from 'vscode';
+import { config } from './config';
+
+const defaultCompatibleExtensions = new Set([
+	'astro-build.astro-vscode',
+	'bierner.lit-html',
+	'Divlo.vscode-styled-jsx-languageserver',
+	'GitHub.copilot-chat',
+	'ije.esm-vscode',
+	'jenkey2011.string-highlight',
+	'johnsoncodehk.vscode-tsslint',
+	'kimuson.ts-type-expand',
+	'miaonster.vscode-tsx-arrow-definition',
+	'ms-dynamics-smb.al',
+	'mxsdev.typescript-explorer',
+	'nrwl.angular-console',
+	'p42ai.refactor',
+	'runem.lit-plugin',
+	'ShenQingchuan.vue-vine-extension',
+	'styled-components.vscode-styled-components',
+	'unifiedjs.vscode-mdx',
+	'VisualStudioExptTeam.vscodeintellicode',
+	'Vue.volar',
+]);
 
 const extensions = useAllExtensions();
 
@@ -18,24 +41,8 @@ export const unknownExtensions = computed(() => {
 
 function isExtensionCompatibleWithHybridMode(extension: vscode.Extension<any>) {
 	if (
-		extension.id === 'Vue.volar'
-		|| extension.id === 'unifiedjs.vscode-mdx'
-		|| extension.id === 'astro-build.astro-vscode'
-		|| extension.id === 'ije.esm-vscode'
-		|| extension.id === 'johnsoncodehk.vscode-tsslint'
-		|| extension.id === 'VisualStudioExptTeam.vscodeintellicode'
-		|| extension.id === 'bierner.lit-html'
-		|| extension.id === 'jenkey2011.string-highlight'
-		|| extension.id === 'mxsdev.typescript-explorer'
-		|| extension.id === 'miaonster.vscode-tsx-arrow-definition'
-		|| extension.id === 'runem.lit-plugin'
-		|| extension.id === 'kimuson.ts-type-expand'
-		|| extension.id === 'p42ai.refactor'
-		|| extension.id === 'styled-components.vscode-styled-components'
-		|| extension.id === 'Divlo.vscode-styled-jsx-languageserver'
-		|| extension.id === 'nrwl.angular-console'
-		|| extension.id === 'ShenQingchuan.vue-vine-extension'
-		|| extension.id === 'ms-dynamics-smb.al'
+		defaultCompatibleExtensions.has(extension.id) ||
+		config.server.compatibleExtensions.includes(extension.id)
 	) {
 		return true;
 	}

extensions/vscode/src/features/doctor.ts

@@ -157,12 +157,12 @@ export async function activate(client: BaseLanguageClient) {
 					'',
 					'- package.json',
 					'```json',
-					JSON.stringify({ devDependencies: { "@vue/language-plugin-pug": "latest" } }, undefined, 2),
+					JSON.stringify({ devDependencies: { '@vue/language-plugin-pug': 'latest' } }, undefined, 2),
 					'```',
 					'',
 					'- tsconfig.json / jsconfig.json',
 					'```jsonc',
-					JSON.stringify({ vueCompilerOptions: { plugins: ["@vue/language-plugin-pug"] } }, undefined, 2),
+					JSON.stringify({ vueCompilerOptions: { plugins: ['@vue/language-plugin-pug'] } }, undefined, 2),
 					'```',
 				].join('\n'),
 			});