refactor(language_server): convert only once uri to path when creating ServerLinter (#11503)

Author: Sysix

crates/oxc_language_server/src/linter/server_linter.rs

@@ -26,8 +26,8 @@ pub struct ServerLinter {
 
 impl ServerLinter {
     pub fn new(root_uri: &Uri, options: &Options) -> Self {
-        let (nested_configs, mut extended_paths) = Self::create_nested_configs(root_uri, options);
         let root_path = root_uri.to_file_path().unwrap();
+        let (nested_configs, mut extended_paths) = Self::create_nested_configs(&root_path, options);
         let relative_config_path = options.config_path.clone();
         let oxlintrc = if let Some(relative_config_path) = relative_config_path {
             let config = normalize_path(root_path.join(relative_config_path));
@@ -89,15 +89,15 @@ impl ServerLinter {
 
         Self {
             isolated_linter: Arc::new(isolated_linter),
-            gitignore_glob: Self::create_ignore_glob(root_uri, &oxlintrc),
+            gitignore_glob: Self::create_ignore_glob(&root_path, &oxlintrc),
             extended_paths,
         }
     }
 
     /// Searches inside root_uri recursively for the default oxlint config files
     /// and insert them inside the nested configuration
     fn create_nested_configs(
-        root_uri: &Uri,
+        root_path: &Path,
         options: &Options,
     ) -> (ConcurrentHashMap<PathBuf, Config>, Vec<PathBuf>) {
         let mut extended_paths = Vec::new();
@@ -106,9 +106,7 @@ impl ServerLinter {
             return (ConcurrentHashMap::default(), extended_paths);
         }
 
-        let root_path = root_uri.to_file_path().expect("Failed to convert URI to file path");
-
-        let paths = ConfigWalker::new(&root_path).paths();
+        let paths = ConfigWalker::new(root_path).paths();
         let nested_configs =
             ConcurrentHashMap::with_capacity_and_hasher(paths.capacity(), FxBuildHasher);
 
@@ -134,15 +132,15 @@ impl ServerLinter {
         (nested_configs, extended_paths)
     }
 
-    fn create_ignore_glob(root_uri: &Uri, oxlintrc: &Oxlintrc) -> Vec<Gitignore> {
+    fn create_ignore_glob(root_path: &Path, oxlintrc: &Oxlintrc) -> Vec<Gitignore> {
         let mut builder = globset::GlobSetBuilder::new();
         // Collecting all ignore files
         builder.add(Glob::new("**/.eslintignore").unwrap());
         builder.add(Glob::new("**/.gitignore").unwrap());
 
         let ignore_file_glob_set = builder.build().unwrap();
 
-        let walk = ignore::WalkBuilder::new(root_uri.to_file_path().unwrap())
+        let walk = ignore::WalkBuilder::new(root_path)
             .ignore(true)
             .hidden(false)
             .git_global(false)
@@ -233,19 +231,14 @@ pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
 
 #[cfg(test)]
 mod test {
-    use std::{
-        path::{Path, PathBuf},
-        str::FromStr,
-    };
-
-    use rustc_hash::FxHashMap;
-    use tower_lsp_server::lsp_types::Uri;
+    use std::path::{Path, PathBuf};
 
     use crate::{
         Options,
         linter::server_linter::{ServerLinter, normalize_path},
-        tester::{Tester, get_file_uri},
+        tester::{Tester, get_file_path},
     };
+    use rustc_hash::FxHashMap;
 
     #[test]
     fn test_normalize_path() {
@@ -261,7 +254,7 @@ mod test {
         flags.insert("disable_nested_configs".to_string(), "true".to_string());
 
         let (configs, _) = ServerLinter::create_nested_configs(
-            &Uri::from_str("file:///root/").unwrap(),
+            Path::new("/root/"),
             &Options { flags, ..Options::default() },
         );
 
@@ -271,7 +264,7 @@ mod test {
     #[test]
     fn test_create_nested_configs() {
         let (configs, _) = ServerLinter::create_nested_configs(
-            &get_file_uri("fixtures/linter/init_nested_configs"),
+            &get_file_path("fixtures/linter/init_nested_configs"),
             &Options::default(),
         );
         let configs = configs.pin();

crates/oxc_language_server/src/tester.rs

@@ -1,4 +1,4 @@
-use std::fmt::Write;
+use std::{fmt::Write, path::PathBuf};
 
 use tower_lsp_server::{
     UriExt,
@@ -9,11 +9,15 @@ use crate::{Options, worker::WorkspaceWorker};
 
 use super::linter::error_with_position::DiagnosticReport;
 
+/// Given a file path relative to the crate root directory, return the absolute path of the file.
+pub fn get_file_path(relative_file_path: &str) -> PathBuf {
+    std::env::current_dir().expect("could not get current dir").join(relative_file_path)
+}
+
 /// Given a file path relative to the crate root directory, return the URI of the file.
 pub fn get_file_uri(relative_file_path: &str) -> Uri {
-    let absolute_file_path =
-        std::env::current_dir().expect("could not get current dir").join(relative_file_path);
-    Uri::from_file_path(absolute_file_path).expect("failed to convert file path to URL")
+    Uri::from_file_path(get_file_path(relative_file_path))
+        .expect("failed to convert file path to URL")
 }
 
 fn get_snapshot_from_report(report: &DiagnosticReport) -> String {