Format

Author: Xanewok

rls/src/actions/hover.rs

@@ -578,22 +578,26 @@ fn racer_match_to_def(ctx: &InitActionContext, m: &racer::Match) -> Option<Def>
         let home = home::home_dir().unwrap_or_default();
         let cargo_home =
             env::var("CARGO_HOME").map(PathBuf::from).unwrap_or_else(|_| home.join(".cargo"));
-        let cargo_registry_src = cargo_home.join("registry").join("src").join("github.com-1ecc6299db9ec823");
+        let cargo_registry_src =
+            cargo_home.join("registry").join("src").join("github.com-1ecc6299db9ec823");
         let rust_src_path = racer::get_rust_src_path().ok();
 
         let contextstr = m.contextstr.replacen("\\\\?\\", "", 1);
         let contextstr_path = PathBuf::from(&contextstr);
         let contextstr_path = collapse_parents(contextstr_path);
 
-
-        // Tidy up the module path.
-        // Try to display the path relative to libstd src root if possible.
+        // Attempt to tidy up the module path
         rust_src_path
-            .and_then(|path| contextstr_path.strip_prefix(path).ok().map(ToOwned::to_owned))
-            // Make the path relative to the package root cached in Cargo registry
-            .or_else(|| contextstr_path.strip_prefix(cargo_registry_src).ok().map(ToOwned::to_owned))
-            // Make the path relative to the root of the project, if possible.
+            .and_then(|rust_src_path| {
+                // Make the path relative to Rust src root
+                contextstr_path.strip_prefix(rust_src_path).ok().map(ToOwned::to_owned)
+            })
+            .or_else(|| {
+                // Make the path relative to the package root cached in Cargo registry
+                contextstr_path.strip_prefix(cargo_registry_src).ok().map(ToOwned::to_owned)
+            })
             .or_else(|| {
+                // Make the path relative to the root of the project
                 contextstr_path.strip_prefix(&ctx.current_project).ok().map(ToOwned::to_owned)
             })
             .and_then(|path| path.to_str().map(ToOwned::to_owned))