to textsize in lsp crate

Author: juleswritescode

crates/pg_lsp_new/src/handlers/completions.rs

@@ -1,6 +1,6 @@
 use crate::session::Session;
 use anyhow::Result;
-use pg_workspace_new::workspace::CompletionParams;
+use pg_workspace_new::workspace;
 use tower_lsp::lsp_types::{self, CompletionItem, CompletionItemLabelDetails};
 
 #[tracing::instrument(level = "debug", skip_all)]
@@ -10,13 +10,28 @@ pub fn get_completions(
 ) -> Result<lsp_types::CompletionResponse> {
     let url = params.text_document_position.text_document.uri;
     let path = session.file_path(&url)?;
-    let column = params.text_document_position.position.character;
-    let line = params.text_document_position.position.line;
 
-    let completion_result =
-        session
-            .workspace
-            .get_completions(CompletionParams { path, line, column })?;
+    let client_capabilities = session
+        .client_capabilities()
+        .expect("Client capabilities not established for current session.");
+
+    let line_index = session
+        .document(&url)
+        .map(|doc| doc.line_index)
+        .map_err(|_| anyhow::anyhow!("Document not found."))?;
+
+    let offset = pg_lsp_converters::from_proto::offset(
+        &line_index,
+        params.text_document_position.position,
+        pg_lsp_converters::negotiated_encoding(client_capabilities),
+    )?;
+
+    let completion_result = session
+        .workspace
+        .get_completions(workspace::CompletionParams {
+            path,
+            position: offset,
+        })?;
 
     let items: Vec<CompletionItem> = completion_result
         .into_iter()

crates/pg_lsp_new/src/session.rs

@@ -22,8 +22,8 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use tokio::sync::Notify;
 use tokio::sync::OnceCell;
-use tower_lsp::lsp_types;
 use tower_lsp::lsp_types::Url;
+use tower_lsp::lsp_types::{self, ClientCapabilities};
 use tower_lsp::lsp_types::{MessageType, Registration};
 use tower_lsp::lsp_types::{Unregistration, WorkspaceFolder};
 use tracing::{error, info};
@@ -385,6 +385,13 @@ impl Session {
         self.initialize_params.get()?.client_information.as_ref()
     }
 
+    /// Returns a reference to the client capabilities for this session
+    pub(crate) fn client_capabilities(&self) -> Option<&ClientCapabilities> {
+        self.initialize_params
+            .get()
+            .map(|params| &params.client_capabilities)
+    }
+
     /// This function attempts to read the `pglsp.toml` configuration file from
     /// the root URI and update the workspace settings accordingly
     #[tracing::instrument(level = "trace", skip(self))]

crates/pg_workspace_new/src/workspace.rs

@@ -44,8 +44,7 @@ pub struct CompletionParams {
     /// The File for which a completion is requested.
     pub path: PgLspPath,
     /// The Cursor position in the file for which a completion is requested.
-    pub column: u32,
-    pub line: u32,
+    pub position: TextSize,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]

crates/pg_workspace_new/src/workspace/server.rs

@@ -353,15 +353,13 @@ impl Workspace for WorkspaceServer {
             .get(&params.path)
             .ok_or(WorkspaceError::not_found())?;
 
-        let offset = doc.line_and_col_to_offset(params.line, params.column);
-
         tracing::info!(
             "Found the document. Looking for statement in file {:?} at position: {:?}",
             &params.path,
-            &offset
+            &params.position
         );
 
-        let statement = match doc.statement_at_offset(&offset) {
+        let statement = match doc.statement_at_offset(&params.position) {
             Some(s) => s,
             None => return Ok(pg_completions::CompletionResult::default()),
         };
@@ -372,7 +370,7 @@ impl Workspace for WorkspaceServer {
         let stmt_range = doc
             .statement_range(statement_ref)
             .expect("Range of statement should be defined.");
-        let position = offset - stmt_range.start();
+        let position = params.position - stmt_range.start();
 
         let tree = self.tree_sitter.fetch(statement_ref);
         let text = statement.text;