Fix Lombok path on Windows (#58)

Resolves #57.

Author: valentinegb

src/lib.rs

@@ -1,7 +1,8 @@
 use std::{
     collections::BTreeSet,
+    env::current_dir,
     fs::{self, create_dir},
-    path::Path,
+    path::{Path, PathBuf},
 };
 
 use zed_extension_api::{
@@ -15,17 +16,19 @@ use zed_extension_api::{
     settings::LspSettings,
 };
 
+const PATH_TO_STR_ERROR: &str = "failed to convert path to string";
+
 struct Java {
-    cached_binary_path: Option<String>,
-    cached_lombok_path: Option<String>,
+    cached_binary_path: Option<PathBuf>,
+    cached_lombok_path: Option<PathBuf>,
 }
 
 impl Java {
     fn language_server_binary_path(
         &mut self,
         language_server_id: &LanguageServerId,
         worktree: &Worktree,
-    ) -> zed::Result<String> {
+    ) -> zed::Result<PathBuf> {
         // Use cached path if exists
 
         if let Some(path) = &self.cached_binary_path {
@@ -43,7 +46,7 @@ impl Java {
         };
 
         if let Some(path_binary) = worktree.which(binary_name) {
-            return Ok(path_binary);
+            return Ok(PathBuf::from(path_binary));
         }
 
         // Check for latest version
@@ -128,11 +131,11 @@ impl Java {
             format!("attempt to get latest version's build resulted in a malformed response: {err}")
         })?;
         let latest_version_build = latest_version_build.trim_end();
-        let prefix = "jdtls";
+        let prefix = PathBuf::from("jdtls");
         // Exclude ".tar.gz"
         let build_directory = &latest_version_build[..latest_version_build.len() - 7];
-        let build_path = format!("{prefix}/{build_directory}");
-        let binary_path = format!("{build_path}/bin/{binary_name}");
+        let build_path = prefix.join(build_directory);
+        let binary_path = build_path.join("bin").join(binary_name);
 
         // If latest version isn't installed,
         if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
@@ -146,10 +149,10 @@ impl Java {
                 &format!(
                     "https://www.eclipse.org/downloads/download.php?file=/jdtls/milestones/{latest_version}/{latest_version_build}",
                 ),
-                &build_path,
+                build_path.to_str().ok_or(PATH_TO_STR_ERROR)?,
                 DownloadedFileType::GzipTar,
             )?;
-            make_file_executable(&binary_path)?;
+            make_file_executable(binary_path.to_str().ok_or(PATH_TO_STR_ERROR)?)?;
 
             // ...and delete other versions
 
@@ -182,7 +185,7 @@ impl Java {
         Ok(binary_path)
     }
 
-    fn lombok_jar_path(&mut self, language_server_id: &LanguageServerId) -> zed::Result<String> {
+    fn lombok_jar_path(&mut self, language_server_id: &LanguageServerId) -> zed::Result<PathBuf> {
         // Use cached path if exists
 
         if let Some(path) = &self.cached_lombok_path {
@@ -222,10 +225,7 @@ impl Java {
             .ok_or("malformed GitHub tags response")?[1..];
         let prefix = "lombok";
         let jar_name = format!("lombok-{latest_version}.jar");
-        let jar_path = Path::new(prefix)
-            .join(&jar_name)
-            .to_string_lossy()
-            .into_owned();
+        let jar_path = Path::new(prefix).join(&jar_name);
 
         // If latest version isn't installed,
         if !fs::metadata(&jar_path).is_ok_and(|stat| stat.is_file()) {
@@ -238,7 +238,7 @@ impl Java {
             create_dir(prefix).map_err(|err| err.to_string())?;
             download_file(
                 &format!("https://projectlombok.org/downloads/{jar_name}"),
-                &jar_path,
+                jar_path.to_str().ok_or(PATH_TO_STR_ERROR)?,
                 DownloadedFileType::Uncompressed,
             )?;
 
@@ -318,18 +318,32 @@ impl Extension for Java {
             .unwrap_or(false);
 
         if lombok_enabled {
+            let mut current_dir =
+                current_dir().map_err(|err| format!("could not get current dir: {err}"))?;
+
+            if current_platform().0 == Os::Windows {
+                current_dir = current_dir
+                    .strip_prefix("/")
+                    .map_err(|err| err.to_string())?
+                    .to_path_buf();
+            }
+
             let lombok_jar_path = self.lombok_jar_path(language_server_id)?;
-            let lombok_jar_full_path = std::env::current_dir()
-                .map_err(|e| format!("could not get current dir: {e}"))?
-                .join(&lombok_jar_path)
-                .to_string_lossy()
+            let canonical_lombok_jar_path = current_dir
+                .join(lombok_jar_path)
+                .to_str()
+                .ok_or(PATH_TO_STR_ERROR)?
                 .to_string();
 
-            args.push(format!("--jvm-arg=-javaagent:{lombok_jar_full_path}"));
+            args.push(format!("--jvm-arg=-javaagent:{canonical_lombok_jar_path}"));
         }
 
         Ok(zed::Command {
-            command: self.language_server_binary_path(language_server_id, worktree)?,
+            command: self
+                .language_server_binary_path(language_server_id, worktree)?
+                .to_str()
+                .ok_or(PATH_TO_STR_ERROR)?
+                .to_string(),
             args,
             env,
         })