refactor: move get_cursor_position to adapters (#278)

Author: juleswritescode

crates/pgt_lsp/src/adapters/mod.rs

@@ -1,7 +1,9 @@
 //! The crate contains a set of converters to translate between `lsp-types` and `text_size` (and vice versa) types.
 
 use pgt_text_size::TextSize;
-use tower_lsp::lsp_types::{ClientCapabilities, PositionEncodingKind};
+use tower_lsp::lsp_types::{ClientCapabilities, Position, PositionEncodingKind, Url};
+
+use crate::session::Session;
 
 pub mod from_lsp;
 pub mod line_index;
@@ -25,6 +27,29 @@ pub fn negotiated_encoding(capabilities: &ClientCapabilities) -> PositionEncodin
     PositionEncoding::Wide(WideEncoding::Utf16)
 }
 
+pub fn get_cursor_position(
+    session: &Session,
+    url: &Url,
+    position: Position,
+) -> anyhow::Result<TextSize> {
+    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 cursor_pos = from_lsp::offset(
+        &line_index,
+        position,
+        negotiated_encoding(client_capabilities),
+    )?;
+
+    Ok(cursor_pos)
+}
+
 #[derive(Clone, Copy, Debug)]
 pub enum PositionEncoding {
     Utf8,

crates/pgt_lsp/src/handlers.rs

@@ -1,4 +1,3 @@
 pub(crate) mod code_actions;
 pub(crate) mod completions;
-mod helper;
 pub(crate) mod text_document;

crates/pgt_lsp/src/handlers/code_actions.rs

@@ -1,4 +1,4 @@
-use crate::session::Session;
+use crate::{adapters::get_cursor_position, session::Session};
 use anyhow::{Result, anyhow};
 use tower_lsp::lsp_types::{
     self, CodeAction, CodeActionDisabled, CodeActionOrCommand, Command, ExecuteCommandParams,
@@ -9,16 +9,14 @@ use pgt_workspace::features::code_actions::{
     CodeActionKind, CodeActionsParams, CommandActionCategory, ExecuteStatementParams,
 };
 
-use super::helper;
-
 pub fn get_actions(
     session: &Session,
     params: lsp_types::CodeActionParams,
 ) -> Result<lsp_types::CodeActionResponse> {
     let url = params.text_document.uri;
     let path = session.file_path(&url)?;
 
-    let cursor_position = helper::get_cursor_position(session, &url, params.range.start)?;
+    let cursor_position = get_cursor_position(session, &url, params.range.start)?;
 
     let workspace_actions = session.workspace.pull_code_actions(CodeActionsParams {
         path,

crates/pgt_lsp/src/handlers/completions.rs

@@ -1,10 +1,8 @@
-use crate::session::Session;
+use crate::{adapters::get_cursor_position, session::Session};
 use anyhow::Result;
 use pgt_workspace::{WorkspaceError, features::completions::GetCompletionsParams};
 use tower_lsp::lsp_types::{self, CompletionItem, CompletionItemLabelDetails};
 
-use super::helper;
-
 #[tracing::instrument(level = "trace", skip_all)]
 pub fn get_completions(
     session: &Session,
@@ -15,11 +13,7 @@ pub fn get_completions(
 
     let completion_result = match session.workspace.get_completions(GetCompletionsParams {
         path,
-        position: helper::get_cursor_position(
-            session,
-            &url,
-            params.text_document_position.position,
-        )?,
+        position: get_cursor_position(session, &url, params.text_document_position.position)?,
     }) {
         Ok(result) => result,
         Err(e) => match e {