refactor(vscode): move restart & toggle lsp server to linter.ts

Author: Sysix

editors/vscode/client/commands.ts

@@ -1,9 +1,9 @@
 const commandPrefix = 'oxc';
 
 export const enum OxcCommands {
-  RestartServer = `${commandPrefix}.restartServer`,
   ShowOutputChannel = `${commandPrefix}.showOutputChannel`,
-  ToggleEnable = `${commandPrefix}.toggleEnable`,
   // only for linter.ts usage
+  RestartServer = `${commandPrefix}.restartServer`,
+  ToggleEnable = `${commandPrefix}.toggleEnable`,
   ApplyAllFixesFile = `${commandPrefix}.applyAllFixesFile`,
 }

editors/vscode/client/extension.ts

@@ -15,20 +15,10 @@ export async function activate(context: ExtensionContext) {
     log: true,
   });
 
-  const restartCommand = commands.registerCommand(OxcCommands.RestartServer, async () => {
-    await linter.restartClient();
-  });
-
   const showOutputCommand = commands.registerCommand(OxcCommands.ShowOutputChannel, () => {
     outputChannel.show();
   });
 
-  const toggleEnable = commands.registerCommand(OxcCommands.ToggleEnable, async () => {
-    await configService.vsCodeConfig.updateEnable(!configService.vsCodeConfig.enable);
-
-    await linter.toggleClient(configService);
-  });
-
   const onDidChangeWorkspaceFoldersDispose = workspace.onDidChangeWorkspaceFolders(async (event) => {
     for (const folder of event.added) {
       configService.addWorkspaceConfig(folder);
@@ -41,9 +31,7 @@ export async function activate(context: ExtensionContext) {
   const statusBarItemHandler = new StatusBarItemHandler(context.extension.packageJSON?.version);
 
   context.subscriptions.push(
-    restartCommand,
     showOutputCommand,
-    toggleEnable,
     configService,
     outputChannel,
     onDidChangeWorkspaceFoldersDispose,

editors/vscode/client/tools/ToolInterface.ts

@@ -27,16 +27,6 @@ export default interface ToolInterface {
    */
   deactivate(): Promise<void>;
 
-  /**
-   * Toggles the tool's active state based on configuration.
-   */
-  toggleClient(configService: ConfigService): Promise<void>;
-
-  /**
-   * Restart the tool.
-   */
-  restartClient(): Promise<void>;
-
   /**
    * Handles configuration changes.
    */

editors/vscode/client/tools/linter.ts

@@ -58,6 +58,16 @@ export default class LinterTool implements ToolInterface {
       ? (await workspace.findFiles(`**/.oxlintrc.json`, '**/node_modules/**', 1)).length > 0
       : true;
 
+    const restartCommand = commands.registerCommand(OxcCommands.RestartServer, async () => {
+      await this.restartClient();
+    });
+
+    const toggleEnable = commands.registerCommand(OxcCommands.ToggleEnable, async () => {
+      await configService.vsCodeConfig.updateEnable(!configService.vsCodeConfig.enable);
+
+      await this.toggleClient(configService);
+    });
+
     const applyAllFixesFile = commands.registerCommand(OxcCommands.ApplyAllFixesFile, async () => {
       if (!this.client) {
         window.showErrorMessage('oxc client not found');
@@ -81,7 +91,7 @@ export default class LinterTool implements ToolInterface {
       await this.client.sendRequest(ExecuteCommandRequest.type, params);
     });
 
-    context.subscriptions.push(applyAllFixesFile);
+    context.subscriptions.push(restartCommand, toggleEnable, applyAllFixesFile);
 
     const run: Executable = runExecutable(binaryPath, configService.vsCodeConfig.nodePath);
     const serverOptions: ServerOptions = {

editors/vscode/tests/commands.spec.ts

@@ -36,8 +36,8 @@ suite('commands', () => {
     ];
 
     deepStrictEqual([
-      'oxc.restartServer',
       'oxc.showOutputChannel',
+      'oxc.restartServer',
       'oxc.toggleEnable',
       'oxc.applyAllFixesFile', // TODO: only if linter tests are enabled
       ...extraCommands,