Merge branch 'fix-project-detection-from-worktree'

Author: alanhamlett

src/lib.rs

@@ -51,6 +51,13 @@ fn executable_name(binary: &str) -> String {
     }
 }
 
+fn project_name_from_path(path: &str) -> Option<String> {
+    Path::new(path)
+        .file_name()
+        .and_then(|file_name| file_name.to_str())
+        .map(ToString::to_string)
+}
+
 impl WakatimeExtension {
     fn target_triple(&self, binary: &str) -> Result<String, String> {
         let (platform, arch) = zed::current_platform();
@@ -213,7 +220,7 @@ impl zed::Extension for WakatimeExtension {
 
         let ls_binary_path = self.language_server_binary_path(language_server_id)?;
 
-        let args = vec!["--wakatime-cli".to_string(), {
+        let mut args = vec!["--wakatime-cli".to_string(), {
             use std::env;
             let current = env::current_dir().unwrap();
             let waka_cli = if is_absolute_path_wasm(&wakatime_cli_binary_path) {
@@ -228,6 +235,19 @@ impl zed::Extension for WakatimeExtension {
             sanitize_path(waka_cli.as_str())
         }];
 
+        let project_folder = sanitize_path(worktree.root_path().as_str());
+        if !project_folder.is_empty() {
+            args.push("--project-folder".to_string());
+            args.push(project_folder.clone());
+
+            if let Some(project_name) = project_name_from_path(project_folder.as_str()) {
+                if !project_name.is_empty() {
+                    args.push("--alternate-project".to_string());
+                    args.push(project_name);
+                }
+            }
+        }
+
         Ok(Command {
             args,
             command: ls_binary_path.to_str().unwrap().to_owned(),

wakatime-ls/src/main.rs

@@ -33,6 +33,8 @@ struct WakatimeLanguageServer {
     client: Client,
     settings: ArcSwap<Settings>,
     wakatime_path: String,
+    project_folder: String,
+    alternate_project: String,
     current_file: Mutex<CurrentFile>,
     platform: ArcSwap<String>,
 }
@@ -82,6 +84,18 @@ impl WakatimeLanguageServer {
             .arg("--entity")
             .arg(event.uri.as_str());
 
+        if !self.project_folder.is_empty() {
+            command
+                .arg("--project-folder")
+                .arg(self.project_folder.as_str());
+        }
+
+        if !self.alternate_project.is_empty() {
+            command
+                .arg("--alternate-project")
+                .arg(self.alternate_project.as_str());
+        }
+
         if !self.platform.load().is_empty() {
             command.arg("--plugin").arg(self.platform.load().as_str());
         }
@@ -265,6 +279,16 @@ async fn main() {
                 .help("wakatime-cli path")
                 .required(true),
         )
+        .arg(
+            Arg::new("project-folder")
+                .long("project-folder")
+                .help("project folder path"),
+        )
+        .arg(
+            Arg::new("alternate-project")
+                .long("alternate-project")
+                .help("alternate project name"),
+        )
         .get_matches();
 
     let wakatime_cli = if let Some(s) = matches.get_one::<String>("wakatime-cli") {
@@ -273,6 +297,18 @@ async fn main() {
         "wakatime-cli".to_string()
     };
 
+    let project_folder = if let Some(s) = matches.get_one::<String>("project-folder") {
+        s.to_string()
+    } else {
+        String::new()
+    };
+
+    let alternate_project = if let Some(s) = matches.get_one::<String>("alternate-project") {
+        s.to_string()
+    } else {
+        String::new()
+    };
+
     let stdin = tokio::io::stdin();
     let stdout = tokio::io::stdout();
 
@@ -281,6 +317,8 @@ async fn main() {
             client,
             settings: ArcSwap::from_pointee(Settings::default()),
             wakatime_path: wakatime_cli,
+            project_folder,
+            alternate_project,
             platform: ArcSwap::from_pointee(String::new()),
             current_file: Mutex::new(CurrentFile {
                 uri: String::new(),