Normalize path quoting

- Quote paths centrally in path_to_string and drop OS-specific helpers
- Pass unescaped JDTLS shared config path and simplify Lombok -javaagent arg formatting
- Move the path escaping helper and its tests into the shared utilities `src/util.rs`

Author: UrielCuriel

src/java.rs

@@ -143,37 +143,6 @@ impl Java {
     }
 }
 
-fn format_lombok_agent_arg(path: &str, os: zed::Os) -> String {
-    if os == zed::Os::Windows {
-        format!("-javaagent:\"{path}\"")
-    } else {
-        format!("-javaagent:{path}")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use zed_extension_api::Os;
-
-    #[test]
-    fn test_format_lombok_agent_arg_windows() {
-        let path = "C:\\Users\\User Name\\lombok.jar";
-        let arg = format_lombok_agent_arg(path, Os::Windows);
-        assert_eq!(arg, format!("-javaagent:\"{path}\""));
-    }
-
-    #[test]
-    fn test_format_lombok_agent_arg_unix() {
-        let path = "/Users/username/lombok.jar";
-        let arg = format_lombok_agent_arg(path, Os::Mac);
-        assert_eq!(arg, format!("-javaagent:{path}"));
-
-        let arg_linux = format_lombok_agent_arg(path, Os::Linux);
-        assert_eq!(arg_linux, format!("-javaagent:{path}"));
-    }
-}
-
 impl Extension for Java {
     fn new() -> Self
     where
@@ -319,10 +288,7 @@ impl Extension for Java {
                 self.lombok_jar_path(language_server_id, &configuration, worktree)?;
             let canonical_lombok_jar_path = path_to_string(current_dir.join(lombok_jar_path))?;
 
-            Some(format_lombok_agent_arg(
-                &canonical_lombok_jar_path,
-                zed::current_platform().0,
-            ))
+            Some(format!("-javaagent:{canonical_lombok_jar_path}"))
         } else {
             None
         };

src/jdtls.rs

@@ -72,7 +72,7 @@ pub fn build_jdtls_launch_args(
         "-Dosgi.checkConfiguration=true".to_string(),
         format!(
             "-Dosgi.sharedConfiguration.area={}",
-            escape_path_if_needed(path_to_string(shared_config_path)?, current_platform().0)
+            path_to_string(shared_config_path)?
         ),
         "-Dosgi.sharedConfiguration.area.readOnly=true".to_string(),
         "-Dosgi.configuration.cascaded=true".to_string(),
@@ -353,34 +353,3 @@ fn get_shared_config_path(jdtls_base_directory: &Path) -> PathBuf {
     };
     jdtls_base_directory.join(config_to_use)
 }
-
-fn escape_path_if_needed(path: String, os: Os) -> String {
-    if os == Os::Windows {
-        format!("\"{}\"", path)
-    } else {
-        path
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use zed_extension_api::Os;
-
-    #[test]
-    fn test_escape_path_if_needed_windows() {
-        let path = "C:\\Users\\User Name\\Projects\\zed-extension-java".to_string();
-        let escaped = escape_path_if_needed(path.clone(), Os::Windows);
-        assert_eq!(escaped, format!("\"{}\"", path));
-    }
-
-    #[test]
-    fn test_escape_path_if_needed_unix() {
-        let path = "/Users/username/Projects/zed-extension-java".to_string();
-        let escaped = escape_path_if_needed(path.clone(), Os::Mac);
-        assert_eq!(escaped, path);
-
-        let escaped_linux = escape_path_if_needed(path.clone(), Os::Linux);
-        assert_eq!(escaped_linux, path);
-    }
-}

src/util.rs

@@ -264,6 +264,7 @@ pub fn path_to_string<P: AsRef<Path>>(path: P) -> zed::Result<String> {
         .to_path_buf()
         .into_os_string()
         .into_string()
+        .map(escape_path_if_needed)
         .map_err(|_| PATH_TO_STR_ERROR.to_string())
 }
 
@@ -345,3 +346,56 @@ pub fn should_use_local_or_download(
         CheckUpdates::Always => Ok(None),
     }
 }
+
+// Escape path if included spaces
+// Add quotes to path if needed for avoid errors with spaces in path
+//
+// # Arguments
+// * `path` - The path to escape
+//
+// # Returns
+// * `String` - The escaped path
+//
+fn escape_path_if_needed(path: String) -> String {
+    if path.contains(' ') {
+        format!("\"{}\"", path)
+    } else {
+        path
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_path_to_string_with_spaces_windows() {
+        let path = PathBuf::from("C:\\Users\\User Name\\Projects\\zed-extension-java");
+        let escaped = path_to_string(&path).unwrap();
+        assert_eq!(
+            escaped,
+            "\"C:\\Users\\User Name\\Projects\\zed-extension-java\""
+        );
+    }
+
+    #[test]
+    fn test_path_to_string_without_spaces_windows() {
+        let path = PathBuf::from("C:\\Users\\UserName\\Projects\\zed-extension-java");
+        let escaped = path_to_string(&path).unwrap();
+        assert_eq!(escaped, "C:\\Users\\UserName\\Projects\\zed-extension-java");
+    }
+
+    #[test]
+    fn test_path_to_string_with_spaces_unix() {
+        let path = PathBuf::from("/home/username/Projects/zed extension java");
+        let escaped = path_to_string(&path).unwrap();
+        assert_eq!(escaped, "\"/home/username/Projects/zed extension java\"");
+    }
+
+    #[test]
+    fn test_path_to_string_without_spaces_unix() {
+        let path = PathBuf::from("/home/username/Projects/zed-extension-java");
+        let escaped = path_to_string(&path).unwrap();
+        assert_eq!(escaped, "/home/username/Projects/zed-extension-java");
+    }
+}