Merge branch 'fix/eof-handling' of https://github.com/supabase-community/postgres_lsp into fix/eof-handling

Author: juleswritescode

.sqlx/query-b0163e58e9c646e3af524174081b74ab7e7938e9516ea21513265c49d304b6ea.json renamed to .sqlx/query-1cc58ddce2b52b5d6f6519cde339f258bce50342c2d5cce036dba4f9062cf811.json

@@ -23,6 +23,7 @@ biome_js_syntax          = "0.5.7"
 biome_rowan              = "0.5.7"
 biome_string_case        = "0.5.8"
 bpaf                     = { version = "0.9.15", features = ["derive"] }
+criterion                = "0.5"
 crossbeam                = "0.8.4"
 enumflags2               = "0.7.11"
 ignore                   = "0.4.23"

Cargo.lock

@@ -31,7 +31,7 @@ sqlx.workspace = true
 tokio = { version = "1.41.1", features = ["full"] }
 
 [dev-dependencies]
-criterion                = "0.5.1"
+criterion.workspace      = true
 pgt_test_utils.workspace = true
 
 [lib]

Cargo.toml

@@ -24,6 +24,10 @@ impl HoveredNode {
     pub(crate) fn get(ctx: &pgt_treesitter::context::TreesitterContext) -> Option<Self> {
         let node_content = ctx.get_node_under_cursor_content()?;
 
+        if looks_like_sql_param(node_content.as_str()) {
+            return None;
+        }
+
         let under_cursor = ctx.node_under_cursor.as_ref()?;
 
         match under_cursor.kind() {
@@ -114,3 +118,10 @@ impl HoveredNode {
         }
     }
 }
+
+fn looks_like_sql_param(content: &str) -> bool {
+    (content.starts_with("$") && !content.starts_with("$$"))
+        || (content.starts_with(":") && !content.starts_with("::"))
+        || (content.starts_with("@"))
+        || content.starts_with("?")
+}

crates/pgt_completions/Cargo.toml

@@ -518,3 +518,44 @@ async fn test_grant_table_hover(test_db: PgPool) {
 
     test_hover_at_cursor("grant_select", query, None, &test_db).await;
 }
+
+#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+async fn no_hover_results_over_params(test_db: PgPool) {
+    let setup = r#"
+        create table users (
+            id serial primary key,
+            name text
+        );
+    "#;
+
+    test_db.execute(setup).await.unwrap();
+
+    {
+        let query = format!(
+            "select * from users where name = $n{}ame;",
+            QueryWithCursorPosition::cursor_marker()
+        );
+        test_hover_at_cursor("dollar-param", query, None, &test_db).await;
+    }
+    {
+        let query = format!(
+            "select * from users where name = :n{}ame;",
+            QueryWithCursorPosition::cursor_marker()
+        );
+        test_hover_at_cursor("colon-param", query, None, &test_db).await;
+    }
+    {
+        let query = format!(
+            "select * from users where name = @n{}ame;",
+            QueryWithCursorPosition::cursor_marker()
+        );
+        test_hover_at_cursor("at-param", query, None, &test_db).await;
+    }
+    {
+        let query = format!(
+            "select * from users where name = ?n{}ame;",
+            QueryWithCursorPosition::cursor_marker()
+        );
+        test_hover_at_cursor("questionmark-param", query, None, &test_db).await;
+    }
+}

crates/pgt_hover/src/hovered_node.rs

@@ -0,0 +1,12 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+select * from users where name = @name;
+                                   ↑ hovered here
+```
+
+# Hover Results
+No hover information found.

crates/pgt_hover/tests/hover_integration_tests.rs

@@ -0,0 +1,12 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+select * from users where name = :name;
+                                   ↑ hovered here
+```
+
+# Hover Results
+No hover information found.

crates/pgt_hover/tests/snapshots/at-param.snap

@@ -0,0 +1,12 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+expression: snapshot
+---
+# Input
+```sql
+select * from users where name = $name;
+                                   ↑ hovered here
+```
+
+# Hover Results
+No hover information found.