only create one output channel for the language server (#7160)

firebase · May 10, 2024 · 03176c5 · 03176c5
1 parent d2e1172
commit 03176c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/firebase-vscode/src/data-connect/index.ts b/firebase-vscode/src/data-connect/index.ts
@@ -153,17 +153,19 @@ export function registerFdc(
   );
   const schemaCodeLensProvider = new SchemaCodeLensProvider(emulatorController);
 
+  // activate language client/serer
   let client: LanguageClient;
+  const lsOutputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(
+    "Firebase GraphQL Language Server",
+  );
+
   // setup new language client on config change
   context.subscriptions.push({
     dispose: effect(() => {
       const configs = dataConnectConfigs.value?.tryReadValue;
       if (client) client.stop();
       if (configs && configs.values.length > 0) {
-        client = setupLanguageClient(
-          context,
-          configs,
-        );
+        client = setupLanguageClient(context, configs, lsOutputChannel);
         vscode.commands.executeCommand("fdc-graphql.start");
       }
     }),
@@ -179,7 +181,7 @@ export function registerFdc(
         vscode.commands.executeCommand(
           "firebase.dataConnect.executeIntrospection",
         );
-        runEmulatorIssuesStream(configs,fdcService.localEndpoint.value);
+        runEmulatorIssuesStream(configs, fdcService.localEndpoint.value);
         runDataConnectCompiler(configs, fdcService.localEndpoint.value);
       }
     }),
@@ -205,7 +207,7 @@ export function registerFdc(
   return Disposable.from(
     codeActions,
     selectedProjectStatus,
-    {dispose: sub1},
+    { dispose: sub1 },
     {
       dispose: effect(() => {
         selectedProjectStatus.text = `$(mono-firebase) ${

diff --git a/firebase-vscode/src/data-connect/language-client.ts b/firebase-vscode/src/data-connect/language-client.ts
@@ -12,12 +12,8 @@ import { ResolvedDataConnectConfigs } from "./config";
 export function setupLanguageClient(
   context,
   configs: ResolvedDataConnectConfigs,
+  outputChannel: vscode.OutputChannel,
 ) {
-  // activate language client/serer
-  const outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(
-    "Firebase GraphQL Language Server",
-  );
-
   const serverPath = path.join("dist", "server.js");
   const serverModule = context.asAbsolutePath(serverPath);