josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-09-11 04:46:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove duplication in validation and span conversion (#203)

Browse source
This commit is contained in:
Josh Thomas 2025-09-08 21:30:39 -05:00 • committed by GitHub
parent 2311fb3288
commit 6389f7ed7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

96
crates/djls-templates/src/ast.rs
View file

@ -131,6 +131,30 @@ impl<'db> Span<'db> {
let length = u32::try_from(token.lexeme().len()).unwrap_or(0);
Span::new(db, start, length)
}
#[must_use]
pub fn to_lsp_range(
&self,
db: &'db dyn crate::db::Db,
line_offsets: &LineOffsets,
) -> tower_lsp_server::lsp_types::Range {
let start_pos = self.start(db) as usize;
let end_pos = (self.start(db) + self.length(db)) as usize;
let (start_line, start_char) = line_offsets.position_to_line_col(start_pos);
let (end_line, end_char) = line_offsets.position_to_line_col(end_pos);
tower_lsp_server::lsp_types::Range {
start: tower_lsp_server::lsp_types::Position {
line: u32::try_from(start_line - 1).unwrap_or(u32::MAX), // LSP is 0-based, LineOffsets is 1-based
character: u32::try_from(start_char).unwrap_or(u32::MAX),
},
end: tower_lsp_server::lsp_types::Position {
line: u32::try_from(end_line - 1).unwrap_or(u32::MAX),
character: u32::try_from(end_char).unwrap_or(u32::MAX),
},
}
}
}
#[derive(Clone, Debug, Error, PartialEq, Eq, Serialize)]
@ -248,73 +272,19 @@ impl AstError {
#[must_use]
pub fn diagnostic_code(&self) -> &'static str {
match self {
AstError::EmptyAst => "DTL-001",
AstError::InvalidTagStructure { .. } => "DTL-002",
AstError::UnbalancedStructure { .. } => "DTL-003",
AstError::InvalidNode { .. } => "DTL-004",
AstError::UnclosedTag { .. } => "DTL-005",
AstError::OrphanedTag { .. } => "DTL-006",
AstError::UnmatchedBlockName { .. } => "DTL-007",
AstError::MissingRequiredArguments { .. } => "DTL-008",
AstError::TooManyArguments { .. } => "DTL-009",
AstError::EmptyAst => "T001",
AstError::InvalidTagStructure { .. } => "T002",
AstError::UnbalancedStructure { .. } => "T003",
AstError::InvalidNode { .. } => "T004",
AstError::UnclosedTag { .. } => "T005",
AstError::OrphanedTag { .. } => "T006",
AstError::UnmatchedBlockName { .. } => "T007",
AstError::MissingRequiredArguments { .. } => "T008",
AstError::TooManyArguments { .. } => "T009",
}
}
}
impl<'db> Span<'db> {
/// Convert this span to an LSP Range using the provided line offsets
#[must_use]
pub fn to_lsp_range(
&self,
db: &'db dyn crate::db::Db,
line_offsets: &LineOffsets,
) -> tower_lsp_server::lsp_types::Range {
let start_pos = self.start(db) as usize;
let end_pos = (self.start(db) + self.length(db)) as usize;
let (start_line, start_char) = line_offsets.position_to_line_col(start_pos);
let (end_line, end_char) = line_offsets.position_to_line_col(end_pos);
#[allow(clippy::cast_possible_truncation)]
tower_lsp_server::lsp_types::Range {
start: tower_lsp_server::lsp_types::Position {
line: (start_line - 1) as u32, // LSP is 0-based, LineOffsets is 1-based
character: start_char as u32,
},
end: tower_lsp_server::lsp_types::Position {
line: (end_line - 1) as u32,
character: end_char as u32,
},
}
}
}
/// Helper function to create an LSP Range from raw span data
#[must_use]
pub fn span_to_lsp_range(
start: u32,
length: u32,
line_offsets: &LineOffsets,
) -> tower_lsp_server::lsp_types::Range {
let start_pos = start as usize;
let end_pos = (start + length) as usize;
let (start_line, start_char) = line_offsets.position_to_line_col(start_pos);
let (end_line, end_char) = line_offsets.position_to_line_col(end_pos);
#[allow(clippy::cast_possible_truncation)]
tower_lsp_server::lsp_types::Range {
start: tower_lsp_server::lsp_types::Position {
line: (start_line - 1) as u32, // LSP is 0-based, LineOffsets is 1-based
character: start_char as u32,
},
end: tower_lsp_server::lsp_types::Position {
line: (end_line - 1) as u32,
character: end_char as u32,
},
}
}
#[cfg(test)]
mod tests {
use super::*;

5
crates/djls-templates/src/lib.rs
View file

@ -162,7 +162,10 @@ fn accumulate_error(db: &dyn Db, error: &TemplateError, line_offsets: &LineOffse
let code = error.diagnostic_code();
let range = error
.span()
.map(|(start, length)| crate::ast::span_to_lsp_range(start, length, line_offsets))
.map(|(start, length)| {
let span = crate::ast::Span::new(db, start, length);
span.to_lsp_range(db, line_offsets)
})
.unwrap_or_default();
let diagnostic = tower_lsp_server::lsp_types::Diagnostic {