temp

[ci skip]

Author: benfdking

package-lock.json

@@ -8,6 +8,7 @@
       "noEmit": true,
       "moduleResolution": "node",
       "baseUrl": "./",
+      "types": ["jest"]
     },
     "include": ["src/**/*"]
   }

vscode/bus/tsconfig.json

@@ -307,8 +307,4 @@ export async function deactivate() {
   }
   await deactivateLsp();
 }
-<<<<<<< HEAD
 
->>>>>>> c5ee2535 (progress)
-=======
->>>>>>> 0b5bbfc9 (trying to implement lsp)

vscode/extension/src/extension.ts

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { window, OutputChannel, Disposable } from "vscode"
 import { ServerOptions, LanguageClientOptions, LanguageClient, TransportKind } from "vscode-languageclient/node"
 import { sqlmesh_lsp_exec } from "../utilities/sqlmesh/sqlmesh"
@@ -88,69 +87,3 @@ export class LSPClient implements Disposable {
         await this.stop()
     }
 }
-=======
-import path from "path";
-import { workspace, ExtensionContext, OutputChannel, window } from "vscode";
-import { ServerOptions, LanguageClientOptions, LanguageClient, TransportKind } from "vscode-languageclient/node";
-import { sqlmesh_exec, sqlmesh_lsp_exec } from "../sqlmesh/sqlmesh";
-import { err, isErr, ok, Result } from "../functional/result";
-import { getWorkspaceFolders } from "../common/vscodeapi";
-
-let client: LanguageClient;
-
-export async function activateLsp(context: ExtensionContext): Promise<Result<undefined, string>> {
-    const sqlmesh = await sqlmesh_lsp_exec()
-    if (isErr(sqlmesh)) {
-        return sqlmesh
-    }
-    const workspaceFolders = getWorkspaceFolders()
-    if (workspaceFolders.length !== 1) {
-        return err("Invalid number of workspace folders")
-    }
-    const outputChannel: OutputChannel = window.createOutputChannel('sqlmesh_actual_lsp_implementation');
-
-    let folder = workspaceFolders[0]
-    const workspacePath = workspaceFolders[0].uri.fsPath
-    let serverOptions: ServerOptions = {
-        run: {
-            command: sqlmesh.value.bin,
-            transport: TransportKind.stdio,
-            options: {
-                cwd: workspacePath,
-            },
-        },
-        debug: {
-            command: sqlmesh.value.bin,
-            transport: TransportKind.stdio,
-            options: {
-                cwd: workspacePath,
-            }
-        }
-    }
-    let clientOptions: LanguageClientOptions = {
-        documentSelector: [
-            { scheme: 'file', pattern: `**/*.sql` }
-        ],
-        workspaceFolder: folder,
-        diagnosticCollectionName: 'sqlmesh',
-        outputChannel: outputChannel,
-        // synchronize: {
-            // fileEvents: workspace.createFileSystemWatcher('**/*.{sql,py}'),
-        // }
-    }
-
-    client = new LanguageClient('sqlmesh-lsp-example', 'SQLMesh Language Server', serverOptions, clientOptions)
-    console.log('Starting language client')
-    client.start()
-
-    console.log('Language client started')
-    return ok(undefined)
-}
-
-export async function deactivateLsp() {
-    if (client) {
-        await client.stop()
-    }
-}
-    
->>>>>>> 0b5bbfc9 (trying to implement lsp)

vscode/extension/src/lsp/lsp.ts

@@ -10,7 +10,6 @@
 		"rootDir": "src",
 		"strict": true,   /* enable all strict type-checking options */
 		/* Additional Checks */
-<<<<<<< HEAD
 		"noImplicitReturns": true,
 		"noFallthroughCasesInSwitch": true,
 		"noUnusedParameters": true,
@@ -23,22 +22,6 @@
 		"src/**/*",
 		"../bus/src/**/*"
 	],
-=======
-		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
-		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
-		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-		"paths": {
-			"@bus/*": ["../bus/src/*"]
-		}
-	},
-<<<<<<< HEAD
->>>>>>> c5ee2535 (progress)
-=======
-	"include": [
-		"src/**/*",
-		"../bus/src/**/*"
-	],
->>>>>>> 65a751d1 (added ability to open files)
 	"exclude": [
 		"node_modules", "../node_modules"
 	]

vscode/extension/tsconfig.json

@@ -5,10 +5,11 @@
   "scripts": {
     "start": "vite --port 3000",
     "dev": "vite",
-    "build": "vite build && tsc",
+    "build": "vite build",
     "serve": "vite preview",
     "test": "vitest run",
-    "generate:api": "orval --config ./orval.config.ts"
+    "generate:api": "orval --config ./orval.config.ts",
+    "lint": "tsc --noEmit"
   },
   "dependencies": {
     "@tailwindcss/postcss": "^4.1.3",
@@ -19,15 +20,15 @@
     "@tanstack/router-plugin": "^1.114.3",
     "apache-arrow": "^19.0.1",
     "orval": "^7.8.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "tailwindcss": "^4.1.3"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
-    "@types/react": "^19.0.8",
-    "@types/react-dom": "^19.0.3",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",

vscode/react/package.json

@@ -5,7 +5,7 @@
     "jsx": "react-jsx",
     "module": "ESNext",
     "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "types": ["vite/client"],
+    "types": ["vite/client", "react", "react-dom"],
 
     /* Bundler mode */
     "moduleResolution": "bundler",