chore(vscode): second language server connection for oxfmt

Author: Sysix

editors/vscode/.vscode-test.mjs

@@ -58,9 +58,25 @@ export default defineConfig({
       ],
       env: {
         SINGLE_FOLDER_WORKSPACE: 'true',
-        OXLINT_LSP_TEST: 'true',
         SERVER_PATH_DEV: path.resolve(import.meta.dirname, `../../apps/oxlint/dist/cli.js`),
-        SKIP_FORMATTER_TEST: 'true',
+        SKIP_LINTER_TEST: 'true',
+      },
+      mocha: {
+        timeout: 10_000,
+      },
+    },
+    // Oxfmt --lsp tests
+    {
+      files: 'out/**/*.spec.js',
+      workspaceFolder: './test_workspace',
+      launchArgs: [
+        // This disables all extensions except the one being tested
+        '--disable-extensions',
+      ],
+      env: {
+        SINGLE_FOLDER_WORKSPACE: 'true',
+        SERVER_PATH_DEV: path.resolve(import.meta.dirname, `../../apps/oxfmt/dist/cli.js`),
+        SKIP_LINTER_TEST: 'true',
       },
       mocha: {
         timeout: 10_000,

editors/vscode/client/ConfigService.ts

@@ -84,6 +84,12 @@ export class ConfigService implements IDisposable {
     return bin;
   }
 
+  public async getOxfmtServerBinPath(): Promise<string | undefined> {
+    const files = await workspace.findFiles('**/node_modules/.bin/oxfmt', null, 1);
+
+    return files.length > 0 ? files[0].fsPath : undefined;
+  }
+
   private async onVscodeConfigChange(event: ConfigurationChangeEvent): Promise<void> {
     let isConfigChanged = false;
 

editors/vscode/client/extension.ts

@@ -2,35 +2,56 @@ import { commands, ExtensionContext, window, workspace } from 'vscode';
 
 import { OxcCommands } from './commands';
 import { ConfigService } from './ConfigService';
+import {
+  activate as activateFormatter,
+  deactivate as deactivateFormatter,
+  onConfigChange as onConfigChangeFormatter,
+  restartClient as restartFormatter,
+  toggleClient as toggleFormatter,
+} from './formatter';
 import {
   activate as activateLinter,
   deactivate as deactivateLinter,
   onConfigChange as onConfigChangeLinter,
-  restartClient,
-  toggleClient,
+  restartClient as restartLinter,
+  toggleClient as toggleLinter,
 } from './linter';
 
 const outputChannelName = 'Oxc';
 
 export async function activate(context: ExtensionContext) {
   const configService = new ConfigService();
 
-  const outputChannel = window.createOutputChannel(outputChannelName, {
+  const outputChannelLint = window.createOutputChannel(outputChannelName + ' (Lint)', {
+    log: true,
+  });
+
+  const outputChannelFormat = window.createOutputChannel(outputChannelName + ' (Fmt)', {
     log: true,
   });
 
   const restartCommand = commands.registerCommand(OxcCommands.RestartServer, async () => {
-    await restartClient();
+    if (process.env.SKIP_LINTER_TEST !== 'true') {
+      await restartLinter();
+    }
+    if (process.env.SKIP_FORMATTER_TEST !== 'true') {
+      await restartFormatter();
+    }
   });
 
   const showOutputCommand = commands.registerCommand(OxcCommands.ShowOutputChannel, () => {
-    outputChannel.show();
+    outputChannelLint.show();
   });
 
   const toggleEnable = commands.registerCommand(OxcCommands.ToggleEnable, async () => {
     await configService.vsCodeConfig.updateEnable(!configService.vsCodeConfig.enable);
 
-    await toggleClient(configService);
+    if (process.env.SKIP_LINTER_TEST !== 'true') {
+      await toggleLinter(configService);
+    }
+    if (process.env.SKIP_FORMATTER_TEST !== 'true') {
+      await toggleFormatter(configService);
+    }
   });
 
   const onDidChangeWorkspaceFoldersDispose = workspace.onDidChangeWorkspaceFolders(async (event) => {
@@ -47,17 +68,33 @@ export async function activate(context: ExtensionContext) {
     showOutputCommand,
     toggleEnable,
     configService,
-    outputChannel,
+    outputChannelLint,
+    outputChannelFormat,
     onDidChangeWorkspaceFoldersDispose,
   );
 
   configService.onConfigChange = async function onConfigChange(event) {
-    await onConfigChangeLinter(context, event, configService);
+    if (process.env.SKIP_LINTER_TEST !== 'true') {
+      await onConfigChangeLinter(context, event, configService);
+    }
+    if (process.env.SKIP_FORMATTER_TEST !== 'true') {
+      await onConfigChangeFormatter(context, event, configService);
+    }
   };
 
-  await activateLinter(context, outputChannel, configService);
+  if (process.env.SKIP_LINTER_TEST !== 'true') {
+    await activateLinter(context, outputChannelLint, configService);
+  }
+  if (process.env.SKIP_FORMATTER_TEST !== 'true') {
+    await activateFormatter(context, outputChannelFormat, configService);
+  }
 }
 
 export async function deactivate(): Promise<void> {
-  await deactivateLinter();
+  if (process.env.SKIP_LINTER_TEST !== 'true') {
+    await deactivateLinter();
+  }
+  if (process.env.SKIP_FORMATTER_TEST !== 'true') {
+    await deactivateFormatter();
+  }
 }