fix env vars for lsp server to match other .env vars (#2243)

fix env vars for lsp

Signed-off-by: Jess Frazelle <github@jessfraz.com>

src/components/LspProvider.tsx

@@ -3,7 +3,7 @@ import type * as LSP from 'vscode-languageserver-protocol'
 import React, { createContext, useMemo, useEffect, useContext } from 'react'
 import { FromServer, IntoServer } from 'editor/plugins/lsp/codec'
 import Client from '../editor/plugins/lsp/client'
-import { DEV, TEST } from 'env'
+import { TEST, VITE_KC_API_BASE_URL } from 'env'
 import kclLanguage from 'editor/plugins/lsp/kcl/language'
 import { copilotPlugin } from 'editor/plugins/lsp/copilot'
 import { useStore } from 'useStore'
@@ -103,7 +103,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
       wasmUrl: wasmUrl(),
       token: token,
       baseUnit: defaultUnit.current,
-      devMode: DEV,
+      apiBaseUrl: VITE_KC_API_BASE_URL,
     }
     lspWorker.postMessage({
       worker: LspWorker.Kcl,
@@ -177,7 +177,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
     const initEvent: CopilotWorkerOptions = {
       wasmUrl: wasmUrl(),
       token: token,
-      devMode: DEV,
+      apiBaseUrl: VITE_KC_API_BASE_URL,
     }
     lspWorker.postMessage({
       worker: LspWorker.Copilot,

src/editor/plugins/lsp/types.ts

@@ -8,13 +8,13 @@ export interface KclWorkerOptions {
   wasmUrl: string
   token: string
   baseUnit: UnitLength
-  devMode: boolean
+  apiBaseUrl: string
 }
 
 export interface CopilotWorkerOptions {
   wasmUrl: string
   token: string
-  devMode: boolean
+  apiBaseUrl: string
 }
 
 export enum LspWorkerEventType {

src/editor/plugins/lsp/worker.ts

@@ -28,11 +28,11 @@ const initialise = async (wasmUrl: string) => {
 export async function copilotLspRun(
   config: ServerConfig,
   token: string,
-  devMode: boolean = false
+  baseUrl: string
 ) {
   try {
     console.log('starting copilot lsp')
-    await copilot_lsp_run(config, token, devMode)
+    await copilot_lsp_run(config, token, baseUrl)
   } catch (e: any) {
     console.log('copilot lsp failed', e)
     // We can't restart here because a moved value, we should do this another way.
@@ -44,11 +44,11 @@ export async function kclLspRun(
   engineCommandManager: EngineCommandManager | null,
   token: string,
   baseUnit: string,
-  devMode: boolean = false
+  baseUrl: string
 ) {
   try {
     console.log('start kcl lsp')
-    await kcl_lsp_run(config, engineCommandManager, baseUnit, token, devMode)
+    await kcl_lsp_run(config, engineCommandManager, baseUnit, token, baseUrl)
   } catch (e: any) {
     console.log('kcl lsp failed', e)
     // We can't restart here because a moved value, we should do this another way.
@@ -80,12 +80,12 @@ onmessage = function (event) {
                 null,
                 kclData.token,
                 kclData.baseUnit,
-                kclData.devMode
+                kclData.apiBaseUrl
               )
               break
             case LspWorker.Copilot:
               let copilotData = eventData as CopilotWorkerOptions
-              copilotLspRun(config, copilotData.token, copilotData.devMode)
+              copilotLspRun(config, copilotData.token, copilotData.apiBaseUrl)
               break
           }
         })

src/wasm-lib/src/wasm.rs

@@ -198,7 +198,7 @@ pub async fn kcl_lsp_run(
     engine_manager: Option<kcl_lib::engine::conn_wasm::EngineCommandManager>,
     units: &str,
     token: String,
-    is_dev: bool,
+    baseurl: String,
 ) -> Result<(), JsValue> {
     console_error_panic_hook::set_once();
 
@@ -216,9 +216,7 @@ pub async fn kcl_lsp_run(
     let token_types = kcl_lib::token::TokenType::all_semantic_token_types().unwrap();
 
     let mut zoo_client = kittycad::Client::new(token);
-    if is_dev {
-        zoo_client.set_base_url("https://api.dev.zoo.dev");
-    }
+    zoo_client.set_base_url(baseurl.as_str());
 
     let file_manager = Arc::new(kcl_lib::fs::FileManager::new(fs));
 
@@ -313,7 +311,7 @@ pub async fn kcl_lsp_run(
 
 // NOTE: input needs to be an AsyncIterator<Uint8Array, never, void> specifically
 #[wasm_bindgen]
-pub async fn copilot_lsp_run(config: ServerConfig, token: String, is_dev: bool) -> Result<(), JsValue> {
+pub async fn copilot_lsp_run(config: ServerConfig, token: String, baseurl: String) -> Result<(), JsValue> {
     console_error_panic_hook::set_once();
 
     let ServerConfig {
@@ -323,9 +321,7 @@ pub async fn copilot_lsp_run(config: ServerConfig, token: String, is_dev: bool)
     } = config;
 
     let mut zoo_client = kittycad::Client::new(token);
-    if is_dev {
-        zoo_client.set_base_url("https://api.dev.zoo.dev");
-    }
+    zoo_client.set_base_url(baseurl.as_str());
 
     let file_manager = Arc::new(kcl_lib::fs::FileManager::new(fs));