Merge branch 'main' of https://github.com/supabase-community/postgres_lsp into compl/delete-update

Author: juleswritescode

crates/pgt_completions/src/sanitization.rs

@@ -219,19 +219,19 @@ mod tests {
             .set_language(tree_sitter_sql::language())
             .expect("Error loading sql language");
 
-        let mut tree = parser.parse(input, None).unwrap();
+        let tree = parser.parse(input, None).unwrap();
 
         // select | from users; <-- just right, one space after select token, one space before from
-        assert!(cursor_inbetween_nodes(&mut tree, TextSize::new(7)));
+        assert!(cursor_inbetween_nodes(&tree, TextSize::new(7)));
 
         // select|  from users; <-- still on select token
-        assert!(!cursor_inbetween_nodes(&mut tree, TextSize::new(6)));
+        assert!(!cursor_inbetween_nodes(&tree, TextSize::new(6)));
 
         // select  |from users; <-- already on from token
-        assert!(!cursor_inbetween_nodes(&mut tree, TextSize::new(8)));
+        assert!(!cursor_inbetween_nodes(&tree, TextSize::new(8)));
 
         // select from users;|
-        assert!(!cursor_inbetween_nodes(&mut tree, TextSize::new(19)));
+        assert!(!cursor_inbetween_nodes(&tree, TextSize::new(19)));
     }
 
     #[test]
@@ -243,29 +243,29 @@ mod tests {
             .set_language(tree_sitter_sql::language())
             .expect("Error loading sql language");
 
-        let mut tree = parser.parse(input, None).unwrap();
+        let tree = parser.parse(input, None).unwrap();
 
         // select * from| <-- still on previous token
         assert!(!cursor_prepared_to_write_token_after_last_node(
-            &mut tree,
+            &tree,
             TextSize::new(13)
         ));
 
         // select * from  | <-- too far off, two spaces afterward
         assert!(!cursor_prepared_to_write_token_after_last_node(
-            &mut tree,
+            &tree,
             TextSize::new(15)
         ));
 
         // select * |from  <-- it's within
         assert!(!cursor_prepared_to_write_token_after_last_node(
-            &mut tree,
+            &tree,
             TextSize::new(9)
         ));
 
         // select * from | <-- just right
         assert!(cursor_prepared_to_write_token_after_last_node(
-            &mut tree,
+            &tree,
             TextSize::new(14)
         ));
     }
@@ -295,26 +295,26 @@ mod tests {
             .set_language(tree_sitter_sql::language())
             .expect("Error loading sql language");
 
-        let mut tree = parser.parse(input, None).unwrap();
+        let tree = parser.parse(input, None).unwrap();
 
         // select * from     ;| <-- it's after the statement
-        assert!(!cursor_before_semicolon(&mut tree, TextSize::new(19)));
+        assert!(!cursor_before_semicolon(&tree, TextSize::new(19)));
 
         // select * from|    ; <-- still touches the from
-        assert!(!cursor_before_semicolon(&mut tree, TextSize::new(13)));
+        assert!(!cursor_before_semicolon(&tree, TextSize::new(13)));
 
         // not okay to be ON the semi.
         // select * from     |;
-        assert!(!cursor_before_semicolon(&mut tree, TextSize::new(18)));
+        assert!(!cursor_before_semicolon(&tree, TextSize::new(18)));
 
         // anything is fine here
         // select * from |   ;
         // select * from  |  ;
         // select * from   | ;
         // select * from    |;
-        assert!(cursor_before_semicolon(&mut tree, TextSize::new(14)));
-        assert!(cursor_before_semicolon(&mut tree, TextSize::new(15)));
-        assert!(cursor_before_semicolon(&mut tree, TextSize::new(16)));
-        assert!(cursor_before_semicolon(&mut tree, TextSize::new(17)));
+        assert!(cursor_before_semicolon(&tree, TextSize::new(14)));
+        assert!(cursor_before_semicolon(&tree, TextSize::new(15)));
+        assert!(cursor_before_semicolon(&tree, TextSize::new(16)));
+        assert!(cursor_before_semicolon(&tree, TextSize::new(17)));
     }
 }

crates/pgt_completions/src/test_helper.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use pgt_schema_cache::SchemaCache;
 use pgt_test_utils::test_database::get_new_test_db;
 use sqlx::Executor;
@@ -25,9 +27,9 @@ impl From<&str> for InputQuery {
     }
 }
 
-impl ToString for InputQuery {
-    fn to_string(&self) -> String {
-        self.sql.clone()
+impl Display for InputQuery {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.sql)
     }
 }
 

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

@@ -1470,7 +1470,7 @@ mod tests {
                 assert_eq!(old_stmt_text, "select * from");
             }
 
-            _ => assert!(false, "Did not yield a modified statement."),
+            _ => unreachable!("Did not yield a modified statement."),
         }
 
         assert_document_integrity(&doc);
@@ -1516,7 +1516,7 @@ mod tests {
                 assert_eq!(old_stmt_text, "select * from");
             }
 
-            _ => assert!(false, "Did not yield a modified statement."),
+            _ => unreachable!("Did not yield a modified statement."),
         }
 
         assert_document_integrity(&doc);
@@ -1559,7 +1559,7 @@ mod tests {
                 assert_eq!(new_stmt_text, "select * from users");
             }
 
-            _ => assert!(false, "Did not yield a modified statement."),
+            _ => unreachable!("Did not yield a modified statement."),
         }
 
         assert_document_integrity(&doc);

justfile

@@ -136,4 +136,4 @@ merge-main:
 # We recommend to install `bunyan` (npm i -g bunyan) and pipe the output through there for color-coding:
 # just show-logs | bunyan
 show-logs:
-    tail -f $(ls $PGT_LOG_PATH/server.log.* | sort -t- -k2,2 -k3,3 -k4,4 | tail -n 1)
+    tail -f $(ls $PGT_LOG_PATH/server.log.* | sort -t- -k2,2 -k3,3 -k4,4 | tail -n 1)