refactor: move lsp converters to lsp crate

crates/pgt_lsp/Cargo.toml

@@ -21,7 +21,6 @@ pgt_configuration       = { workspace = true }
 pgt_console             = { workspace = true }
 pgt_diagnostics         = { workspace = true }
 pgt_fs                  = { workspace = true }
-pgt_lsp_converters      = { workspace = true }
 pgt_text_edit           = { workspace = true }
 pgt_text_size.workspace = true
 pgt_workspace           = { workspace = true }

crates/pgt_lsp_converters/src/from_proto.rs → crates/pgt_lsp/src/adapters/from_lsp.rs

@@ -1,5 +1,5 @@
-use crate::line_index::LineIndex;
-use crate::{LineCol, PositionEncoding, WideLineCol};
+use crate::adapters::line_index::LineIndex;
+use crate::adapters::{LineCol, PositionEncoding, WideLineCol};
 use anyhow::{Context, Result};
 use pgt_text_size::{TextRange, TextSize};
 use tower_lsp::lsp_types;

crates/pgt_lsp_converters/src/line_index.rs → crates/pgt_lsp/src/adapters/line_index.rs

@@ -6,7 +6,7 @@ use std::mem;
 use pgt_text_size::TextSize;
 use rustc_hash::FxHashMap;
 
