Massive restructuring and cleanup in preparation of real language server

Author: IsaacShelton

Cargo.lock

@@ -2,24 +2,12 @@
 resolver = "3"
 members = [
     "src/adept",
-    "src/components/request",
-    "src/components/language_server",
-    "src/components/vfs",
-    "src/components/idle",
-    "src/components/daemon",
-    "src/components/build_aon",
-    "src/components/build_token",
-    "src/components/transport",
-    "src/representations/token",
-    "src/representations/text_edit",
-    "src/representations/ipc_message",
-    "src/representations/fingerprint",
-    "src/support/define_requests",
-    "src/support/iter_ext",
-    "src/support/top_n",
-    "src/support/infinite_iterator",
-    "src/support/line_column",
-    "src/support/text",
+    "src/daemon",
+    "src/daemon_scheduler",
+    "src/language_server",
+    "src/lock_file",
+    "src/idle_tracker",
+    "src/lsp_connection",
 ]
 
 [workspace.dependencies]
@@ -39,4 +27,8 @@ by_address = "1.2.1"
 thiserror = "2.0.17"
 pin-project-lite = "0.2"
 fluent-uri = "0.4.1"
+fern = "0.7.1"
+humantime = "2.3.0"
+log = "0.4.29"
+lsp-types = "0.97.0"
 

Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-daemon = { version = "0.1.0", path = "../components/daemon" }
-language_server = { version = "0.1.0", path = "../components/language_server" }
-smol = "2.0.2"
+daemon = { version = "0.1.0", path = "../daemon" }
+language_server = { version = "0.1.0", path = "../language_server" }
+smol.workspace = true
+

src/adept/Cargo.toml

@@ -1,54 +1,17 @@
-use daemon::{connect_to_daemon, server_main, try_become_daemon};
-use std::{iter::Peekable, process::ExitCode, time::Duration};
+use std::process::ExitCode;
 
 fn main() -> ExitCode {
     let mut args = std::env::args().skip(1).peekable();
 
     match args.peek().map(String::as_str) {
         Some("-h" | "--help") | None => show_help(),
-        Some("--daemon") => start_daemon(args),
-        Some("--oneshot") => start_oneshot(args),
-        Some("--incremental") => smol::block_on(start_incremental()),
-        Some("--language-server") => smol::block_on(start_language_server(args)),
-        _ => smol::block_on(start_incremental()),
+        Some("--daemon") => daemon::start(),
+        Some("--language-server") => language_server::start(),
+        _ => show_help(),
     }
 }
 
 fn show_help() -> ExitCode {
     println!("usage: adept FILENAME");
     ExitCode::FAILURE
 }
-
-fn start_daemon(_args: Peekable<impl Iterator<Item = String>>) -> ExitCode {
-    let path = std::env::current_dir().expect("failed to get current directory");
-    let max_idle_time = Duration::from_secs(5 * 60);
-
-    match try_become_daemon(&path.clone(), || server_main(max_idle_time)) {
-        Ok(()) => ExitCode::SUCCESS,
-        Err(err) => {
-            eprintln!("{}", err);
-            ExitCode::FAILURE
-        }
-    }
-}
-
-async fn start_incremental() -> ExitCode {
-    let connection = match connect_to_daemon().await {
-        Ok(connection) => connection,
-        Err(err) => {
-            eprintln!("{}", err);
-            return ExitCode::FAILURE;
-        }
-    };
-
-    println!("Connected! {:?}", connection);
-    ExitCode::SUCCESS
-}
-
-fn start_oneshot(_args: Peekable<impl Iterator<Item = String>>) -> ExitCode {
-    todo!()
-}
-
-async fn start_language_server(_args: Peekable<impl Iterator<Item = String>>) -> ExitCode {
-    language_server::start().await
-}

src/adept/src/main.rs

@@ -0,0 +1 @@
+pub const BUILT_AT: u64 = compile_time::unix!();