chore: align ci with local dev (#374)

juleswritescode · web-flow · commit 55deb6456903 · 2025-04-25T13:13:39.000+02:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -33,8 +33,10 @@ jobs:
     steps:
       - name: Checkout PR branch
         uses: actions/checkout@v4
+
       - name: Free Disk Space
         uses: ./.github/actions/free-disk-space
+
       - name: Install toolchain
         uses: moonrepo/setup-rust@v1
         with:
@@ -43,15 +45,23 @@ jobs:
           cache-base: main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-        with:
-          version: latest
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install JS dependencies
+        run: bun install
+
+      - name: Setup Just
+        uses: extractions/setup-just@v3
+
+      - name: Echo Tool Versions
+        run: |
+          just format-ci-versions
+
       - name: Run format
         run: |
-          cargo fmt --all --check
-          taplo format --check
-          biome format
+          just format-ci
 
   actionlint:
     name: Lint GitHub Actions
@@ -96,17 +106,22 @@ jobs:
       - name: Setup sqlx-cli
         run: cargo install sqlx-cli
 
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-        with:
-          version: latest
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install JS dependencies
+        run: bun install
+
+      - name: Setup Just
+        uses: extractions/setup-just@v3
+
+      - name: Echo Tool Versions
+        run: |
+          just lint-ci-versions
 
       - name: Run Lints
         run: |
-          cargo sqlx prepare --check --workspace
-          cargo clippy --fix
-          cargo run -p rules_check
-          biome lint --write
+          just lint-ci
 
       - name: Check for changes
         run: |
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ homepage     = "https://supabase.com/"
 keywords     = ["linter", "typechecker", "postgres", "language-server"]
 license      = "MIT"
 repository   = "https://github.com/supabase-community/postgres-language-server"
-rust-version = "1.85.0"
+rust-version = "1.86.0"
 
 [workspace.dependencies]
 # supporting crates unrelated to postgres
diff --git a/crates/pgt_completions/src/providers/helper.rs b/crates/pgt_completions/src/providers/helper.rs
@@ -7,9 +7,7 @@ pub(crate) fn get_completion_text_with_schema(
     item_name: &str,
     item_schema_name: &str,
 ) -> Option<CompletionText> {
-    if item_schema_name == "public" {
-        None
-    } else if ctx.schema_name.is_some() {
+    if item_schema_name == "public" || ctx.schema_name.is_some() {
         None
     } else {
         let node = ctx.node_under_cursor.unwrap();
diff --git a/crates/pgt_completions/src/sanitization.rs b/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)));
     }
 }
diff --git a/crates/pgt_completions/src/test_helper.rs b/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)
     }
 }
 
diff --git a/crates/pgt_workspace/src/workspace/server/change.rs b/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);
diff --git a/crates/pgt_workspace/src/workspace/server/document.rs b/crates/pgt_workspace/src/workspace/server/document.rs
@@ -43,7 +43,7 @@ impl Document {
             .any(|d| d.severity() == Severity::Fatal)
     }
 
-    pub fn iter<'a>(&'a self) -> StatementIterator<'a> {
+    pub fn iter(&self) -> StatementIterator<'_> {
         StatementIterator::new(self)
     }
 }
