many intermediate yes yes

juleswritescode · juleswritescode · commit 7a826bf2bc5c · 2025-10-28T11:36:35.000+01:00
diff --git a/crates/pgt_completions/src/providers/columns.rs b/crates/pgt_completions/src/providers/columns.rs
@@ -750,57 +750,57 @@ mod tests {
 
         pool.execute(setup).await.unwrap();
 
-        assert_complete_results(
-            format!(
-                "select name from instruments where {} ",
-                QueryWithCursorPosition::cursor_marker()
-            )
-            .as_str(),
-            vec![
-                CompletionAssertion::Label("created_at".into()),
-                CompletionAssertion::Label("id".into()),
-                CompletionAssertion::Label("name".into()),
-                CompletionAssertion::Label("z".into()),
-            ],
-            None,
-            &pool,
-        )
-        .await;
-
-        assert_complete_results(
-            format!(
-                "select name from instruments where z = 'something' and created_at > {}",
-                QueryWithCursorPosition::cursor_marker()
-            )
-            .as_str(),
-            // simply do not complete columns + schemas; functions etc. are ok
-            vec![
-                CompletionAssertion::KindNotExists(CompletionItemKind::Column),
-                CompletionAssertion::KindNotExists(CompletionItemKind::Schema),
-            ],
-            None,
-            &pool,
-        )
-        .await;
-
-        // prefers not mentioned columns
-        assert_complete_results(
-            format!(
-                "select name from instruments where id = 'something' and {}",
-                QueryWithCursorPosition::cursor_marker()
-            )
-            .as_str(),
-            vec![
-                CompletionAssertion::Label("created_at".into()),
-                CompletionAssertion::Label("name".into()),
-                CompletionAssertion::Label("z".into()),
-            ],
-            None,
-            &pool,
-        )
-        .await;
-
-        // // uses aliases
+        // assert_complete_results(
+        //     format!(
+        //         "select name from instruments where {} ",
+        //         QueryWithCursorPosition::cursor_marker()
+        //     )
+        //     .as_str(),
+        //     vec![
+        //         CompletionAssertion::Label("created_at".into()),
+        //         CompletionAssertion::Label("id".into()),
+        //         CompletionAssertion::Label("name".into()),
+        //         CompletionAssertion::Label("z".into()),
+        //     ],
+        //     None,
+        //     &pool,
+        // )
+        // .await;
+
+        // assert_complete_results(
+        //     format!(
+        //         "select name from instruments where z = 'something' and created_at > {}",
+        //         QueryWithCursorPosition::cursor_marker()
+        //     )
+        //     .as_str(),
+        //     // simply do not complete columns + schemas; functions etc. are ok
+        //     vec![
+        //         CompletionAssertion::KindNotExists(CompletionItemKind::Column),
+        //         CompletionAssertion::KindNotExists(CompletionItemKind::Schema),
+        //     ],
+        //     None,
+        //     &pool,
+        // )
+        // .await;
+
+        // // prefers not mentioned columns
+        // assert_complete_results(
+        //     format!(
+        //         "select name from instruments where id = 'something' and {}",
+        //         QueryWithCursorPosition::cursor_marker()
+        //     )
+        //     .as_str(),
+        //     vec![
+        //         CompletionAssertion::Label("created_at".into()),
+        //         CompletionAssertion::Label("name".into()),
+        //         CompletionAssertion::Label("z".into()),
+        //     ],
+        //     None,
+        //     &pool,
+        // )
+        // .await;
+
+        // uses aliases
         assert_complete_results(
             format!(
                 "select name from instruments i join others o on i.z = o.a where i.{}",
diff --git a/crates/pgt_completions/src/relevance/filtering.rs b/crates/pgt_completions/src/relevance/filtering.rs
@@ -18,7 +18,7 @@ impl CompletionFilter<'_> {
     pub fn is_relevant(&self, ctx: &TreesitterContext) -> Option<()> {
         self.completable_context(ctx)?;
 
-        self.check_node_type(ctx)
+        self.check_specific_node_type(ctx)
             // we want to rely on treesitter more, so checking the clause is a fallback
             .or_else(|| self.check_clause(ctx))?;
 
@@ -92,15 +92,32 @@ impl CompletionFilter<'_> {
         Some(())
     }
 
-    fn check_node_type(&self, ctx: &TreesitterContext) -> Option<()> {
+    fn check_specific_node_type(&self, ctx: &TreesitterContext) -> Option<()> {
         let kind = ctx.node_under_cursor.as_ref().map(|n| n.kind())?;
 
         let is_allowed = match kind {
             "column_identifier" => {
                 matches!(self.data, CompletionRelevanceData::Column(_))
                     && !ctx.matches_ancestor_history(&["insert_values", "field"])
-                    && !ctx.node_under_cursor_is_within_field_name("binary_expr_right")
+                    && !ctx.node_under_cursor_is_within_field_name(&["binary_expr_right"])
             }
+
+            "any_identifier" => match self.data {
+                CompletionRelevanceData::Column(_) => {
+                    if matches!(ctx.wrapping_clause_type, Some(WrappingClause::Where)) {
+                        ctx.node_under_cursor_is_within_field_name(&[
+                            "object_reference_first",
+                            "object_reference_second",
+                            "object_reference_third",
+                        ])
+                    } else {
+                        false
+                    }
+                }
+
+                _ => false,
+            },
+
             _ => false,
         };
 
diff --git a/crates/pgt_hover/src/hovered_node.rs b/crates/pgt_hover/src/hovered_node.rs
@@ -73,6 +73,19 @@ impl HoveredNode {
                 }
             }
 
+            "any_identifier"
+                if ctx.matches_ancestor_history(&["binary_expression", "object_reference"]) =>
+            {
+                if let Some(table_or_alias) = ctx.schema_or_alias_name.as_ref() {
+                    Some(HoveredNode::Column(NodeIdentification::SchemaAndName((
+                        table_or_alias.clone(),
+                        node_content,
+                    ))))
+                } else {
+                    Some(HoveredNode::Column(NodeIdentification::Name(node_content)))
+                }
+            }
+
             "column_identifier" => {
                 if let Some(table_or_alias) = ctx.schema_or_alias_name.as_ref() {
                     Some(HoveredNode::Column(NodeIdentification::SchemaAndName((
@@ -116,7 +129,7 @@ impl HoveredNode {
                 if (
                     // hover over custom type in `create table` or `returns`
                     (ctx.matches_ancestor_history(&["type", "object_reference"])
-                    && ctx.node_under_cursor_is_within_field_name("custom_type"))
+                    && ctx.node_under_cursor_is_within_field_name(&["custom_type"]))
 
                     // hover over type in `select` clause etc…                    
                     || (ctx
diff --git a/crates/pgt_hover/tests/snapshots/column_hover.snap.new b/crates/pgt_hover/tests/snapshots/column_hover.snap.new
@@ -0,0 +1,13 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+assertion_line: 69
+expression: snapshot
+---
+# Input
+```sql
+select users.id from users
+              ↑ hovered here
+```
+
+# Hover Results
+No hover information found.
diff --git a/crates/pgt_hover/tests/snapshots/column_hover_quoted_schema_table.snap.new b/crates/pgt_hover/tests/snapshots/column_hover_quoted_schema_table.snap.new
@@ -0,0 +1,13 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+assertion_line: 69
+expression: snapshot
+---
+# Input
+```sql
+select "auth"."user_profiles".first_name from "auth"."user_profiles"
+                                     ↑ hovered here
+```
+
+# Hover Results
+No hover information found.
diff --git a/crates/pgt_hover/tests/snapshots/hover_type_in_select_clause.snap.new b/crates/pgt_hover/tests/snapshots/hover_type_in_select_clause.snap.new
@@ -0,0 +1,13 @@
+---
+source: crates/pgt_hover/tests/hover_integration_tests.rs
+assertion_line: 69
+expression: snapshot
+---
+# Input
+```sql
+select (compfoo).f1 from some_table s;
+          ↑ hovered here
+```
+
+# Hover Results
+No hover information found.
diff --git a/crates/pgt_treesitter/src/context/mod.rs b/crates/pgt_treesitter/src/context/mod.rs
@@ -697,7 +697,7 @@ impl<'a> TreesitterContext<'a> {
     }
 
     /// Returns true if the node under the cursor matches the field_name OR has a parent that matches the field_name.
-    pub fn node_under_cursor_is_within_field_name(&self, name: &str) -> bool {
+    pub fn node_under_cursor_is_within_field_name(&self, names: &[&'static str]) -> bool {
         self.node_under_cursor
             .as_ref()
             .map(|node| {
@@ -713,15 +713,17 @@ impl<'a> TreesitterContext<'a> {
                         break;
                     }
 
-                    if p.children_by_field_name(name, &mut cursor).any(|c| {
-                        let r = c.range();
-                        // if the parent range contains the node range, the node is of the field_name.
-                        r.start_byte <= node.start_byte() && r.end_byte >= node.end_byte()
-                    }) {
-                        return true;
-                    } else {
-                        parent = p.parent();
+                    for name in names {
+                        if p.children_by_field_name(name, &mut cursor).any(|c| {
+                            let r = c.range();
+                            // if the parent range contains the node range, the node is of the field_name.
+                            r.start_byte <= node.start_byte() && r.end_byte >= node.end_byte()
+                        }) {
+                            return true;
+                        }
                     }
+
+                    parent = p.parent();
                 }
 
                 false
@@ -1114,7 +1116,7 @@ mod tests {
 
         let ctx = TreesitterContext::new(params);
 
-        assert!(ctx.node_under_cursor_is_within_field_name("custom_type"));
+        assert!(ctx.node_under_cursor_is_within_field_name(&["custom_type"]));
     }
 
     #[test]
diff --git a/crates/pgt_treesitter/src/queries/parameters.rs b/crates/pgt_treesitter/src/queries/parameters.rs
@@ -9,7 +9,7 @@ use super::QueryTryFrom;
 static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
     static QUERY_STR: &str = r#"
 [
-  (column_reference) @reference
+  (object_reference) @reference
 
   (parameter) @parameter
 ]
diff --git a/crates/pgt_treesitter/src/queries/relations.rs b/crates/pgt_treesitter/src/queries/relations.rs
@@ -10,29 +10,26 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
     static QUERY_STR: &str = r#"
     (relation
         (object_reference
-            .
-            (any_identifier) @schema_or_table
-            "."?
-            (any_identifier)? @table
-        )+
+object_reference_first: (any_identifier) @first
+object_reference_second: (any_identifier)? @second
+object_reference_third: (any_identifier)? @third
+        )
     )
     (insert
         (object_reference
-            .
-            (any_identifier) @schema_or_table
-            "."?
-            (any_identifier)? @table
-        )+
+object_reference_first: (any_identifier) @first
+object_reference_second: (any_identifier)? @second
+object_reference_third: (any_identifier)? @third
+        )
     )
     (alter_table
         (keyword_alter)
         (keyword_table)
         (object_reference
-            .
-            (any_identifier) @schema_or_table
-            "."?
-            (any_identifier)? @table
-        )+
+object_reference_first: (any_identifier) @first
+object_reference_second: (any_identifier)? @second
+object_reference_third: (any_identifier)? @third
+        )
     )
 "#;
     tree_sitter::Query::new(&pgt_treesitter_grammar::LANGUAGE.into(), QUERY_STR)
diff --git a/crates/pgt_treesitter/src/queries/select_columns.rs b/crates/pgt_treesitter/src/queries/select_columns.rs
@@ -10,9 +10,9 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(|| {
     (select_expression
         (term
             (object_reference
-                first: (any_identifier) @first
-                second: (any_identifier)? @second
-                third: (any_identifier)? @third
+object_reference_first: (any_identifier) @first
+object_reference_second: (any_identifier)? @second
+object_reference_third: (any_identifier)? @third
             )
         )
         ","?
diff --git a/crates/pgt_treesitter/src/queries/table_aliases.rs b/crates/pgt_treesitter/src/queries/table_aliases.rs
diff --git a/crates/pgt_treesitter/src/queries/where_columns.rs b/crates/pgt_treesitter/src/queries/where_columns.rs
diff --git a/crates/pgt_treesitter_grammar/grammar.js b/crates/pgt_treesitter_grammar/grammar.js
diff --git a/crates/pgt_treesitter_grammar/tests/grammar_tests.rs b/crates/pgt_treesitter_grammar/tests/grammar_tests.rs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ use super::QueryTryFrom;`
`9`	`9`	`static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`10`	`10`	`static QUERY_STR: &str = r#"`
`11`	`11`	`[`
`12`		`- (column_reference) @reference`
	`12`	`+ (object_reference) @reference`
`13`	`13`
`14`	`14`	`(parameter) @parameter`
`15`	`15`	`]`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ static TS_QUERY: LazyLock<tree_sitter::Query> = LazyLock::new(\|\| {`
`10`	`10`	`(select_expression`
`11`	`11`	`(term`
`12`	`12`	`(object_reference`
`13`		`- first: (any_identifier) @first`
`14`		`- second: (any_identifier)? @second`
`15`		`- third: (any_identifier)? @third`
	`13`	`+object_reference_first: (any_identifier) @first`
	`14`	`+object_reference_second: (any_identifier)? @second`
	`15`	`+object_reference_third: (any_identifier)? @third`
`16`	`16`	`)`
`17`	`17`	`)`
`18`	`18`	`","?`