fixed conflicts

juleswritescode · juleswritescode · commit dbc3c7d9b5e4 · 2025-08-14T13:12:55.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/pgt_hover/Cargo.toml b/crates/pgt_hover/Cargo.toml
@@ -13,7 +13,7 @@ version              = "0.0.0"
 
 [dependencies]
 humansize                  = { version = "2.1.3" }
-pgt_query_ext.workspace    = true
+pgt_query.workspace        = true
 pgt_schema_cache.workspace = true
 pgt_text_size.workspace    = true
 pgt_treesitter.workspace   = true
diff --git a/crates/pgt_hover/src/lib.rs b/crates/pgt_hover/src/lib.rs
@@ -10,7 +10,7 @@ pub struct OnHoverParams<'a> {
     pub position: TextSize,
     pub schema_cache: &'a SchemaCache,
     pub stmt_sql: &'a str,
-    pub ast: Option<&'a pgt_query_ext::NodeEnum>,
+    pub ast: Option<&'a pgt_query::NodeEnum>,
     pub ts_tree: &'a tree_sitter::Tree,
 }
 
diff --git a/crates/pgt_treesitter/Cargo.toml b/crates/pgt_treesitter/Cargo.toml
@@ -11,7 +11,6 @@ repository.workspace = true
 version              = "0.0.0"
 
 [lib]
-proc-macro = true
 doctest = false
 
 [dependencies]
diff --git a/crates/pgt_workspace/src/workspace/server/document.rs b/crates/pgt_workspace/src/workspace/server/document.rs
@@ -279,7 +279,7 @@ impl<'a> StatementMapper<'a> for WithCSTandASTMapper {
         StatementId,
         TextRange,
         Arc<tree_sitter::Tree>,
-        Option<pgt_query_ext::NodeEnum>,
+        Option<pgt_query::NodeEnum>,
     );
 
     fn map(&self, parser: &'a Document, id: StatementId, range: TextRange) -> Self::Output {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ pub struct OnHoverParams<'a> {`
`10`	`10`	`pub position: TextSize,`
`11`	`11`	`pub schema_cache: &'a SchemaCache,`
`12`	`12`	`pub stmt_sql: &'a str,`
`13`		`- pub ast: Option<&'a pgt_query_ext::NodeEnum>,`
	`13`	`+ pub ast: Option<&'a pgt_query::NodeEnum>,`
`14`	`14`	`pub ts_tree: &'a tree_sitter::Tree,`
`15`	`15`	`}`
`16`	`16`