diff --git a/crates/pgt_workspace/src/workspace/server/parsed_document.rs b/crates/pgt_workspace/src/workspace/server/parsed_document.rs
@@ -353,7 +353,7 @@ impl<'a> StatementMapper<'a> for GetCompletionsMapper {
 pub struct GetCompletionsFilter {
     pub cursor_position: TextSize,
 }
-impl<'a> StatementFilter<'a> for GetCompletionsFilter {
+impl StatementFilter<'_> for GetCompletionsFilter {
     fn predicate(&self, _id: &StatementId, range: &TextRange, content: &str) -> bool {
         let is_terminated_by_semi = content.chars().last().is_some_and(|c| c == ';');
 
@@ -367,7 +367,7 @@ impl<'a> StatementFilter<'a> for GetCompletionsFilter {
 }
 
 pub struct NoFilter;
-impl<'a> StatementFilter<'a> for NoFilter {
+impl StatementFilter<'_> for NoFilter {
     fn predicate(&self, _id: &StatementId, _range: &TextRange, _content: &str) -> bool {
         true
     }
@@ -383,7 +383,7 @@ impl CursorPositionFilter {
     }
 }
 
-impl<'a> StatementFilter<'a> for CursorPositionFilter {
+impl StatementFilter<'_> for CursorPositionFilter {
     fn predicate(&self, _id: &StatementId, range: &TextRange, _content: &str) -> bool {
         range.contains(self.pos)
     }
@@ -399,7 +399,7 @@ impl IdFilter {
     }
 }
 
-impl<'a> StatementFilter<'a> for IdFilter {
+impl StatementFilter<'_> for IdFilter {
     fn predicate(&self, id: &StatementId, _range: &TextRange, _content: &str) -> bool {
         *id == self.id
     }
diff --git a/justfile b/justfile
@@ -10,16 +10,15 @@ alias rg := reset-git
 # Installs the tools needed to develop
 install-tools:
 	cargo install cargo-binstall
-	cargo binstall cargo-insta taplo-cli
+	cargo binstall cargo-insta taplo-cli sqlx-cli
 	cargo binstall --git "https://github.com/astral-sh/uv" uv
 	bun install
 
 # Upgrades the tools needed to develop
 upgrade-tools:
 	cargo install cargo-binstall --force
-	cargo binstall cargo-insta taplo-cli --force
+	cargo binstall cargo-insta taplo-cli sqlx-cli --force
 	cargo binstall --git "https://github.com/astral-sh/uv" uv --force
-	bun install
 
 # Generates code generated files for the linter
 gen-lint:
@@ -41,6 +40,16 @@ format:
 	taplo format
 	bun biome format --write
 
+format-ci:
+	cargo fmt --all --check
+	taplo format --check
+	bun biome format
+
+format-ci-versions:
+	cargo --version
+	taplo --version
+	echo "Biome $(bun biome --version)"
+
 [unix]
 _touch file:
   touch {{file}}
@@ -72,6 +81,20 @@ lint-fix:
   cargo run -p rules_check
   bun biome lint --write
 
+lint-ci-versions:
+  rustc --version
+  rustup --version
+  cargo --version
+  cargo sqlx --version
+  cargo clippy --version
+  echo "Biome $(bun biome --version)"
+
+lint-ci:
+  cargo sqlx prepare --check --workspace
+  cargo clippy --fix
+  cargo run -p rules_check
+  bun biome lint --write
+
 serve-docs:
     uv sync
     uv run mkdocs serve
@@ -113,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)
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,7 +1,3 @@
 [toolchain]
-# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
-# https://rust-lang.github.io/rustup/concepts/profiles.html
 profile = "default"
-# For some reason, rustfmt is not included in the default profile. Add it here.
-components = ["rustfmt"]
-channel = "nightly"
+channel = "1.86.0"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+use std::fmt::Display;`
	`2`	`+`
`1`	`3`	`use pgt_schema_cache::SchemaCache;`
`2`	`4`	`use pgt_test_utils::test_database::get_new_test_db;`
`3`	`5`	`use sqlx::Executor;`
`@@ -25,9 +27,9 @@ impl From<&str> for InputQuery {`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`
`28`		`-impl ToString for InputQuery {`
`29`		`- fn to_string(&self) -> String {`
`30`		`- self.sql.clone()`
	`30`	`+impl Display for InputQuery {`
	`31`	`+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
	`32`	`+ write!(f, "{}", self.sql)`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ mod tests {`
`1470`	`1470`	`assert_eq!(old_stmt_text, "select * from");`
`1471`	`1471`	`}`
`1472`	`1472`
`1473`		`- _ => assert!(false, "Did not yield a modified statement."),`
	`1473`	`+ _ => unreachable!("Did not yield a modified statement."),`
`1474`	`1474`	`}`
`1475`	`1475`
`1476`	`1476`	`assert_document_integrity(&doc);`
`@@ -1516,7 +1516,7 @@ mod tests {`
`1516`	`1516`	`assert_eq!(old_stmt_text, "select * from");`
`1517`	`1517`	`}`
`1518`	`1518`
`1519`		`- _ => assert!(false, "Did not yield a modified statement."),`
	`1519`	`+ _ => unreachable!("Did not yield a modified statement."),`
`1520`	`1520`	`}`
`1521`	`1521`
`1522`	`1522`	`assert_document_integrity(&doc);`
`@@ -1559,7 +1559,7 @@ mod tests {`
`1559`	`1559`	`assert_eq!(new_stmt_text, "select * from users");`
`1560`	`1560`	`}`
`1561`	`1561`
`1562`		`- _ => assert!(false, "Did not yield a modified statement."),`
	`1562`	`+ _ => unreachable!("Did not yield a modified statement."),`
`1563`	`1563`	`}`
`1564`	`1564`
`1565`	`1565`	`assert_document_integrity(&doc);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl Document {`
`43`	`43`	`.any(\|d\| d.severity() == Severity::Fatal)`
`44`	`44`	`}`
`45`	`45`
`46`		`- pub fn iter<'a>(&'a self) -> StatementIterator<'a> {`
	`46`	`+ pub fn iter(&self) -> StatementIterator<'_> {`
`47`	`47`	`StatementIterator::new(self)`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ impl<'a> StatementMapper<'a> for GetCompletionsMapper {`
`353`	`353`	`pub struct GetCompletionsFilter {`
`354`	`354`	`pub cursor_position: TextSize,`
`355`	`355`	`}`
`356`		`-impl<'a> StatementFilter<'a> for GetCompletionsFilter {`
	`356`	`+impl StatementFilter<'_> for GetCompletionsFilter {`
`357`	`357`	`fn predicate(&self, _id: &StatementId, range: &TextRange, content: &str) -> bool {`
`358`	`358`	`let is_terminated_by_semi = content.chars().last().is_some_and(\|c\| c == ';');`
`359`	`359`
`@@ -367,7 +367,7 @@ impl<'a> StatementFilter<'a> for GetCompletionsFilter {`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`pub struct NoFilter;`
`370`		`-impl<'a> StatementFilter<'a> for NoFilter {`
	`370`	`+impl StatementFilter<'_> for NoFilter {`
`371`	`371`	`fn predicate(&self, _id: &StatementId, _range: &TextRange, _content: &str) -> bool {`
`372`	`372`	`true`
`373`	`373`	`}`
`@@ -383,7 +383,7 @@ impl CursorPositionFilter {`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`
`386`		`-impl<'a> StatementFilter<'a> for CursorPositionFilter {`
	`386`	`+impl StatementFilter<'_> for CursorPositionFilter {`
`387`	`387`	`fn predicate(&self, _id: &StatementId, range: &TextRange, _content: &str) -> bool {`
`388`	`388`	`range.contains(self.pos)`
`389`	`389`	`}`
`@@ -399,7 +399,7 @@ impl IdFilter {`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
`402`		`-impl<'a> StatementFilter<'a> for IdFilter {`
	`402`	`+impl StatementFilter<'_> for IdFilter {`
`403`	`403`	`fn predicate(&self, id: &StatementId, _range: &TextRange, _content: &str) -> bool {`
`404`	`404`	`*id == self.id`
`405`	`405`	`}`