fixing sqlmesh lsp missing

Author: benfdking

vscode/extension/src/utilities/errors.ts

@@ -9,6 +9,7 @@ import { traceInfo } from './common/log'
 export type ErrorType =
   | ErrorTypeGeneric
   | { type: 'not_signed_in' }
+  | { type: 'sqlmesh_not_found' }
   | { type: 'sqlmesh_lsp_not_found' }
   // tcloud_bin_not_found is used when the tcloud executable is not found. This is likely to happen if the user
   // opens a project that has a `tcloud.yaml` file but doesn't have tcloud installed.
@@ -85,6 +86,8 @@ export async function handleError(
       return
     case 'not_signed_in':
       return handleNotSignedInError(authProvider)
+    case 'sqlmesh_not_found':
+      return handleSqlmeshNotFoundError()
     case 'sqlmesh_lsp_not_found':
       return handleSqlmeshLspNotFoundError()
     case 'sqlmesh_lsp_dependencies_missing':
@@ -118,6 +121,14 @@ const handleNotSignedInError = async (
   }
 }
 
+/**
+ * Handles the case where the sqlmesh executable is not found.
+ */
+const handleSqlmeshNotFoundError = async (): Promise<void> => {
+  traceInfo('handleSqlmeshNotFoundError')
+  await window.showErrorMessage('SQLMesh not found, please check installation')
+}
+
 /**
  * Handles the case where the sqlmesh_lsp is not found.
  */

vscode/extension/src/utilities/sqlmesh/sqlmesh.ts

@@ -287,6 +287,12 @@ export const sqlmeshExec = async (): Promise<
       args: [],
     })
   } else {
+    const exists = await doesExecutableExist(sqlmesh)
+    if (!exists) {
+      return err({
+        type: 'sqlmesh_not_found',
+      })
+    }
     return ok({
       bin: sqlmesh,
       workspacePath,
@@ -384,22 +390,28 @@ export const sqlmeshLspExec = async (): Promise<
           type: 'not_signed_in',
         })
       }
+      const exists = await doesExecutableExist(sqlmeshLSP)
+      if (!exists) {
+        return err({
+          type: 'sqlmesh_lsp_not_found',
+        })
+      }
       const ensured = await ensureSqlmeshEnterpriseInstalled()
       if (isErr(ensured)) {
         return ensured
       }
     }
-    const ensuredDependencies = await ensureSqlmeshLspDependenciesInstalled()
-    if (isErr(ensuredDependencies)) {
-      return ensuredDependencies
-    }
     const binPath = path.join(interpreterDetails.binPath!, sqlmeshLSP)
     traceLog(`Bin path: ${binPath}`)
     if (!fs.existsSync(binPath)) {
       return err({
         type: 'sqlmesh_lsp_not_found',
       })
     }
+    const ensuredDependencies = await ensureSqlmeshLspDependenciesInstalled()
+    if (isErr(ensuredDependencies)) {
+      return ensuredDependencies
+    }
     return ok({
       bin: binPath,
       workspacePath,
@@ -411,6 +423,12 @@ export const sqlmeshLspExec = async (): Promise<
       args: [],
     })
   } else {
+    const exists = await doesExecutableExist(sqlmeshLSP)
+    if (!exists) {
+      return err({
+        type: 'sqlmesh_lsp_not_found',
+      })
+    }
     return ok({
       bin: sqlmeshLSP,
       workspacePath,
@@ -419,3 +437,13 @@ export const sqlmeshLspExec = async (): Promise<
     })
   }
 }
+
+async function doesExecutableExist(executable: string): Promise<boolean> {
+  if (process.platform === 'win32') {
+    const result = await execAsync('where.exe', [executable])
+    return result.exitCode === 0
+  } else {
+    const result = await execAsync('which', [executable])
+    return result.exitCode === 0
+  }
+}

vscode/extension/tests/bad_setup.spec.ts

@@ -74,7 +74,7 @@ test('missing LSP dependencies shows install prompt', async ({}, testInfo) => {
   }
 })
 
-test('lineage, no sqlmesh found', async ({}, testInfo) => {
+test('lineage, no sqlmesh found', async ({}) => {
   const tempDir = await fs.mkdtemp(
     path.join(os.tmpdir(), 'vscode-test-tcloud-'),
   )
@@ -103,21 +103,7 @@ test('lineage, no sqlmesh found', async ({}, testInfo) => {
     await openLineageView(window)
 
     // Assert shows that sqlmesh is not installed
-    await window.waitForSelector('text=SQLMesh language server not found')
-
-    // Assert cannot see wrong notifications
-    await expect(window.locator('LSP dependencies missing')).not.toBeVisible()
-
-    // Cancel the notification
-    await window.getByRole('button', { name: 'Cancel' }).click()
-
-    // When cancel notification, the lineage view should show the error
-    await expect(
-      window.locator('text=SQLMesh language server not found'),
-    ).toBeVisible()
-
-    // Assert cannot see the Loading models text
-    await expect(window.locator('text=Loading models...')).not.toBeVisible()
+    await window.waitForSelector('text=SQLMesh LSP not found')
 
     await close()
   } finally {

vscode/extension/tests/utils.ts

@@ -147,4 +147,4 @@ export const openLineageView = async (window: Page): Promise<void> => {
   )
   await window.keyboard.type('Lineage: Focus On View')
   await window.keyboard.press('Enter')
-}
+}