use flatten branch of lsp-types

Author: kjeremy

Cargo.lock

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 description = "Generic LSP server scaffold."
 
 [dependencies]
-lsp-types = "0.58.0"
+lsp-types = { git = "https://github.com/kjeremy/languageserver-types", branch = "flatten" }
 log = "0.4.3"
 serde_json = "1.0.34"
 serde = { version = "1.0.83", features = ["derive"] }

crates/gen_lsp_server/Cargo.toml

@@ -13,7 +13,7 @@ crossbeam-channel = "0.3.5"
 flexi_logger = "0.13.0"
 log = "0.4.3"
 url_serde = "0.2.0"
-lsp-types = { version = "0.58.0", features = ["proposed"] }
+lsp-types = { git = "https://github.com/kjeremy/languageserver-types", branch = "flatten", features = ["proposed"] }
 rustc-hash = "1.0"
 parking_lot = "0.8.0"
 

crates/ra_lsp_server/Cargo.toml

@@ -153,14 +153,12 @@ pub fn handle_on_type_formatting(
     params: req::DocumentOnTypeFormattingParams,
 ) -> Result<Option<Vec<TextEdit>>> {
     let _p = profile("handle_on_type_formatting");
-    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
-    let position = FilePosition {
-        file_id,
-        /// in `ra_ide_api`, the `on_type` invariant is that
-        /// `text.char_at(position) == typed_char`.
-        offset: params.position.conv_with(&line_index) - TextUnit::of_char('.'),
-    };
+    let mut position = params.text_document_position.try_conv_with(&world)?;
+    let line_index = world.analysis().file_line_index(position.file_id);
+
+    // in `ra_ide_api`, the `on_type` invariant is that
+    // `text.char_at(position) == typed_char`.
+    position.offset = position.offset - TextUnit::of_char('.');
 
     let edit = match params.ch.as_str() {
         "=" => world.analysis().on_eq_typed(position),
@@ -407,12 +405,7 @@ pub fn handle_completion(
     params: req::CompletionParams,
 ) -> Result<Option<req::CompletionResponse>> {
     let _p = profile("handle_completion");
-    let position = {
-        let file_id = params.text_document.try_conv_with(&world)?;
-        let line_index = world.analysis().file_line_index(file_id);
-        let offset = params.position.conv_with(&line_index);
-        FilePosition { file_id, offset }
-    };
+    let position = params.text_document_position.try_conv_with(&world)?;
     let completion_triggered_after_single_colon = {
         let mut res = false;
         if let Some(ctx) = params.context {
@@ -543,9 +536,7 @@ pub fn handle_prepare_rename(
 }
 
 pub fn handle_rename(world: WorldSnapshot, params: RenameParams) -> Result<Option<WorkspaceEdit>> {
-    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
-    let offset = params.position.conv_with(&line_index);
+    let position = params.text_document_position.try_conv_with(&world)?;
 
     if params.new_name.is_empty() {
         return Err(LspError::new(
@@ -555,8 +546,7 @@ pub fn handle_rename(world: WorldSnapshot, params: RenameParams) -> Result<Optio
         .into());
     }
 
-    let optional_change =
-        world.analysis().rename(FilePosition { file_id, offset }, &*params.new_name)?;
+    let optional_change = world.analysis().rename(position, &*params.new_name)?;
     let change = match optional_change {
         None => return Ok(None),
         Some(it) => it,
@@ -571,11 +561,10 @@ pub fn handle_references(
     world: WorldSnapshot,
     params: req::ReferenceParams,
 ) -> Result<Option<Vec<Location>>> {
-    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
-    let offset = params.position.conv_with(&line_index);
+    let position = params.text_document_position.try_conv_with(&world)?;
+    let line_index = world.analysis().file_line_index(position.file_id);
 
-    let refs = match world.analysis().find_all_refs(FilePosition { file_id, offset })? {
+    let refs = match world.analysis().find_all_refs(position)? {
         None => return Ok(None),
         Some(refs) => refs,
     };

crates/ra_lsp_server/src/main_loop/handlers.rs

@@ -37,9 +37,11 @@ use std::collections::Spam;
     eprintln!("loading took    {:?}", project_start.elapsed());
     let completion_start = Instant::now();
     let res = server.send_request::<Completion>(CompletionParams {
-        text_document: server.doc_id("src/lib.rs"),
+        text_document_position: TextDocumentPositionParams::new(
+            server.doc_id("src/lib.rs"),
+            Position::new(0, 23),
+        ),
         context: None,
-        position: Position::new(0, 23),
     });
     assert!(format!("{}", res).contains("HashMap"));
     eprintln!("completion took {:?}", completion_start.elapsed());