refactor: parser (#322)

Author: psteinroe

crates/pgt_completions/src/complete.rs

@@ -14,7 +14,7 @@ pub struct CompletionParams<'a> {
     pub position: TextSize,
     pub schema: &'a pgt_schema_cache::SchemaCache,
     pub text: String,
-    pub tree: Option<&'a tree_sitter::Tree>,
+    pub tree: &'a tree_sitter::Tree,
 }
 
 pub fn complete(params: CompletionParams) -> Vec<CompletionItem> {

crates/pgt_completions/src/context.rs

@@ -50,7 +50,7 @@ impl TryFrom<String> for ClauseType {
 
 pub(crate) struct CompletionContext<'a> {
     pub ts_node: Option<tree_sitter::Node<'a>>,
-    pub tree: Option<&'a tree_sitter::Tree>,
+    pub tree: &'a tree_sitter::Tree,
     pub text: &'a str,
     pub schema_cache: &'a SchemaCache,
     pub position: usize,
@@ -85,10 +85,7 @@ impl<'a> CompletionContext<'a> {
     }
 
     fn gather_info_from_ts_queries(&mut self) {
-        let tree = match self.tree.as_ref() {
-            None => return,
-            Some(t) => t,
-        };
+        let tree = self.tree;
 
         let stmt_range = self.wrapping_statement_range.as_ref();
         let sql = self.text;
@@ -126,11 +123,7 @@ impl<'a> CompletionContext<'a> {
     }
 
     fn gather_tree_context(&mut self) {
-        if self.tree.is_none() {
-            return;
-        }
-
-        let mut cursor = self.tree.as_ref().unwrap().root_node().walk();
+        let mut cursor = self.tree.root_node().walk();
 
         /*
          * The head node of any treesitter tree is always the "PROGRAM" node.
@@ -262,7 +255,7 @@ mod tests {
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
                 text,
-                tree: Some(&tree),
+                tree: &tree,
                 schema: &pgt_schema_cache::SchemaCache::default(),
             };
 
@@ -294,7 +287,7 @@ mod tests {
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
                 text,
-                tree: Some(&tree),
+                tree: &tree,
                 schema: &pgt_schema_cache::SchemaCache::default(),
             };
 
@@ -328,7 +321,7 @@ mod tests {
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
                 text,
-                tree: Some(&tree),
+                tree: &tree,
                 schema: &pgt_schema_cache::SchemaCache::default(),
             };
 
@@ -353,7 +346,7 @@ mod tests {
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
                 text,
-                tree: Some(&tree),
+                tree: &tree,
                 schema: &pgt_schema_cache::SchemaCache::default(),
             };
 
@@ -381,7 +374,7 @@ mod tests {
         let params = crate::CompletionParams {
             position: (position as u32).into(),
             text,
-            tree: Some(&tree),
+            tree: &tree,
             schema: &pgt_schema_cache::SchemaCache::default(),
         };
 
@@ -407,7 +400,7 @@ mod tests {
         let params = crate::CompletionParams {
             position: (position as u32).into(),
             text,
-            tree: Some(&tree),
+            tree: &tree,
             schema: &pgt_schema_cache::SchemaCache::default(),
         };
 
@@ -432,7 +425,7 @@ mod tests {
         let params = crate::CompletionParams {
             position: (position as u32).into(),
             text,
-            tree: Some(&tree),
+            tree: &tree,
             schema: &pgt_schema_cache::SchemaCache::default(),
         };
 

crates/pgt_completions/src/test_helper.rs

@@ -70,7 +70,7 @@ pub(crate) fn get_test_params<'a>(
     CompletionParams {
         position: (position as u32).into(),
         schema: schema_cache,
-        tree: Some(tree),
+        tree,
         text,
     }
 }

crates/pgt_lsp/src/handlers/code_actions.rs

@@ -43,7 +43,7 @@ pub fn get_actions(
                                 title: title.clone(),
                                 command: command_id,
                                 arguments: Some(vec![
-                                    serde_json::Value::Number(stmt_id.into()),
+                                    serde_json::to_value(&stmt_id).unwrap(),
                                     serde_json::to_value(&url).unwrap(),
                                 ]),
                             }
@@ -81,17 +81,16 @@ pub async fn execute_command(
 
     match command.as_str() {
         "pgt.executeStatement" => {
-            let id: usize = serde_json::from_value(params.arguments[0].clone())?;
+            let statement_id = serde_json::from_value::<pgt_workspace::workspace::StatementId>(
+                params.arguments[0].clone(),
+            )?;
             let doc_url: lsp_types::Url = serde_json::from_value(params.arguments[1].clone())?;
 
             let path = session.file_path(&doc_url)?;
 
             let result = session
                 .workspace
-                .execute_statement(ExecuteStatementParams {
-                    statement_id: id,
-                    path,
-                })?;
+                .execute_statement(ExecuteStatementParams { statement_id, path })?;
 
             /*
              * Updating all diagnostics: the changes caused by the statement execution

crates/pgt_typecheck/src/diagnostics.rs

@@ -96,24 +96,22 @@ impl Advices for TypecheckAdvices {
 
 pub(crate) fn create_type_error(
     pg_err: &PgDatabaseError,
-    ts: Option<&tree_sitter::Tree>,
+    ts: &tree_sitter::Tree,
 ) -> TypecheckDiagnostic {
     let position = pg_err.position().and_then(|pos| match pos {
         sqlx::postgres::PgErrorPosition::Original(pos) => Some(pos - 1),
         _ => None,
     });
 
     let range = position.and_then(|pos| {
-        ts.and_then(|tree| {
-            tree.root_node()
-                .named_descendant_for_byte_range(pos, pos)
-                .map(|node| {
-                    TextRange::new(
-                        node.start_byte().try_into().unwrap(),
-                        node.end_byte().try_into().unwrap(),
-                    )
-                })
-        })
+        ts.root_node()
+            .named_descendant_for_byte_range(pos, pos)
+            .map(|node| {
+                TextRange::new(
+                    node.start_byte().try_into().unwrap(),
+                    node.end_byte().try_into().unwrap(),
+                )
+            })
     });
 
     let severity = match pg_err.severity() {

crates/pgt_typecheck/src/lib.rs

@@ -13,7 +13,7 @@ pub struct TypecheckParams<'a> {
     pub conn: &'a PgPool,
     pub sql: &'a str,
     pub ast: &'a pgt_query_ext::NodeEnum,
-    pub tree: Option<&'a tree_sitter::Tree>,
+    pub tree: &'a tree_sitter::Tree,
 }
 
 #[derive(Debug, Clone)]

crates/pgt_typecheck/tests/diagnostics.rs

@@ -21,14 +21,14 @@ async fn test(name: &str, query: &str, setup: &str) {
         .expect("Error loading sql language");
 
     let root = pgt_query_ext::parse(query).unwrap();
-    let tree = parser.parse(query, None);
+    let tree = parser.parse(query, None).unwrap();
 
     let conn = &test_db;
     let result = check_sql(TypecheckParams {
         conn,
         sql: query,
         ast: &root,
-        tree: tree.as_ref(),
+        tree: &tree,
     })
     .await;
 

crates/pgt_workspace/src/workspace.rs

@@ -21,7 +21,7 @@ use crate::{
 mod client;
 mod server;
 
-pub(crate) use server::StatementId;
+pub use server::StatementId;
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]