pr 07
This commit is contained in:
@@ -58,10 +58,28 @@ pub fn build_from_graph(graph: &ResolvedGraph, target: BuildTarget) -> Result<Bu
|
||||
|
||||
let mut all_project_symbols = Vec::new();
|
||||
for (i, module) in modules_in_order.into_iter().enumerate() {
|
||||
let project_dir = &plan.steps[i].project_dir;
|
||||
let project_dir_norm = project_dir.canonicalize().unwrap_or_else(|_| project_dir.clone());
|
||||
|
||||
// Relativize file URIs for this project's symbols
|
||||
let mut rel_symbols = Vec::with_capacity(module.symbols.len());
|
||||
for mut s in module.symbols {
|
||||
// Try to relativize decl span's file_uri
|
||||
let original = std::path::PathBuf::from(&s.decl_span.file_uri);
|
||||
let rel = if original.is_absolute() {
|
||||
pathdiff::diff_paths(&original, &project_dir_norm).unwrap_or(original.clone())
|
||||
} else {
|
||||
original.clone()
|
||||
};
|
||||
let rel_str = rel.to_string_lossy().replace('\\', "/");
|
||||
s.decl_span.file_uri = rel_str;
|
||||
rel_symbols.push(s);
|
||||
}
|
||||
|
||||
all_project_symbols.push(crate::common::symbols::ProjectSymbols {
|
||||
project: module.project_id.name.clone(),
|
||||
project_dir: plan.steps[i].project_dir.to_string_lossy().to_string(),
|
||||
symbols: module.symbols,
|
||||
project_dir: project_dir.to_string_lossy().to_string(),
|
||||
symbols: rel_symbols,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user