squawk-cli 2.46.0__tar.gz → 2.47.0__tar.gz

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/Cargo.lock

@@ -2385,7 +2385,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-fmt"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "insta",
  "itertools",
@@ -2425,7 +2425,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-github"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -2436,7 +2436,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "annotate-snippets",
  "etcetera",
@@ -2458,14 +2458,14 @@ dependencies = [
 
 [[package]]
 name = "squawk-lexer"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "annotate-snippets",
  "enum-iterator",
@@ -2480,7 +2480,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2493,7 +2493,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -2519,7 +2519,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2532,7 +2532,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-thread"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2544,7 +2544,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3420,7 +3420,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.46.0"
+version = "2.47.0"
 dependencies = [
  "anyhow",
  "camino",

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.46.0"
+version = "2.47.0"
 edition = "2024"
 rust-version = "1.94"
 authors = ["Squawk Team & Contributors"]
@@ -72,14 +72,14 @@ rustc-hash = "2.1.1"
 
 # local
 # we have to make the versions explicit otherwise `cargo publish` won't work
-squawk-github = { path = "./crates/squawk_github", version = "2.46.0" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.46.0" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.46.0" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.46.0" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.46.0" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.46.0" }
-squawk-server = { path = "./crates/squawk_server", version = "2.46.0" }
-squawk-thread = { path = "./crates/squawk_thread", version = "2.46.0" }
+squawk-github = { path = "./crates/squawk_github", version = "2.47.0" }
+squawk-ide = { path = "./crates/squawk_ide", version = "2.47.0" }
+squawk-lexer = { path = "./crates/squawk_lexer", version = "2.47.0" }
+squawk-parser = { path = "./crates/squawk_parser", version = "2.47.0" }
+squawk-syntax = { path = "./crates/squawk_syntax", version = "2.47.0" }
+squawk-linter = { path = "./crates/squawk_linter", version = "2.47.0" }
+squawk-server = { path = "./crates/squawk_server", version = "2.47.0" }
+squawk-thread = { path = "./crates/squawk_thread", version = "2.47.0" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 2.46.0
+Version: 2.47.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/crates/squawk/README.md

@@ -252,7 +252,7 @@ to your project's `.pre-commit-config.yaml`:
 ```yaml
 repos:
   - repo: https://github.com/sbdchd/squawk
-    rev: 2.46.0
+    rev: 2.47.0
     hooks:
       - id: squawk
         files: path/to/postgres/migrations/written/in/sql

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/crates/squawk_github/src/app.rs

@@ -11,7 +11,7 @@ use serde_json::Value;
 use std::time::Duration;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.46.0";
+pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.47.0";
 
 #[derive(Debug, Serialize)]
 struct CommentBody {

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/crates/squawk_ide/src/goto_definition.rs

@@ -908,6 +908,74 @@ select current_timestamp$0;
         ");
     }
 
+    #[test]
+    fn goto_current_user() {
+        assert_snapshot!(goto("
+create function pg_catalog.current_user() returns name
+  language internal;
+select current_user$0;
+"), @"
+          ╭▸ 
+        2 │ create function pg_catalog.current_user() returns name
+          │                            ──────────── 2. destination
+        3 │   language internal;
+        4 │ select current_user;
+          ╰╴                  ─ 1. source
+        "
+        );
+    }
+
+    #[test]
+    fn goto_user_keyword() {
+        assert_snapshot!(goto("
+create function pg_catalog.current_user() returns name
+  language internal;
+select user$0;
+"), @"
+          ╭▸ 
+        2 │ create function pg_catalog.current_user() returns name
+          │                            ──────────── 2. destination
+        3 │   language internal;
+        4 │ select user;
+          ╰╴          ─ 1. source
+        "
+        );
+    }
+
+    #[test]
+    fn goto_session_user() {
+        assert_snapshot!(goto("
+create function pg_catalog.session_user() returns name
+  language internal;
+select session_user$0;
+"), @"
+          ╭▸ 
+        2 │ create function pg_catalog.session_user() returns name
+          │                            ──────────── 2. destination
+        3 │   language internal;
+        4 │ select session_user;
+          ╰╴                  ─ 1. source
+        "
+        );
+    }
+
+    #[test]
+    fn goto_current_schema() {
+        assert_snapshot!(goto("
+create function current_schema() returns name
+  language internal;
+select current_schema$0;
+"), @"
+          ╭▸ 
+        2 │ create function current_schema() returns name
+          │                 ────────────── 2. destination
+        3 │   language internal;
+        4 │ select current_schema;
+          ╰╴                    ─ 1. source
+        "
+        );
+    }
+
     #[test]
     fn goto_current_timestamp_cte_column() {
         assert_snapshot!(goto("

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/crates/squawk_ide/src/lib.rs

@@ -18,6 +18,7 @@ mod offsets;
 mod quote;
 mod resolve;
 mod scope;
+pub mod semantic_tokens;
 mod symbols;
 #[cfg(test)]
 pub mod test_utils;

{squawk_cli-2.46.0 → squawk_cli-2.47.0}/crates/squawk_ide/src/resolve.rs

@@ -500,7 +500,7 @@ pub(crate) fn resolve_name_ref_ptrs(
                 .map(|ptr| smallvec![ptr])
         }
     }
-    .or_else(|| resolve_current_timestamp_as_now(binder, name_ref))
+    .or_else(|| resolve_special_keyword_as_function(binder, name_ref))
 }
 
 fn resolve_table_name_ptr(
@@ -725,22 +725,24 @@ fn resolve_for_kind_with_params(
     binder.lookup_with_params(name, kind, position, schema, params)
 }
 
-/// `current_timestamp` is equivalent to `now()`
-fn resolve_current_timestamp_as_now(
+// some keywords behave as functions
+fn resolve_special_keyword_as_function(
     binder: &Binder,
     name_ref: &ast::NameRef,
 ) -> Option<SmallVec<[SyntaxNodePtr; 1]>> {
-    if name_ref
+    let function_name = name_ref
         .syntax()
         .first_child_or_token()
-        .is_some_and(|t| t.kind() == SyntaxKind::CURRENT_TIMESTAMP_KW)
-    {
-        let now_name = Name::from_string("now");
-        let position = name_ref.syntax().text_range().start();
-        return resolve_function(binder, &now_name, &None, None, position)
-            .map(|ptr| smallvec![ptr]);
-    }
-    None
+        .and_then(|t| match t.kind() {
+            SyntaxKind::CURRENT_SCHEMA_KW => Some("current_schema"),
+            SyntaxKind::CURRENT_TIMESTAMP_KW => Some("now"),
+            SyntaxKind::CURRENT_USER_KW | SyntaxKind::USER_KW => Some("current_user"),
+            SyntaxKind::SESSION_USER_KW => Some("session_user"),
+            _ => None,
+        })?;
+    let function_name = Name::from_string(function_name);
+    let position = name_ref.syntax().text_range().start();
+    resolve_function(binder, &function_name, &None, None, position).map(|ptr| smallvec![ptr])
 }
 
 fn resolve_function(