more extension traits instead of newtype wrappers

Author: joshuadavidthomas

Cargo.lock

@@ -10,6 +10,7 @@ djls-source = { workspace = true }
 djls-templates = { workspace = true }
 djls-workspace = { workspace = true }
 
+camino = { workspace = true }
 salsa = { workspace = true }
 tower-lsp-server = { workspace = true }
 tracing = { workspace = true }

crates/djls-ide/Cargo.toml

@@ -7,6 +7,8 @@ use djls_templates::TemplateError;
 use djls_templates::TemplateErrorAccumulator;
 use tower_lsp_server::lsp_types;
 
+use crate::ext::SpanExt;
+
 trait DiagnosticError: std::fmt::Display {
     fn span(&self) -> Option<(u32, u32)>;
     fn diagnostic_code(&self) -> &'static str;
@@ -18,10 +20,7 @@ trait DiagnosticError: std::fmt::Display {
     fn as_diagnostic(&self, line_index: &LineIndex) -> lsp_types::Diagnostic {
         let range = self
             .span()
-            .map(|(start, length)| {
-                let span = Span::new(start, length);
-                LspRange::from((&span, line_index)).into()
-            })
+            .map(|(start, length)| Span::new(start, length).to_lsp_range(line_index))
             .unwrap_or_default();
 
         lsp_types::Diagnostic {
@@ -84,46 +83,6 @@ impl DiagnosticError for ValidationError {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-#[repr(transparent)]
-pub struct LspRange(pub lsp_types::Range);
-
-impl From<(&Span, &LineIndex)> for LspRange {
-    #[inline]
-    fn from((s, line_index): (&Span, &LineIndex)) -> Self {
-        let start = LspPosition::from((s.start_offset(), line_index)).into();
-        let end = LspPosition::from((s.end_offset(), line_index)).into();
-
-        LspRange(lsp_types::Range { start, end })
-    }
-}
-
-impl From<LspRange> for lsp_types::Range {
-    #[inline]
-    fn from(value: LspRange) -> Self {
-        value.0
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-#[repr(transparent)]
-pub struct LspPosition(pub lsp_types::Position);
-
-impl From<(Offset, &LineIndex)> for LspPosition {
-    #[inline]
-    fn from((offset, line_index): (Offset, &LineIndex)) -> Self {
-        let (line, character) = line_index.to_line_col(offset).into();
-        Self(lsp_types::Position { line, character })
-    }
-}
-
-impl From<LspPosition> for lsp_types::Position {
-    #[inline]
-    fn from(value: LspPosition) -> Self {
-        value.0
-    }
-}
-
 /// Collect all diagnostics for a template file.
 ///
 /// This function collects and converts errors that were accumulated during

crates/djls-ide/src/diagnostics.rs

@@ -0,0 +1,43 @@
+use camino::{Utf8Path, Utf8PathBuf};
+use djls_source::{LineIndex, Offset, Span};
+use tower_lsp_server::{lsp_types, UriExt};
+
+pub(crate) trait OffsetExt {
+    fn to_lsp_position(&self, line_index: &LineIndex) -> lsp_types::Position;
+}
+
+impl OffsetExt for Offset {
+    fn to_lsp_position(&self, line_index: &LineIndex) -> lsp_types::Position {
+        let (line, character) = line_index.to_line_col(*self).into();
+        lsp_types::Position { line, character }
+    }
+}
+
+pub(crate) trait SpanExt {
+    fn to_lsp_range(&self, line_index: &LineIndex) -> lsp_types::Range;
+}
+
+impl SpanExt for Span {
+    fn to_lsp_range(&self, line_index: &LineIndex) -> lsp_types::Range {
+        let start = self.start_offset().to_lsp_position(line_index);
+        let end = self.end_offset().to_lsp_position(line_index);
+        lsp_types::Range { start, end }
+    }
+}
+
+pub(crate) trait Utf8PathExt {
+    fn to_lsp_uri(&self) -> Option<lsp_types::Uri>;
+}
+
+impl Utf8PathExt for Utf8Path {
+    fn to_lsp_uri(&self) -> Option<lsp_types::Uri> {
+        lsp_types::Uri::from_file_path(self.as_std_path())
+    }
+}
+
+// Or if you have a Utf8PathBuf
+impl Utf8PathExt for Utf8PathBuf {
+    fn to_lsp_uri(&self) -> Option<lsp_types::Uri> {
+        lsp_types::Uri::from_file_path(self.as_std_path())
+    }
+}

crates/djls-ide/src/ext.rs

@@ -1,5 +1,6 @@
 mod completions;
 mod diagnostics;
+mod ext;
 mod navigation;
 mod snippets;
 

crates/djls-ide/src/lib.rs

@@ -5,7 +5,9 @@ use djls_source::Offset;
 use djls_templates::parse_template;
 use djls_templates::Node;
 use tower_lsp_server::lsp_types;
-use tower_lsp_server::UriExt;
+
+use crate::ext::SpanExt;
+use crate::ext::Utf8PathExt;
 
 pub fn goto_template_definition(
     db: &dyn djls_semantic::Db,
@@ -21,11 +23,10 @@ pub fn goto_template_definition(
         ResolveResult::Found(template) => {
             let path = template.path_buf(db);
             tracing::debug!("Resolved template to: {}", path);
-            let uri = lsp_types::Uri::from_file_path(path.as_std_path())?;
 
             Some(lsp_types::GotoDefinitionResponse::Scalar(
                 lsp_types::Location {
-                    uri,
+                    uri: path.to_lsp_uri()?,
                     range: lsp_types::Range::default(),
                 },
             ))
@@ -57,34 +58,17 @@ pub fn find_template_references(
         .filter_map(|reference| {
             let source_template = reference.source(db);
             let source_path = source_template.path_buf(db);
-            let uri = lsp_types::Uri::from_file_path(source_path.as_std_path())?;
 
             let ref_file = djls_source::File::new(db, source_path.clone(), 0);
             let line_index = ref_file.line_index(db);
 
             let tag = reference.tag(db);
             let tag_span = tag.span(db);
-            let start_offset = tag_span.start_offset();
-            let end_offset = tag_span.end_offset();
-
-            let start_lc = line_index.to_line_col(start_offset);
-            let end_lc = line_index.to_line_col(end_offset);
-
-            let start_pos = lsp_types::Position {
-                line: start_lc.line(),
-                character: start_lc.column(),
-            };
-            let end_pos = lsp_types::Position {
-                line: end_lc.line(),
-                character: end_lc.column(),
-            };
+            let range = tag_span.to_lsp_range(line_index);
 
             Some(lsp_types::Location {
-                uri,
-                range: lsp_types::Range {
-                    start: start_pos,
-                    end: end_pos,
-                },
+                uri: source_path.to_lsp_uri()?,
+                range,
             })
         })
         .collect();

crates/djls-ide/src/navigation.rs

@@ -36,11 +36,11 @@ impl TextDocumentIdentifierExt for lsp_types::TextDocumentIdentifier {
 
 pub(crate) trait TextDocumentItemExt {
     /// Convert LSP `TextDocumentItem` to internal `TextDocument`
-    fn to_text_document(self) -> TextDocument;
+    fn into_text_document(self) -> TextDocument;
 }
 
 impl TextDocumentItemExt for lsp_types::TextDocumentItem {
-    fn to_text_document(self) -> TextDocument {
+    fn into_text_document(self) -> TextDocument {
         TextDocument::new(
             self.text,
             self.version,

crates/djls-ide/src/references.rs

@@ -210,7 +210,7 @@ impl LanguageServer for DjangoLanguageServer {
             .with_session_mut(|session| {
                 let url = params.text_document.uri.to_url()?;
                 let version = params.text_document.version;
-                let document = params.text_document.to_text_document();
+                let document = params.text_document.into_text_document();
 
                 session.open_document(&url, document);