progress

Author: psteinroe

crates/pgt_lsp/src/capabilities.rs

@@ -1,4 +1,7 @@
 use crate::adapters::{PositionEncoding, WideEncoding, negotiated_encoding};
+use crate::handlers::code_actions::command_id;
+use pgt_workspace::features::code_actions::CommandActionCategory;
+use strum::IntoEnumIterator;
 use tower_lsp::lsp_types::{
     ClientCapabilities, CompletionOptions, ExecuteCommandOptions, PositionEncodingKind,
     SaveOptions, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
@@ -47,8 +50,9 @@ pub(crate) fn server_capabilities(capabilities: &ClientCapabilities) -> ServerCa
             },
         }),
         execute_command_provider: Some(ExecuteCommandOptions {
-            commands: available_command_ids(),
-
+            commands: CommandActionCategory::iter()
+                .map(|c| command_id(&c))
+                .collect::<Vec<String>>(),
             ..Default::default()
         }),
         document_formatting_provider: None,
@@ -61,13 +65,3 @@ pub(crate) fn server_capabilities(capabilities: &ClientCapabilities) -> ServerCa
         ..Default::default()
     }
 }
-
-/// Returns all available command IDs for capability registration.
-/// Since CommandActionCategory has variants with data, we can't use strum::IntoEnumIterator.
-/// Instead, we manually list the command IDs we want to register.
-fn available_command_ids() -> Vec<String> {
-    vec![
-        "postgres-tools.executeStatement".to_string(),
-        // Add other command IDs here as needed
-    ]
-}

crates/pgt_workspace/src/features/code_actions.rs

@@ -44,7 +44,7 @@ pub struct CommandAction {
     pub category: CommandActionCategory,
 }
 
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, strum::EnumIter)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub enum CommandActionCategory {
     ExecuteStatement(StatementId),

crates/pgt_workspace/src/workspace/server.rs

@@ -626,7 +626,7 @@ impl Workspace for WorkspaceServer {
                 tracing::debug!("No statement found.");
                 Ok(CompletionsResult::default())
             }
-            Some((id, range, content, cst)) => {
+            Some((_id, range, content, cst)) => {
                 let position = params.position - range.start();
 
                 let items = pgt_completions::complete(pgt_completions::CompletionParams {
@@ -636,12 +636,6 @@ impl Workspace for WorkspaceServer {
                     text: content,
                 });
 
-                tracing::debug!(
-                    "Found {} completion items for statement with id {:?}",
-                    items.len(),
-                    id
-                );
-
                 Ok(CompletionsResult { items })
             }
         }

crates/pgt_workspace/src/workspace/server/statement_identifier.rs

@@ -27,21 +27,20 @@ pub enum StatementId {
     },
 }
 
+// this is only here for strum to work on the code actions enum
+impl Default for StatementId {
+    fn default() -> Self {
+        StatementId::Root { content: "".into() }
+    }
+}
+
 impl StatementId {
     pub fn new(statement: &str) -> Self {
         StatementId::Root {
             content: statement.into(),
         }
     }
 
-    /// Creates a child statement ID with the given content and parent content.
-    pub fn new_child(child_content: &str, parent_content: &str) -> Self {
-        StatementId::Child {
-            content: child_content.into(),
-            parent_content: parent_content.into(),
-        }
-    }
-
     /// Use this if you need to create a matching `StatementId::Child` for `Root`.
     /// You cannot create a `Child` of a `Child`.
     /// Note: This method requires the child content to be provided.