getConsoleType util (#79)

deephaven · Oct 8, 2024 · 74182f3 · 74182f3
1 parent 6cf8fa0
commit 74182f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/controllers/ConnectionController.ts b/src/controllers/ConnectionController.ts
@@ -14,6 +14,7 @@ import {
   createConnectionQuickPickOptions,
   createConnectStatusBarItem,
   getConnectionsForConsoleType,
+  getConsoleType,
   getEditorForUri,
   isSupportedLanguageId,
   Logger,
@@ -132,7 +133,7 @@ export class ConnectionController implements Disposable {
     if ('url' in connectionOrServer) {
       const cn = await this._serverManager.connectToServer(
         connectionOrServer.url,
-        editor.document.languageId as ConsoleType
+        getConsoleType(editor.document.languageId)
       );
 
       if (cn == null) {

diff --git a/src/controllers/ExtensionController.ts b/src/controllers/ExtensionController.ts
@@ -23,7 +23,7 @@ import {
 } from '../common';
 import {
   assertDefined,
-  getConsoleTypeOrDefault,
+  getConsoleType,
   getEditorForUri,
   getTempDir,
   isInstanceOf,
@@ -528,9 +528,7 @@ export class ExtensionController implements Disposable {
     // Use the active editor's language id to determine the console type or
     // fallback to 'python'.
     const workerConsoleType =
-      serverState.type === 'DHE'
-        ? getConsoleTypeOrDefault(languageId)
-        : undefined;
+      serverState.type === 'DHE' ? getConsoleType(languageId) : undefined;
 
     this._serverManager?.connectToServer(serverState.url, workerConsoleType);
   };

diff --git a/src/util/serverUtils.ts b/src/util/serverUtils.ts
@@ -55,17 +55,17 @@ export async function getConnectionsForConsoleType(
 }
 
 /**
- * If the given value is a valid console type, return it, otherwise default to 'python'.
+ * If the given value is a valid console type, return it, otherwise return undefined.
  * @param maybeConsoleType
- * @returns A console type.
+ * @returns A console type or undefined if given value is invalid.
  */
-export function getConsoleTypeOrDefault(
+export function getConsoleType(
   maybeConsoleType?: string
-): ConsoleType {
+): ConsoleType | undefined {
   return typeof maybeConsoleType === 'string' &&
     SERVER_LANGUAGE_SET.has(maybeConsoleType as ConsoleType)
     ? (maybeConsoleType as ConsoleType)
-    : 'python';
+    : undefined;
 }
 
 /**