fix(windows): quote paths in JDTLS and Lombok arguments (#151)

Author: UrielCuriel

src/debugger.rs

@@ -12,7 +12,10 @@ use zed_extension_api::{
 use crate::{
     config::get_java_debug_jar,
     lsp::LspWrapper,
-    util::{create_path_if_not_exists, get_curr_dir, path_to_string, should_use_local_or_download},
+    util::{
+        create_path_if_not_exists, get_curr_dir, path_to_quoted_string,
+        should_use_local_or_download,
+    },
 };
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -152,7 +155,7 @@ impl Debugger {
 
         download_file(
             JAVA_DEBUG_PLUGIN_FORK_URL,
-            &path_to_string(jar_path.clone())?,
+            &path_to_quoted_string(jar_path.clone())?,
             DownloadedFileType::Uncompressed,
         )
         .map_err(|err| {
@@ -256,7 +259,7 @@ impl Debugger {
 
             download_file(
                 url.as_str(),
-                &path_to_string(&jar_path)?,
+                &path_to_quoted_string(&jar_path)?,
                 DownloadedFileType::Uncompressed,
             )
             .map_err(|err| format!("Failed to download {url} {err}"))?;

src/java.rs

@@ -32,7 +32,7 @@ use crate::{
         try_to_fetch_and_install_latest_lombok,
     },
     lsp::LspWrapper,
-    util::path_to_string,
+    util::path_to_quoted_string,
 };
 
 const PROXY_FILE: &str = include_str!("proxy.mjs");
@@ -279,14 +279,15 @@ impl Extension for Java {
             "--input-type=module".to_string(),
             "-e".to_string(),
             PROXY_FILE.to_string(),
-            path_to_string(current_dir.clone())?,
+            path_to_quoted_string(current_dir.clone())?,
         ];
 
         // Add lombok as javaagent if settings.java.jdt.ls.lombokSupport.enabled is true
         let lombok_jvm_arg = if is_lombok_enabled(&configuration) {
             let lombok_jar_path =
                 self.lombok_jar_path(language_server_id, &configuration, worktree)?;
-            let canonical_lombok_jar_path = path_to_string(current_dir.join(lombok_jar_path))?;
+            let canonical_lombok_jar_path =
+                path_to_quoted_string(current_dir.join(lombok_jar_path))?;
 
             Some(format!("-javaagent:{canonical_lombok_jar_path}"))
         } else {

src/jdk.rs

@@ -6,7 +6,7 @@ use zed_extension_api::{
     set_language_server_installation_status,
 };
 
-use crate::util::{get_curr_dir, path_to_string, remove_all_files_except};
+use crate::util::{get_curr_dir, path_to_quoted_string, remove_all_files_except};
 
 // Errors
 const JDK_DIR_ERROR: &str = "Failed to read into JDK install directory";
@@ -79,7 +79,7 @@ pub fn try_to_fetch_and_install_latest_jdk(
 
         download_file(
             build_corretto_url(&version, &platform, &arch).as_str(),
-            path_to_string(install_path.clone())?.as_str(),
+            path_to_quoted_string(install_path.clone())?.as_str(),
             match zed::current_platform().0 {
                 Os::Windows => DownloadedFileType::Zip,
                 _ => DownloadedFileType::GzipTar,

src/jdtls.rs

@@ -19,7 +19,7 @@ use crate::{
     jdk::try_to_fetch_and_install_latest_jdk,
     util::{
         create_path_if_not_exists, get_curr_dir, get_java_exec_name, get_java_executable,
-        get_java_major_version, get_latest_versions_from_tag, path_to_string,
+        get_java_major_version, get_latest_versions_from_tag, path_to_quoted_string,
         remove_all_files_except, should_use_local_or_download,
     },
 };
@@ -65,14 +65,14 @@ pub fn build_jdtls_launch_args(
     let jdtls_data_path = get_jdtls_data_path(worktree)?;
 
     let mut args = vec![
-        path_to_string(java_executable)?,
+        path_to_quoted_string(java_executable)?,
         "-Declipse.application=org.eclipse.jdt.ls.core.id1".to_string(),
         "-Dosgi.bundles.defaultStartLevel=4".to_string(),
         "-Declipse.product=org.eclipse.jdt.ls.core.product".to_string(),
         "-Dosgi.checkConfiguration=true".to_string(),
         format!(
             "-Dosgi.sharedConfiguration.area={}",
-            path_to_string(shared_config_path)?
+            path_to_quoted_string(shared_config_path)?
         ),
         "-Dosgi.sharedConfiguration.area.readOnly=true".to_string(),
         "-Dosgi.configuration.cascaded=true".to_string(),
@@ -86,9 +86,9 @@ pub fn build_jdtls_launch_args(
     args.extend(jvm_args);
     args.extend(vec![
         "-jar".to_string(),
-        path_to_string(jar_path)?,
+        path_to_quoted_string(jar_path)?,
         "-data".to_string(),
-        path_to_string(jdtls_data_path)?,
+        path_to_quoted_string(jdtls_data_path)?,
     ]);
     if java_major_version >= 24 {
         args.push("-Djdk.xml.maxGeneralEntitySizeLimit=0".to_string());
@@ -195,10 +195,10 @@ pub fn try_to_fetch_and_install_latest_jdtls(
             &format!(
                 "https://www.eclipse.org/downloads/download.php?file=/jdtls/milestones/{latest_version}/{latest_version_build}"
             ),
-            path_to_string(build_path.clone())?.as_str(),
+            path_to_quoted_string(build_path.clone())?.as_str(),
             DownloadedFileType::GzipTar,
         )?;
-        make_file_executable(path_to_string(binary_path)?.as_str())?;
+        make_file_executable(path_to_quoted_string(binary_path)?.as_str())?;
 
         // ...and delete other versions
         let _ = remove_all_files_except(prefix, build_directory.as_str());
@@ -241,7 +241,7 @@ pub fn try_to_fetch_and_install_latest_lombok(
         create_path_if_not_exists(prefix)?;
         download_file(
             &format!("https://projectlombok.org/downloads/{jar_name}"),
-            path_to_string(jar_path.clone())?.as_str(),
+            path_to_quoted_string(jar_path.clone())?.as_str(),
             DownloadedFileType::Uncompressed,
         )?;
 

src/util.rs

@@ -176,7 +176,8 @@ pub fn get_java_exec_name() -> String {
 /// * [`java_executable`] can't be converted into a String
 /// * No major version can be determined
 pub fn get_java_major_version(java_executable: &PathBuf) -> zed::Result<u32> {
-    let program = path_to_string(java_executable).map_err(|_| JAVA_EXEC_ERROR.to_string())?;
+    let program =
+        path_to_quoted_string(java_executable).map_err(|_| JAVA_EXEC_ERROR.to_string())?;
     let output_bytes = Command::new(program).arg("-version").output()?.stderr;
     let output = String::from_utf8(output_bytes).map_err(|e| e.to_string())?;
 
@@ -246,24 +247,28 @@ fn get_tag_at(github_tags: &Value, index: usize) -> Option<&str> {
     })
 }
 
-/// Convert [`path`] into [`String`]
+/// Converts a [`Path`] into a double-quoted [`String`].
+///
+/// This function performs two steps in one: it converts the path to a string
+/// and wraps the result in double quotes (e.g., `"path/to/file"`).
 ///
 /// # Arguments
 ///
-/// * [`path`] the path of type [`AsRef<Path>`] to convert
+/// * `path` - The path of type `AsRef<Path>` to be converted and quoted.
 ///
 /// # Returns
 ///
-/// Returns a String representing [`path`]
+/// Returns a `String` representing the `path` enclosed in double quotes.
 ///
 /// # Errors
 ///
 /// This function will return an error when the string conversion fails
-pub fn path_to_string<P: AsRef<Path>>(path: P) -> zed::Result<String> {
+pub fn path_to_quoted_string<P: AsRef<Path>>(path: P) -> zed::Result<String> {
     path.as_ref()
         .to_path_buf()
         .into_os_string()
         .into_string()
+        .map(|s| format!("\"{}\"", s))
         .map_err(|_| PATH_TO_STR_ERROR.to_string())
 }
 
@@ -345,3 +350,25 @@ pub fn should_use_local_or_download(
         CheckUpdates::Always => Ok(None),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_path_to_quoted_string_windows() {
+        let path = PathBuf::from("C:\\Users\\User Name\\Projects\\zed-extension-java");
+        let escaped = path_to_quoted_string(&path).unwrap();
+        assert_eq!(
+            escaped,
+            "\"C:\\Users\\User Name\\Projects\\zed-extension-java\""
+        );
+    }
+
+    #[test]
+    fn test_path_to_quoted_string_unix() {
+        let path = PathBuf::from("/home/username/Projects/zed extension java");
+        let escaped = path_to_quoted_string(&path).unwrap();
+        assert_eq!(escaped, "\"/home/username/Projects/zed extension java\"");
+    }
+}