resolve

Author: juleswritescode

.github/workflows/publish.reusable.yml

@@ -16,7 +16,6 @@ jobs:
  runs-on: ubuntu-latest
  permissions:
  contents: write
- # ? what's this?! required for executing the node script?
  id-token: write
  steps:
  - uses: actions/checkout@v4

.github/workflows/pull_request.yml

@@ -102,20 +102,20 @@ jobs:
  version: latest
  - name: Run Lints
  run: |
+ cargo sqlx prepare --check --workspace
  cargo clippy
  cargo run -p rules_check
  biome lint
- cargo sqlx prepare --check --workspace
 
  test:
  name: Test
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
  include:
- # reactive once we upgrade to the latest version of pg_query that is windows-compatible
- - os: windows-latest
- - os: ubuntu-latest
+ # use the same images we use for compiling
+ - os: windows-2022
+ - os: ubuntu-22.04
  steps:
  - name: Checkout PR branch
  uses: actions/checkout@v4
@@ -138,8 +138,10 @@ jobs:
  run: cargo test --workspace
 
  test-js-bindings:
- name: Test JS Bindings
- runs-on: ubuntu-latest
+ name:
+ Test JS Bindings
+ # use the same image we use for compiling
+ runs-on: ubuntu-22.04
  services:
  postgres:
  image: postgres:latest
@@ -173,7 +175,7 @@ jobs:
 
  codegen:
  name: Check Codegen
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
  services:
  postgres:
  image: postgres:latest

.github/workflows/release.yml

@@ -37,12 +37,12 @@ jobs:
  strategy:
  matrix:
  config:
- - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu }
- - { os: ubuntu-latest, target: aarch64-unknown-linux-gnu }
- - { os: macos-latest, target: x86_64-apple-darwin }
- - { os: macos-latest, target: aarch64-apple-darwin }
- - { os: windows-latest, target: x86_64-pc-windows-msvc }
- - { os: windows-latest, target: aarch64-pc-windows-msvc }
+ - { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu }
+ - { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu }
+ - { os: macos-14, target: x86_64-apple-darwin }
+ - { os: macos-14, target: aarch64-apple-darwin }
+ - { os: windows-2022, target: x86_64-pc-windows-msvc }
+ - { os: windows-2022, target: aarch64-pc-windows-msvc }
 
  runs-on: ${{ matrix.config.os }}
 
@@ -87,12 +87,12 @@ jobs:
 
  # windows is a special snowflake too, it saves binaries as .exe
  - name: 👦 Name the Binary
- if: matrix.config.os == 'windows-latest'
+ if: matrix.config.os == 'windows-2022'
  run: |
  mkdir dist
  cp target/${{ matrix.config.target }}/release/postgrestools.exe ./dist/postgrestools_${{ matrix.config.target }}
  - name: 👦 Name the Binary
- if: matrix.config.os != 'windows-latest'
+ if: matrix.config.os != 'windows-2022'
  run: |
  mkdir dist
  cp target/${{ matrix.config.target }}/release/postgrestools ./dist/postgrestools_${{ matrix.config.target }}

Cargo.lock

@@ -46,7 +46,6 @@ syn = "1.0.109"
 termcolor = "1.4.1"
 test-log = "0.2.17"
 tokio = { version = "1.40.0", features = ["full"] }
-tower-lsp = "0.20.0"
 tracing = { version = "0.1.40", default-features = false, features = ["std"] }
 tracing-bunyan-formatter = { version = "0.3.10 " }
 tracing-subscriber = "0.3.18"
@@ -57,7 +56,6 @@ unicode-width = "0.1.12"
 # postgres specific crates
 pgt_analyse = { path = "./crates/pgt_analyse", version = "0.0.0" }
 pgt_analyser = { path = "./crates/pgt_analyser", version = "0.0.0" }
-pgt_base_db = { path = "./crates/pgt_base_db", version = "0.0.0" }
 pgt_cli = { path = "./crates/pgt_cli", version = "0.0.0" }
 pgt_completions = { path = "./crates/pgt_completions", version = "0.0.0" }
 pgt_configuration = { path = "./crates/pgt_configuration", version = "0.0.0" }
@@ -69,9 +67,7 @@ pgt_flags = { path = "./crates/pgt_flags", version = "0.0.0" }
 pgt_fs = { path = "./crates/pgt_fs", version = "0.0.0" }
 pgt_lexer = { path = "./crates/pgt_lexer", version = "0.0.0" }
 pgt_lexer_codegen = { path = "./crates/pgt_lexer_codegen", version = "0.0.0" }
-pgt_lint = { path = "./crates/pgt_lint", version = "0.0.0" }
 pgt_lsp = { path = "./crates/pgt_lsp", version = "0.0.0" }
-pgt_lsp_converters = { path = "./crates/pgt_lsp_converters", version = "0.0.0" }
 pgt_markup = { path = "./crates/pgt_markup", version = "0.0.0" }
 pgt_query_ext = { path = "./crates/pgt_query_ext", version = "0.0.0" }
 pgt_query_ext_codegen = { path = "./crates/pgt_query_ext_codegen", version = "0.0.0" }
@@ -81,14 +77,11 @@ pgt_statement_splitter = { path = "./crates/pgt_statement_splitter", version
 pgt_text_edit = { path = "./crates/pgt_text_edit", version = "0.0.0" }
 pgt_text_size = { path = "./crates/pgt_text_size", version = "0.0.0" }
 pgt_treesitter_queries = { path = "./crates/pgt_treesitter_queries", version = "0.0.0" }
-pgt_type_resolver = { path = "./crates/pgt_type_resolver", version = "0.0.0" }
 pgt_typecheck = { path = "./crates/pgt_typecheck", version = "0.0.0" }
 pgt_workspace = { path = "./crates/pgt_workspace", version = "0.0.0" }
 
 pgt_test_macros = { path = "./crates/pgt_test_macros" }
 pgt_test_utils = { path = "./crates/pgt_test_utils" }
 
-docs_codegen = { path = "./docs/codegen", version = "0.0.0" }
-
 [profile.dev.package]
 insta.opt-level = 3

Cargo.toml

@@ -15,7 +15,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,
 }
 
 #[tracing::instrument(level = "debug", skip_all, fields(

crates/pgt_completions/src/complete.rs

@@ -23,14 +23,9 @@ where
  type Error = String;
 
  fn try_from(params: CompletionParams<'larger>) -> Result<Self, Self::Error> {
- let tree = match &params.tree {
- Some(tree) => tree,
- None => return Err("Tree required for autocompletions.".to_string()),
- };
-
- if cursor_inbetween_nodes(tree, params.position)
- || cursor_prepared_to_write_token_after_last_node(tree, params.position)
- || cursor_before_semicolon(tree, params.position)
+ if cursor_inbetween_nodes(params.tree, params.position)
+ || cursor_prepared_to_write_token_after_last_node(params.tree, params.position)
+ || cursor_before_semicolon(params.tree, params.position)
  {
  Ok(SanitizedCompletionParams::with_adjusted_sql(params))
  } else {
@@ -75,7 +70,7 @@ where
  position: params.position,
  text: params.text.clone(),
  schema: params.schema,
- tree: Cow::Borrowed(params.tree.unwrap()),
+ tree: Cow::Borrowed(params.tree),
  }
  }
 

crates/pgt_completions/src/sanitization.rs

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

crates/pgt_completions/src/test_helper.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_lsp/src/handlers/code_actions.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() {