chore: ensure auto fixes are applied (#349)

* fix: lint

* chore: check optional changes are applied in ci

* debug

* debug

* fix: check for uncommitted changes only

* fix: make gha linter happy

* Update pull_request.yml

* ...

Author: psteinroe

.github/workflows/pull_request.yml

@@ -100,12 +100,21 @@ jobs:
         uses: biomejs/setup-biome@v2
         with:
           version: latest
+
       - name: Run Lints
         run: |
           cargo sqlx prepare --check --workspace
-          cargo clippy
+          cargo clippy --fix
           cargo run -p rules_check
-          biome lint
+          biome lint --write
+
+      - name: Check for changes
+        run: |
+          if [[ $(git status --porcelain) ]]; then
+            git status
+            git diff
+            exit 1
+          fi
 
   test:
     name: Test

crates/pgt_completions/benches/sanitization.rs

@@ -13,7 +13,7 @@ fn sql_and_pos(sql: &str) -> (String, usize) {
 fn get_tree(sql: &str) -> tree_sitter::Tree {
     let mut parser = tree_sitter::Parser::new();
     parser.set_language(tree_sitter_sql::language()).unwrap();
-    parser.parse(sql.to_string(), None).unwrap()
+    parser.parse(sql, None).unwrap()
 }
 
 fn to_params<'a>(
@@ -25,9 +25,9 @@ fn to_params<'a>(
     let pos: u32 = pos.try_into().unwrap();
     CompletionParams {
         position: TextSize::new(pos),
-        schema: &cache,
+        schema: cache,
         text,
-        tree: tree,
+        tree,
     }
 }
 

crates/pgt_completions/src/providers/columns.rs

@@ -204,8 +204,7 @@ mod tests {
         let has_column_in_first_four = |col: &'static str| {
             first_four
                 .iter()
-                .find(|compl_item| compl_item.label.as_str() == col)
-                .is_some()
+                .any(|compl_item| compl_item.label.as_str() == col)
         };
 
         assert!(

crates/pgt_completions/src/providers/schemas.rs

@@ -7,7 +7,7 @@ pub fn complete_schemas(ctx: &CompletionContext, builder: &mut CompletionBuilder
     let available_schemas = &ctx.schema_cache.schemas;
 
     for schema in available_schemas {
-        let relevance = CompletionRelevanceData::Schema(&schema);
+        let relevance = CompletionRelevanceData::Schema(schema);
 
         let item = CompletionItem {
             label: schema.name.clone(),

crates/pgt_completions/src/sanitization.rs

@@ -12,7 +12,7 @@ pub(crate) struct SanitizedCompletionParams<'a> {
 }
 
 pub fn benchmark_sanitization(params: CompletionParams) -> String {
-    let params: SanitizedCompletionParams = params.try_into().unwrap();
+    let params: SanitizedCompletionParams = params.into();
     params.text
 }
 
@@ -212,7 +212,7 @@ mod tests {
             .set_language(tree_sitter_sql::language())
             .expect("Error loading sql language");
 
-        let mut tree = parser.parse(input.to_string(), None).unwrap();
+        let mut 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)));
@@ -236,7 +236,7 @@ mod tests {
             .set_language(tree_sitter_sql::language())
             .expect("Error loading sql language");
 
-        let mut tree = parser.parse(input.to_string(), None).unwrap();
+        let mut tree = parser.parse(input, None).unwrap();
 
         // select * from| <-- still on previous token
         assert!(!cursor_prepared_to_write_token_after_last_node(
@@ -274,7 +274,7 @@ mod tests {
             .set_language(tree_sitter_sql::language())
             .expect("Error loading sql language");
 
-        let mut tree = parser.parse(input.to_string(), None).unwrap();
+        let mut tree = parser.parse(input, None).unwrap();
 
         // select * from     ;| <-- it's after the statement
         assert!(!cursor_before_semicolon(&mut tree, TextSize::new(19)));

crates/pgt_workspace/src/features/completions.rs

@@ -29,8 +29,8 @@ impl IntoIterator for CompletionsResult {
     }
 }
 
-pub(crate) fn get_statement_for_completions<'a>(
-    doc: &'a ParsedDocument,
+pub(crate) fn get_statement_for_completions(
+    doc: &ParsedDocument,
     position: TextSize,
 ) -> Option<(StatementId, TextRange, String, Arc<tree_sitter::Tree>)> {
     let count = doc.count();
@@ -89,7 +89,7 @@ mod tests {
         (
             ParsedDocument::new(
                 PgTPath::new("test.sql"),
-                sql.replace(CURSOR_POSITION, "").into(),
+                sql.replace(CURSOR_POSITION, ""),
                 5,
             ),
             TextSize::new(pos),
@@ -119,14 +119,11 @@ mod tests {
 
     #[test]
     fn does_not_break_when_no_statements_exist() {
-        let sql = format!("{}", CURSOR_POSITION);
+        let sql = CURSOR_POSITION.to_string();
 
         let (doc, position) = get_doc_and_pos(sql.as_str());
 
-        assert!(matches!(
-            get_statement_for_completions(&doc, position),
-            None
-        ));
+        assert!(get_statement_for_completions(&doc, position).is_none());
     }
 
     #[test]
@@ -138,10 +135,7 @@ mod tests {
         // make sure these are parsed as two
         assert_eq!(doc.count(), 2);
 
-        assert!(matches!(
-            get_statement_for_completions(&doc, position),
-            None
-        ));
+        assert!(get_statement_for_completions(&doc, position).is_none());
     }
 
     #[test]
@@ -174,10 +168,7 @@ mod tests {
 
         let (doc, position) = get_doc_and_pos(sql.as_str());
 
-        assert!(matches!(
-            get_statement_for_completions(&doc, position),
-            None
-        ));
+        assert!(get_statement_for_completions(&doc, position).is_none());
     }
 
     #[test]
@@ -186,9 +177,6 @@ mod tests {
 
         let (doc, position) = get_doc_and_pos(sql.as_str());
 
-        assert!(matches!(
-            get_statement_for_completions(&doc, position),
-            None
-        ));
+        assert!(get_statement_for_completions(&doc, position).is_none());
     }
 }