fix build

Author: sxlijin

engine/Cargo.lock

@@ -30,7 +30,9 @@ indexmap = { workspace = true }
 jod-thread = { version = "0.1.2" }
 lsp-server = "0.7.6"
 lsp-types = "0.95.0"
+playground-server.workspace = true
 regex = { version = "1.10.2" }
+reqwest.workspace = true
 rustc-hash = { version = "2.0.0" }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = { version = "1.0.113" }
@@ -80,6 +82,8 @@ futures.workspace = true
 tokio-stream = "0.1.17"
 tower-http = { version = "0.6.6", features = ["fs", "cors"] }
 tower = "0.5"
+webbrowser = "1.0.5"
+mime_guess = "2.0.5"
 
 [dev-dependencies]
 insta = { version = "1.42.1" }

engine/language_server/Cargo.toml

@@ -182,6 +182,7 @@ impl Server {
             global_settings,
             &workspaces,
             rt.handle().clone(),
+            args.playground_port,
             args.playground_tx.clone(),
             client_version,
         )?;

engine/language_server/src/server.rs

@@ -2,12 +2,10 @@ use std::time::Duration;
 
 use lsp_server::ErrorCode;
 use lsp_types::{request, ExecuteCommandParams, MessageType};
+use playground_server::{FrontendMessage, PreSendToWasmMessage};
 use tokio::time::sleep;
-#[cfg(feature = "playground-server")]
 use webbrowser;
 
-// use crate::server::api::DocumentKey;
-use playground_server::{FrontendMessage, PreSendToWasmMessage};
 use crate::{
     server::{
         api::{
@@ -27,7 +25,6 @@ impl RequestHandler for ExecuteCommand {
 }
 
 impl SyncRequestHandler for ExecuteCommand {
-    #[cfg(feature = "playground-server")]
     fn run(
         session: &mut Session,
         notifier: Notifier,
@@ -41,12 +38,9 @@ impl SyncRequestHandler for ExecuteCommand {
             // Fall back to configured port if actual port not set yet
 
             use playground_server::{FrontendMessage, PreSendToWasmMessage};
-            let port = session
-                .get_session_playground_port()
-                .unwrap_or_else(|| session.baml_settings.playground_port.unwrap_or(3030));
 
             // Construct the URL
-            let url = format!("http://localhost:{port}");
+            let url = format!("http://localhost:{}", session.playground_port);
 
             // Open the browser
             if let Err(e) = webbrowser::open(&url) {
@@ -101,16 +95,6 @@ impl SyncRequestHandler for ExecuteCommand {
                     .unwrap();
             }
             Ok(RegisteredCommands::RunTest(args)) => {
-                // session
-                //     .playground_tx
-                //     .send(PreSendToWasmMessage::FrontendMessage(
-                //         FrontendMessage::select_function {
-                //             root_path: args.project_id,
-                //             function_name: args.function_name.clone(),
-                //         },
-                //     ))
-                //     .unwrap();
-                // std::thread::sleep(std::time::Duration::from_secs(1));
                 session
                     .playground_tx
                     .send(PreSendToWasmMessage::FrontendMessage(

engine/language_server/src/server/api/requests/execute_command.rs

@@ -56,6 +56,7 @@ pub struct Session {
 
     pub baml_settings: BamlSettings,
 
+    pub playground_port: u16,
     pub playground_tx: broadcast::Sender<PreSendToWasmMessage>,
 }
 
@@ -67,6 +68,7 @@ impl Clone for Session {
             position_encoding: self.position_encoding,
             resolved_client_capabilities: self.resolved_client_capabilities.clone(),
             baml_settings: self.baml_settings.clone(),
+            playground_port: self.playground_port,
             playground_tx: self.playground_tx.clone(),
         }
     }
@@ -79,6 +81,7 @@ impl Session {
         global_settings: ClientSettings,
         workspace_folders: &[(Url, ClientSettings)],
         runtime_handle: tokio::runtime::Handle,
+        playground_port: u16,
         playground_tx: broadcast::Sender<PreSendToWasmMessage>,
         client_version: Option<String>,
     ) -> anyhow::Result<Self> {
@@ -128,6 +131,7 @@ impl Session {
                 tracing::info!("--- Session::new final baml_settings: {:?}", baml_settings);
                 baml_settings
             },
+            playground_port,
             playground_tx,
         })
     }

engine/language_server/src/session.rs

@@ -42,7 +42,6 @@ impl BamlSettings {
     }
 }
 
-
 fn default_feature_flags() -> Option<Vec<String>> {
     Some(vec!["beta".to_string()])
 }