refactor(vscode): moving format code into function (#4204)

Author: benfdking

vscode/extension/src/commands/format.ts

@@ -1,29 +1,36 @@
 import { traceError, traceLog } from "../utilities/common/log"
-import { execSync } from 'child_process'
+import { execSync } from "child_process"
 import { sqlmesh_exec } from "../utilities/sqlmesh/sqlmesh"
 import { isErr } from "../utilities/functional/result"
+import * as vscode from "vscode"
 
-interface CLICallout {
-    format: () => Promise<number>
+export const format = async () => {
+  traceLog("Calling format")
+  const out = await internalFormat()
+  if (out === 0) {
+    vscode.window.showInformationMessage("Project formatted successfully")
+  } else {
+    vscode.window.showErrorMessage("Project format failed")
+  }
 }
 
-export const actual_callout: CLICallout = {
-    format: async () => {
-        traceLog("Calling format")
-        try {
-            const exec = await sqlmesh_exec()
-            if (isErr(exec)) {
-                traceError(exec.error)
-                return 1
-            }
-            execSync(`${exec.value.bin} format`, { encoding: 'utf-8', cwd: exec.value.workspacePath, env: exec.value.env })
-            return 0
-        } catch (error: any) {
-            traceError('Error executing sqlmesh format:', error.message)
-            traceError(error.stdout)
-            traceError(error.stderr)
-            return error.status || 1
-        }
+const internalFormat = async (): Promise<number> => {
+  try {
+    const exec = await sqlmesh_exec()
+    if (isErr(exec)) {
+      traceError(exec.error)
+      return 1
     }
+    execSync(`${exec.value.bin} format`, {
+      encoding: "utf-8",
+      cwd: exec.value.workspacePath,
+      env: exec.value.env,
+    })
+    return 0
+  } catch (error: any) {
+    traceError("Error executing sqlmesh format:", error.message)
+    traceError(error.stdout)
+    traceError(error.stderr)
+    return error.status || 1
+  }
 }
-

vscode/extension/src/extension.ts

@@ -1,7 +1,5 @@
-// The module 'vscode' contains the VS Code extensibility API
-// Import the module and reference it with the alias vscode in your code below
 import * as vscode from "vscode"
-import { actual_callout } from "./commands/format"
+import { format } from "./commands/format"
 import {
   createOutputChannel,
   onDidChangeConfiguration,
@@ -48,23 +46,16 @@ export async function activate(context: vscode.ExtensionContext) {
   )
 
   context.subscriptions.push(
-    vscode.commands.registerCommand("sqlmesh.signinSpecifyFlow", signInSpecifyFlow(authProvider)
+    vscode.commands.registerCommand(
+      "sqlmesh.signinSpecifyFlow",
+      signInSpecifyFlow(authProvider)
     )
   )
-
   context.subscriptions.push(
     vscode.commands.registerCommand("sqlmesh.signout", signOut(authProvider))
   )
-
   context.subscriptions.push(
-    vscode.commands.registerCommand("sqlmesh.format", async () => {
-      const out = await actual_callout.format()
-      if (out === 0) {
-        vscode.window.showInformationMessage("Project formatted successfully")
-      } else {
-        vscode.window.showErrorMessage("Project format failed")
-      }
-    })
+    vscode.commands.registerCommand("sqlmesh.format", format)
   )
 
   lspClient = new LSPClient()
@@ -77,12 +68,11 @@ export async function activate(context: vscode.ExtensionContext) {
       await lspClient.restart()
     }
   }
-
   context.subscriptions.push(
     onDidChangePythonInterpreter(async () => {
       await restart()
     }),
-    onDidChangeConfiguration(async (_: vscode.ConfigurationChangeEvent) => {
+    onDidChangeConfiguration(async () => {
       await restart()
     }),
     registerCommand(`sqlmesh.restart`, async () => {