josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-08-03 17:48:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swap in tower-lsp-server dependency (#100)

Browse source
This commit is contained in:
Josh Thomas 2025-04-21 13:52:28 -05:00 • committed by GitHub
parent 33fb726bdc
commit e098272ea6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 72 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/djls-templates/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
anyhow = { workspace = true }
lsp-types = { workspace = true }
tower-lsp-server = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
toml = "0.8"

15
crates/djls-templates/src/error.rs
View file

@ -1,9 +1,9 @@
use crate::ast::{AstError, Span};
use crate::lexer::LexerError;
use crate::parser::ParserError;
use lsp_types;
use serde::Serialize;
use thiserror::Error;
use tower_lsp_server::lsp_types;
#[derive(Debug, Error, Serialize)]
pub enum TemplateError {
@ -71,14 +71,11 @@ impl TemplateError {
}
pub fn to_lsp_diagnostic(error: &TemplateError, _source: &str) -> lsp_types::Diagnostic {
let range = error.span().map_or_else(
|| lsp_types::Range::default(),
|span| {
let start = lsp_types::Position::new(0, *span.start());
let end = lsp_types::Position::new(0, span.start() + span.length());
lsp_types::Range::new(start, end)
},
);
let range = error.span().map_or_else(lsp_types::Range::default, |span| {
let start = lsp_types::Position::new(0, *span.start());
let end = lsp_types::Position::new(0, span.start() + span.length());
lsp_types::Range::new(start, end)
});
lsp_types::Diagnostic {
range,