This commit is contained in:
2026-03-24 13:40:28 +00:00
parent adb4dad14b
commit 07f986df5b
23 changed files with 286 additions and 237 deletions
@@ -1,5 +1,5 @@
use crate::common::files::FileManager;
use crate::common::spans::Span;
use crate::common::spans::{FileId, Span};
use serde::{Serialize, Serializer};
#[derive(Debug, Clone, PartialEq)]
@@ -84,21 +84,26 @@ impl DiagnosticBundle {
let mut diags = self.diagnostics.clone();
diags.sort_by(|a, b| {
(a.span.file_id, a.span.start, a.span.end, &a.code)
.cmp(&(b.span.file_id, b.span.start, b.span.end, &b.code))
(
a.span.file.as_usize(),
a.span.start,
a.span.end,
&a.code,
)
.cmp(&(b.span.file.as_usize(), b.span.start, b.span.end, &b.code))
});
let canonical_diags: Vec<CanonicalDiag> = diags
.iter()
.map(|d| {
let s = d.span;
let file = if s.file_id == usize::MAX {
let s = &d.span;
let file = if s.file == FileId::INVALID {
"<virtual>".to_string()
} else {
file_manager
.get_path(s.file_id)
.get_path(s.file.as_usize())
.and_then(|p| p.file_name().map(|n| n.to_string_lossy().to_string()))
.unwrap_or_else(|| format!("file_{}", s.file_id))
.unwrap_or_else(|| format!("file_{}", s.file.as_usize()))
};
let canonical_span = CanonicalSpan {
file,
@@ -110,13 +115,13 @@ impl DiagnosticBundle {
.related
.iter()
.map(|(msg, sp)| {
let file = if sp.file_id == usize::MAX {
let file = if sp.file == FileId::INVALID {
"<virtual>".to_string()
} else {
file_manager
.get_path(sp.file_id)
.get_path(sp.file.as_usize())
.and_then(|p| p.file_name().map(|n| n.to_string_lossy().to_string()))
.unwrap_or_else(|| format!("file_{}", sp.file_id))
.unwrap_or_else(|| format!("file_{}", sp.file.as_usize()))
};
let rsp = CanonicalSpan {
file,
+3 -18
View File
@@ -1,18 +1,3 @@
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Span {
pub file_id: usize,
pub start: u32,
pub end: u32,
}
impl Span {
pub fn new(file_id: usize, start: u32, end: u32) -> Self {
Self {
file_id,
start,
end,
}
}
}
// Canonical Span for the whole workspace
pub use prometeu_analysis::span::Span;
pub use prometeu_analysis::ids::FileId;
@@ -170,14 +170,14 @@ fn convert_symbol(
// Actually, we'll just mark it exported=false if it's a function.
}
let span = sym.span;
let file_path = file_manager.get_path(span.file_id)
let span = sym.span.clone();
let file_path = file_manager.get_path(span.file.as_usize())
.map(|p| p.to_string_lossy().to_string())
.unwrap_or_else(|| format!("unknown_file_{}", span.file_id));
.unwrap_or_else(|| format!("unknown_file_{}", span.file.as_usize()));
// Convert 1-based to 0-based
let (s_line, s_col) = file_manager.lookup_pos(span.file_id, span.start);
let (e_line, e_col) = file_manager.lookup_pos(span.file_id, span.end);
let (s_line, s_col) = file_manager.lookup_pos(span.file.as_usize(), span.start);
let (e_line, e_col) = file_manager.lookup_pos(span.file.as_usize(), span.end);
let decl_span = SpanRange {
file_uri: file_path,