Replace Location by Position

Cargo.toml

@@ -32,6 +32,7 @@ categories = ["compilers"]
 miette = { version = "7" }
 thiserror = { version = "1" }
 # lsp server
+lsp-types = { version = "0.97" }
 tower-lsp = { git = "https://github.com/tower-lsp/tower-lsp", rev = "19f5a87810ff4b643d2bc394e438450bd9c74365", default-features = false, features = [
     "runtime-agnostic",
 ] }

lang/driver/Cargo.toml

@@ -16,6 +16,7 @@ categories.workspace = true
 async-trait = "0.1"
 # adressing symbols
 url = { workspace = true }
+lsp-types = { workspace = true }
 # index of source code intervals
 rust-lapper = "1"
 # text rope

lang/driver/src/codespan.rs

@@ -1,4 +1,5 @@
-use miette_util::codespan::{ByteIndex, ColumnIndex, LineIndex, LineOffset, Location, Span};
+use lsp_types::Position;
+use miette_util::codespan::{ByteIndex, LineIndex, LineOffset, Span};
 
 /// An enum representing an error that happened while looking up a file or a piece of content in that file.
 #[derive(Debug)]
@@ -60,7 +61,7 @@ impl File {
         }
     }
 
-    pub fn location(&self, byte_index: ByteIndex) -> Result<Location, Error> {
+    pub fn location(&self, byte_index: ByteIndex) -> Result<Position, Error> {
         let line_index = self.line_index(byte_index);
         let line_start_index = self.line_start(line_index).map_err(|_| Error::IndexTooLarge {
             given: byte_index.to_usize(),
@@ -79,7 +80,7 @@ impl File {
                 }
             })?;
 
-        Ok(Location { line: line_index, column: ColumnIndex(line_src.chars().count() as u32) })
+        Ok(Position { line: line_index.0, character: line_src.chars().count() as u32 })
     }
 
     pub fn source(&self) -> &String {

lang/driver/src/spans.rs

@@ -1,27 +1,28 @@
-use miette_util::codespan::{ByteIndex, Location, Span};
+use lsp_types::{Position, Range};
+use miette_util::codespan::{ByteIndex, LineIndex, Span};
 use url::Url;
 
 use crate::database::Database;
 
 use super::info::{Info, Item};
 
 impl Database {
-    pub fn location_to_index(&self, uri: &Url, location: Location) -> Option<ByteIndex> {
+    pub fn location_to_index(&self, uri: &Url, location: Position) -> Option<ByteIndex> {
         let file = self.files.get_even_if_stale(uri).unwrap();
-        let line_span = file.line_span(location.line).ok()?;
-        let index: usize = line_span.start().to_usize() + location.column.to_usize();
+        let line_span = file.line_span(LineIndex(location.line)).ok()?;
+        let index: usize = line_span.start().to_usize() + LineIndex(location.character).to_usize();
         Some(ByteIndex(index as u32))
     }
 
-    pub fn index_to_location(&self, uri: &Url, idx: ByteIndex) -> Option<Location> {
+    pub fn index_to_location(&self, uri: &Url, idx: ByteIndex) -> Option<Position> {
         let file = self.files.get_even_if_stale(uri).unwrap();
         file.location(idx).ok()
     }
 
-    pub fn span_to_locations(&self, uri: &Url, span: Span) -> Option<(Location, Location)> {
+    pub fn span_to_locations(&self, uri: &Url, span: Span) -> Option<Range> {
         let start = self.index_to_location(uri, span.start())?;
         let end = self.index_to_location(uri, span.end())?;
-        Some((start, end))
+        Some(Range { start, end })
     }
 
     pub async fn hoverinfo_at_index(&mut self, uri: &Url, idx: ByteIndex) -> Option<Info> {

lang/lsp/src/codeactions.rs

@@ -23,8 +23,8 @@ pub async fn code_action(
         .await;
 
     let mut db = server.database.write().await;
-    let span_start = db.location_to_index(&text_document.uri.from_lsp(), range.start.from_lsp());
-    let span_end = db.location_to_index(&text_document.uri.from_lsp(), range.end.from_lsp());
+    let span_start = db.location_to_index(&text_document.uri.from_lsp(), range.start);
+    let span_end = db.location_to_index(&text_document.uri.from_lsp(), range.end);
     let span = span_start
         .and_then(|start| span_end.map(|end| miette_util::codespan::Span::new(start, end)));
     let item = if let Some(span) = span {
@@ -42,10 +42,7 @@ pub async fn code_action(
         let edits = edits
             .into_iter()
             .map(|edit| TextEdit {
-                range: db
-                    .span_to_locations(&text_document.uri.from_lsp(), edit.span)
-                    .unwrap()
-                    .to_lsp(),
+                range: db.span_to_locations(&text_document.uri.from_lsp(), edit.span).unwrap(),
                 new_text: edit.text,
             })
             .collect();

lang/lsp/src/conversion/mod.rs

@@ -1,7 +1,6 @@
 use miette::Severity;
 use tower_lsp::lsp_types::DiagnosticSeverity;
 
-mod spans;
 mod uri_to_url;
 
 pub trait FromLsp {

lang/lsp/src/diagnostics.rs

@@ -28,10 +28,8 @@ impl Diagnostics for Database {
         // the default range is used, which corresponds to the beginning of the
         // file.
         let span = get_span(&error);
-        let range = span
-            .and_then(|x| self.span_to_locations(uri, x.from_miette()))
-            .map(ToLsp::to_lsp)
-            .unwrap_or_default();
+        let range =
+            span.and_then(|x| self.span_to_locations(uri, x.from_miette())).unwrap_or_default();
 
         // Compute the message.
         let message = error.to_string();

lang/lsp/src/gotodefinition.rs

@@ -24,7 +24,7 @@ pub async fn goto_definition(
 
     let pos = pos_params.position;
     let mut db = server.database.write().await;
-    let info = db.location_to_index(&text_document.uri.from_lsp(), pos.from_lsp());
+    let info = db.location_to_index(&text_document.uri.from_lsp(), pos);
     let info = match info {
         Some(idx) => db.hoverinfo_at_index(&text_document.uri.from_lsp(), idx).await,
         None => None,
@@ -40,7 +40,7 @@ fn info_to_jump(db: &Database, info: Info) -> Option<GotoDefinitionResponse> {
 }
 
 fn span_to_location(span: &Span, uri: &Uri, db: &Database) -> Option<Location> {
-    let range = db.span_to_locations(&uri.from_lsp(), *span).map(ToLsp::to_lsp)?;
+    let range = db.span_to_locations(&uri.from_lsp(), *span)?;
     Some(Location { uri: uri.clone(), range })
 }
 

lang/lsp/src/hover.rs

@@ -20,7 +20,7 @@ pub async fn hover(server: &Server, params: HoverParams) -> jsonrpc::Result<Opti
 
     let pos = pos_params.position;
     let mut db = server.database.write().await;
-    let info = db.location_to_index(&text_document.uri.from_lsp(), pos.from_lsp());
+    let info = db.location_to_index(&text_document.uri.from_lsp(), pos);
 
     let info = match info {
         Some(idx) => db.hoverinfo_at_index(&text_document.uri.from_lsp(), idx).await,
@@ -32,7 +32,7 @@ pub async fn hover(server: &Server, params: HoverParams) -> jsonrpc::Result<Opti
 }
 
 fn info_to_hover(db: &Database, uri: &Uri, info: Info) -> Hover {
-    let range = db.span_to_locations(&uri.from_lsp(), info.span).map(ToLsp::to_lsp);
+    let range = db.span_to_locations(&uri.from_lsp(), info.span);
     let contents = info.content.to_hover_content();
     Hover { contents, range }
 }

lang/miette_util/src/codespan.rs

@@ -237,18 +237,3 @@ impl fmt::Display for ColumnIndex {
         self.0.fmt(f)
     }
 }
-/// A location in a source file.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Location {
-    /// The line index in the source file.
-    pub line: LineIndex,
-    /// The column index in the source file.
-    pub column: ColumnIndex,
-}
-
-impl Location {
-    /// Construct a new location from a line index and a column index.
-    pub fn new(line: impl Into<LineIndex>, column: impl Into<ColumnIndex>) -> Location {
-        Location { line: line.into(), column: column.into() }
-    }
-}