Skip to content

Commit c742a1c

Browse files
fix(vscode): Improved reliability of handling extension activation contention (#5588)
1 parent b3a39de commit c742a1c

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

extensions/vscode/index.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const { activate, deactivate } = defineExtension(() => {
5858

5959
if (needRestart) {
6060
vscode.window.showInformationMessage(
61-
'Please restart the extension host to activate Vue support in remote environments.',
61+
'Please restart the extension host to activate Vue support.',
6262
'Restart Extension Host',
6363
'Reload Window',
6464
).then(action => {
@@ -230,12 +230,7 @@ try {
230230
}
231231

232232
if (tsExtension.isActive) {
233-
if (!vscode.env.remoteName) {
234-
vscode.commands.executeCommand('workbench.action.restartExtensionHost');
235-
}
236-
else {
237-
needRestart = true;
238-
}
233+
needRestart = true;
239234
}
240235
}
241236
catch {}

extensions/vscode/languages/stub.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

extensions/vscode/package.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
"vscode": "^1.88.0"
2323
},
2424
"activationEvents": [
25-
"onLanguage:vue",
26-
"onLanguage:markdown",
27-
"onLanguage:html"
25+
"onLanguage"
2826
],
2927
"main": "./dist/extension.js",
3028
"browser": "./web.js",
@@ -67,11 +65,6 @@
6765
{
6866
"id": "jade",
6967
"configuration": "./languages/sfc-template-language-configuration.json"
70-
},
71-
{
72-
"id": "plaintext",
73-
"configuration": "./languages/stub.json",
74-
"//": "Make sure Vue extension is loaded immediately when VSCode starts."
7568
}
7669
],
7770
"typescriptServerPlugins": [

0 commit comments

Comments
 (0)