remove dep

Author: juleswritescode

Cargo.lock

@@ -12,7 +12,6 @@ tree-sitter.workspace = true
 tree_sitter_sql.workspace = true
 pg_schema_cache.workspace = true
 pg_test_utils.workspace = true
-tower-lsp.workspace = true
 
 sqlx.workspace = true
 

crates/pg_completions/Cargo.toml

@@ -11,39 +11,3 @@ pub struct CompletionItem {
     pub preselected: Option<bool>,
     pub kind: CompletionItemKind,
 }
-
-impl From<CompletionItem> for tower_lsp::lsp_types::CompletionItem {
-    fn from(i: CompletionItem) -> Self {
-        tower_lsp::lsp_types::CompletionItem {
-            label: i.label,
-            label_details: Some(tower_lsp::lsp_types::CompletionItemLabelDetails {
-                description: Some(i.description),
-                detail: None,
-            }),
-            kind: Some(i.kind.into()),
-            detail: None,
-            documentation: None,
-            deprecated: None,
-            preselect: None,
-            sort_text: None,
-            filter_text: None,
-            insert_text: None,
-            insert_text_format: None,
-            insert_text_mode: None,
-            text_edit: None,
-            additional_text_edits: None,
-            commit_characters: None,
-            data: None,
-            tags: None,
-            command: None,
-        }
-    }
-}
-
-impl From<CompletionItemKind> for tower_lsp::lsp_types::CompletionItemKind {
-    fn from(value: CompletionItemKind) -> Self {
-        match value {
-            CompletionItemKind::Table => tower_lsp::lsp_types::CompletionItemKind::CLASS,
-        }
-    }
-}

crates/pg_completions/src/item.rs

@@ -6,3 +6,4 @@ mod providers;
 mod relevance;
 
 pub use complete::*;
+pub use item::*;

crates/pg_completions/src/lib.rs

@@ -14,7 +14,10 @@ use tower_lsp::lsp_types::{
     InlayHintKind, InlayHintLabel, MarkedString, Position, Range,
 };
 
-use crate::{db_connection::DbConnection, utils::line_index_ext::LineIndexExt};
+use crate::{
+    db_connection::DbConnection,
+    utils::{line_index_ext::LineIndexExt, to_lsp_types::to_completion_kind},
+};
 
 pub struct Session {
     db: RwLock<Option<DbConnection>>,
@@ -246,7 +249,29 @@ impl Session {
             schema: &schema_cache,
         })
         .into_iter()
-        .map(|i| i.into())
+        .map(|item| CompletionItem {
+            label: item.label,
+            label_details: Some(tower_lsp::lsp_types::CompletionItemLabelDetails {
+                description: Some(item.description),
+                detail: None,
+            }),
+            kind: Some(to_completion_kind(item.kind)),
+            detail: None,
+            documentation: None,
+            deprecated: None,
+            preselect: None,
+            sort_text: None,
+            filter_text: None,
+            insert_text: None,
+            insert_text_format: None,
+            insert_text_mode: None,
+            text_edit: None,
+            additional_text_edits: None,
+            commit_characters: None,
+            data: None,
+            tags: None,
+            command: None,
+        })
         .collect();
 
         Some(CompletionList {

crates/pg_lsp/src/session.rs

@@ -1,4 +1,5 @@
 pub mod line_index_ext;
+pub mod to_lsp_types;
 pub mod to_proto;
 
 use std::path::PathBuf;

crates/pg_lsp/src/utils.rs

@@ -0,0 +1,9 @@
+use tower_lsp::lsp_types;
+
+pub fn to_completion_kind(
+    kind: pg_completions::CompletionItemKind,
+) -> lsp_types::CompletionItemKind {
+    match kind {
+        pg_completions::CompletionItemKind::Table => lsp_types::CompletionItemKind::CLASS,
+    }
+}