-use crate::{LineCol, WideChar, WideEncoding, WideLineCol};
+use crate::adapters::{LineCol, WideChar, WideEncoding, WideLineCol};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct LineIndex {

crates/pgt_lsp_converters/src/lib.rs → crates/pgt_lsp/src/adapters/mod.rs

@@ -3,9 +3,9 @@
 use pgt_text_size::TextSize;
 use tower_lsp::lsp_types::{ClientCapabilities, PositionEncodingKind};
 
-pub mod from_proto;
+pub mod from_lsp;
 pub mod line_index;
-pub mod to_proto;
+pub mod to_lsp;
 
 pub fn negotiated_encoding(capabilities: &ClientCapabilities) -> PositionEncoding {
     let client_encodings = match &capabilities.general {
@@ -86,11 +86,11 @@ impl WideChar {
 
 #[cfg(test)]
 mod tests {
-    use crate::WideEncoding::{Utf16, Utf32};
-    use crate::from_proto::offset;
-    use crate::line_index::LineIndex;
-    use crate::to_proto::position;
-    use crate::{LineCol, PositionEncoding, WideEncoding};
+    use crate::adapters::WideEncoding::{Utf16, Utf32};
+    use crate::adapters::from_lsp::offset;
+    use crate::adapters::line_index::LineIndex;
+    use crate::adapters::to_lsp::position;
+    use crate::adapters::{LineCol, PositionEncoding, WideEncoding};
     use pgt_text_size::TextSize;
     use tower_lsp::lsp_types::Position;
 

crates/pgt_lsp_converters/src/to_proto.rs → crates/pgt_lsp/src/adapters/to_lsp.rs

@@ -1,5 +1,5 @@
-use crate::PositionEncoding;
-use crate::line_index::LineIndex;
+use crate::adapters::PositionEncoding;
+use crate::adapters::line_index::LineIndex;
 use anyhow::{Context, Result};
 use pgt_text_size::{TextRange, TextSize};
 use tower_lsp::lsp_types;

crates/pgt_lsp/src/capabilities.rs

@@ -1,11 +1,10 @@
-use pgt_lsp_converters::{PositionEncoding, WideEncoding, negotiated_encoding};
+use crate::adapters::{PositionEncoding, WideEncoding, negotiated_encoding};
 use pgt_workspace::code_actions::{CommandActionCategory, CommandActionCategoryIter};
 use strum::{EnumIter, IntoEnumIterator};
 use tower_lsp::lsp_types::{
-    ClientCapabilities, CodeActionOptions, CompletionOptions, ExecuteCommandOptions,
-    PositionEncodingKind, SaveOptions, ServerCapabilities, TextDocumentSyncCapability,
-    TextDocumentSyncKind, TextDocumentSyncOptions, TextDocumentSyncSaveOptions,
-    WorkDoneProgressOptions,
+    ClientCapabilities, CompletionOptions, ExecuteCommandOptions, PositionEncodingKind,
+    SaveOptions, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
+    TextDocumentSyncOptions, TextDocumentSyncSaveOptions, WorkDoneProgressOptions,
 };
 
 use crate::handlers::code_actions::command_id;

crates/pgt_lsp/src/documents.rs

@@ -1,4 +1,4 @@
-use pgt_lsp_converters::line_index::LineIndex;
+use crate::adapters::line_index::LineIndex;
 
 /// Represents an open [`textDocument`]. Can be cheaply cloned.
 ///

crates/pgt_lsp/src/handlers/helper.rs

@@ -1,4 +1,7 @@
-use crate::session::Session;
+use crate::{
+    adapters::{self, from_lsp},
+    session::Session,
+};
 use pgt_text_size::TextSize;
 use tower_lsp::lsp_types;
 
@@ -16,10 +19,10 @@ pub fn get_cursor_position(
         .map(|doc| doc.line_index)
         .map_err(|_| anyhow::anyhow!("Document not found."))?;
 
-    let cursor_pos = pgt_lsp_converters::from_proto::offset(
+    let cursor_pos = from_lsp::offset(
         &line_index,
         position,
-        pgt_lsp_converters::negotiated_encoding(client_capabilities),
+        adapters::negotiated_encoding(client_capabilities),
     )?;
 
     Ok(cursor_pos)

crates/pgt_lsp/src/handlers/text_document.rs

@@ -1,8 +1,8 @@
+use crate::adapters::from_lsp;
 use crate::{
     diagnostics::LspError, documents::Document, session::Session, utils::apply_document_changes,
 };
 use anyhow::Result;
-use pgt_lsp_converters::from_proto::text_range;
 use pgt_workspace::workspace::{
     ChangeFileParams, ChangeParams, CloseFileParams, GetFileContentParams, OpenFileParams,
 };
@@ -73,7 +73,7 @@ pub(crate) async fn did_change(
             .iter()
             .map(|c| ChangeParams {
                 range: c.range.and_then(|r| {
-                    text_range(&old_doc.line_index, r, session.position_encoding()).ok()
+                    from_lsp::text_range(&old_doc.line_index, r, session.position_encoding()).ok()
                 }),
                 text: c.text.clone(),
             })

crates/pgt_lsp/src/lib.rs

@@ -1,3 +1,4 @@
+mod adapters;
 mod capabilities;
 mod diagnostics;
 mod documents;

crates/pgt_lsp/src/session.rs

@@ -1,3 +1,4 @@
+use crate::adapters::{PositionEncoding, WideEncoding, negotiated_encoding};
 use crate::diagnostics::LspError;
 use crate::documents::Document;
 use crate::utils;
@@ -8,7 +9,6 @@ use pgt_analyse::RuleCategoriesBuilder;
 use pgt_configuration::ConfigurationPathHint;
 use pgt_diagnostics::{DiagnosticExt, Error};
 use pgt_fs::{FileSystem, PgTPath};
-use pgt_lsp_converters::{PositionEncoding, WideEncoding, negotiated_encoding};
 use pgt_workspace::Workspace;
 use pgt_workspace::configuration::{LoadedConfiguration, load_configuration};
 use pgt_workspace::settings::PartialConfigurationExt;

crates/pgt_lsp/src/utils.rs

@@ -1,11 +1,11 @@
+use crate::adapters::line_index::LineIndex;
+use crate::adapters::{PositionEncoding, from_lsp, to_lsp};
 use anyhow::{Context, Result, ensure};
 use pgt_console::MarkupBuf;
 use pgt_console::fmt::Termcolor;
 use pgt_console::fmt::{self, Formatter};
 use pgt_diagnostics::termcolor::NoColor;
 use pgt_diagnostics::{Diagnostic, DiagnosticTags, Location, PrintDescription, Severity, Visit};
-use pgt_lsp_converters::line_index::LineIndex;
-use pgt_lsp_converters::{PositionEncoding, from_proto, to_proto};
 use pgt_text_edit::{CompressedOp, DiffOp, TextEdit};
 use pgt_text_size::{TextRange, TextSize};
 use std::any::Any;
@@ -37,7 +37,7 @@ pub(crate) fn text_edit(
                 offset += range.len();
             }
             CompressedOp::DiffOp(DiffOp::Insert { range }) => {
-                let start = to_proto::position(line_index, offset, position_encoding)?;
+                let start = to_lsp::position(line_index, offset, position_encoding)?;
 
                 // Merge with a previous delete operation if possible
                 let last_edit = result.last_mut().filter(|text_edit| {
@@ -54,9 +54,9 @@ pub(crate) fn text_edit(
                 }
             }
             CompressedOp::DiffOp(DiffOp::Delete { range }) => {
-                let start = to_proto::position(line_index, offset, position_encoding)?;
+                let start = to_lsp::position(line_index, offset, position_encoding)?;
                 offset += range.len();
-                let end = to_proto::position(line_index, offset, position_encoding)?;
+                let end = to_lsp::position(line_index, offset, position_encoding)?;
 
                 result.push(lsp::TextEdit {
                     range: lsp::Range::new(start, end),
@@ -108,7 +108,7 @@ pub(crate) fn diagnostic_to_lsp<D: Diagnostic>(
     } else {
         span
     };
-    let span = to_proto::range(line_index, span, position_encoding)
+    let span = to_lsp::range(line_index, span, position_encoding)
         .context("failed to convert diagnostic span to LSP range")?;
 
     let severity = match diagnostic.severity() {
@@ -189,7 +189,7 @@ impl Visit for RelatedInformationVisitor<'_> {
             None => return Ok(()),
         };
 
-        let range = match to_proto::range(self.line_index, span, self.position_encoding) {
+        let range = match to_lsp::range(self.line_index, span, self.position_encoding) {
             Ok(range) => range,
             Err(_) => return Ok(()),
         };
@@ -293,7 +293,7 @@ pub(crate) fn apply_document_changes(
                 line_index = LineIndex::new(&text);
             }
             index_valid = range.start.line;
-            if let Ok(range) = from_proto::text_range(&line_index, range, position_encoding) {
+            if let Ok(range) = from_lsp::text_range(&line_index, range, position_encoding) {
                 text.replace_range(Range::<usize>::from(range), &change.text);
             }
         }
@@ -304,9 +304,8 @@ pub(crate) fn apply_document_changes(
 
 #[cfg(test)]
 mod tests {
-
-    use pgt_lsp_converters::PositionEncoding;
-    use pgt_lsp_converters::line_index::LineIndex;
+    use crate::adapters::PositionEncoding;
+    use crate::adapters::line_index::LineIndex;
     use pgt_text_edit::TextEdit;
     use tower_lsp::lsp_types as lsp;