diff --git a/extensions/vscode/index.ts b/extensions/vscode/index.ts index ffbfee3ded..59a5d95b53 100644 --- a/extensions/vscode/index.ts +++ b/extensions/vscode/index.ts @@ -19,7 +19,6 @@ import { config } from './lib/config'; import { activate as activateWelcome } from './lib/welcome'; let client: lsp.BaseLanguageClient | undefined; -let needRestart = false; for ( const incompatibleExtensionId of [ @@ -56,22 +55,6 @@ export const { activate, deactivate } = defineExtension(() => { nextTick(() => stop()); - if (needRestart) { - vscode.window.showInformationMessage( - 'Please restart the extension host to activate Vue support in remote environments.', - 'Restart Extension Host', - 'Reload Window', - ).then(action => { - if (action === 'Restart Extension Host') { - vscode.commands.executeCommand('workbench.action.restartExtensionHost'); - } - else if (action === 'Reload Window') { - vscode.commands.executeCommand('workbench.action.reloadWindow'); - } - }); - return; - } - watch(() => config.server.includeLanguages, async () => { const reload = await vscode.window.showInformationMessage( 'Please restart extension host to apply the new language settings.', @@ -172,7 +155,9 @@ function launch(context: vscode.ExtensionContext) { return client; } -try { +patchTypescriptExtension(); + +function patchTypescriptExtension() { const fs = require('node:fs'); const tsExtension = vscode.extensions.getExtension('vscode.typescript-language-features')!; const readFileSync = fs.readFileSync; @@ -221,21 +206,4 @@ try { } return readFileSync(...args); }; - - const loadedModule = require.cache[extensionJsPath]; - if (loadedModule) { - delete require.cache[extensionJsPath]; - const patchedModule = require(extensionJsPath); - Object.assign(loadedModule.exports, patchedModule); - } - - if (tsExtension.isActive) { - if (!vscode.env.remoteName) { - vscode.commands.executeCommand('workbench.action.restartExtensionHost'); - } - else { - needRestart = true; - } - } } -catch {} diff --git a/extensions/vscode/languages/stub.json b/extensions/vscode/languages/stub.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/extensions/vscode/languages/stub.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json index 8668a57acd..7650cbab1f 100644 --- a/extensions/vscode/package.json +++ b/extensions/vscode/package.json @@ -22,9 +22,7 @@ "vscode": "^1.88.0" }, "activationEvents": [ - "onLanguage:vue", - "onLanguage:markdown", - "onLanguage:html" + "onLanguage" ], "main": "./dist/extension.js", "browser": "./web.js", @@ -67,11 +65,6 @@ { "id": "jade", "configuration": "./languages/sfc-template-language-configuration.json" - }, - { - "id": "plaintext", - "configuration": "./languages/stub.json", - "//": "Make sure Vue extension is loaded immediately when VSCode starts." } ], "typescriptServerPlugins": [