squawk-cli 2.16.0__tar.gz → 2.18.0__tar.gz

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/Cargo.lock

@@ -488,6 +488,15 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils 0.8.21",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.4"
@@ -495,7 +504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
 dependencies = [
  "crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
@@ -507,7 +516,7 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg 1.1.0",
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
  "memoffset",
@@ -521,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
@@ -536,6 +545,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "dir-test"
 version = "0.4.1"
@@ -1455,6 +1470,32 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
+[[package]]
+name = "lsp-server"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9462c4dc73e17f971ec1f171d44bfffb72e65a130117233388a0ebc7ec5656f9"
+dependencies = [
+ "crossbeam-channel",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
+[[package]]
+name = "lsp-types"
+version = "0.95.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365"
+dependencies = [
+ "bitflags 1.3.2",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "url 2.5.4",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -2417,11 +2458,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.82"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa 1.0.2",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -2435,6 +2477,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.5.5"
@@ -2543,7 +2596,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "squawk"
-version = "2.16.0"
+version = "2.18.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2555,12 +2608,15 @@ dependencies = [
  "insta",
  "line-index",
  "log",
+ "lsp-server",
+ "lsp-types",
  "serde",
  "serde_json",
  "simplelog",
  "squawk_github",
  "squawk_lexer",
  "squawk_linter",
+ "squawk_server",
  "squawk_syntax",
  "structopt",
  "tempfile",
@@ -2612,6 +2668,23 @@ dependencies = [
  "xshell",
 ]
 
+[[package]]
+name = "squawk_server"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "line-index",
+ "log",
+ "lsp-server",
+ "lsp-types",
+ "serde",
+ "serde_json",
+ "simplelog",
+ "squawk_lexer",
+ "squawk_linter",
+ "squawk_syntax",
+]
+
 [[package]]
 name = "squawk_syntax"
 version = "0.0.0"
@@ -2966,7 +3039,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
 ]
 
@@ -2997,7 +3070,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
  "lazy_static",
  "log",
@@ -3052,7 +3125,7 @@ checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-queue",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
  "lazy_static",
  "log",
@@ -3067,7 +3140,7 @@ version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
  "slab",
  "tokio-executor",
@@ -3248,6 +3321,7 @@ dependencies = [
  "form_urlencoded",
  "idna 1.0.3",
  "percent-encoding 2.3.1",
+ "serde",
 ]
 
 [[package]]

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/Cargo.toml

@@ -36,6 +36,8 @@ rowan = "0.15.15"
 smol_str = "0.3.2"
 enum-iterator = "2.1.0"
 line-index = "0.1.2"
+lsp-server = "0.7.8"
+lsp-types = "0.95"
 serde-wasm-bindgen = "0.6.5"
 wasm-bindgen = "0.2.100"
 wasm-bindgen-test = "0.3.34"
@@ -57,6 +59,7 @@ squawk_lexer = { version = "0.0.0", path = "./crates/squawk_lexer" }
 squawk_parser = { version = "0.0.0", path = "./crates/squawk_parser" }
 squawk_syntax = { version = "0.0.0", path = "./crates/squawk_syntax" }
 squawk_linter = { version = "0.0.0", path = "./crates/squawk_linter" }
+squawk_server = { version = "0.0.0", path = "./crates/squawk_server" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 2.16.0
+Version: 2.18.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS
@@ -56,6 +56,10 @@ Use the WASM powered playground to check your SQL locally in the browser!
 
 <https://play.squawkhq.com>
 
+### Or via VSCode
+
+<https://marketplace.visualstudio.com/items?itemName=sbdchd.squawk>
+
 ## Usage
 
 ```shell

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/crates/squawk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "squawk"
-version = "2.16.0"
+version = "2.18.0"
 default-run = "squawk"
 
 authors.workspace = true
@@ -30,11 +30,14 @@ squawk_syntax.workspace = true
 squawk_linter.workspace = true
 squawk_lexer.workspace = true
 squawk_github.workspace = true
+squawk_server.workspace = true
 toml.workspace = true
 glob.workspace = true
 anyhow.workspace = true
 annotate-snippets.workspace = true
 line-index.workspace = true
+lsp-server.workspace = true
+lsp-types.workspace = true
 
 [dev-dependencies]
 insta.workspace = true

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/crates/squawk/README.md

@@ -36,6 +36,10 @@ Use the WASM powered playground to check your SQL locally in the browser!
 
 <https://play.squawkhq.com>
 
+### Or via VSCode
+
+<https://marketplace.visualstudio.com/items?itemName=sbdchd.squawk>
+
 ## Usage
 
 ```shell

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/crates/squawk/src/github.rs

@@ -1,4 +1,4 @@
-use crate::Command;
+use crate::UploadToGithubArgs;
 use crate::config::Config;
 use crate::reporter::{CheckReport, fmt_tty_violation};
 use crate::{file_finding::find_paths, reporter::check_files};
@@ -69,7 +69,7 @@ fn create_gh_app(
 const COMMENT_HEADER: &str = "# Squawk Report";
 
 pub fn check_and_comment_on_pr(
-    cmd: Command,
+    args: UploadToGithubArgs,
     cfg: &Config,
     is_stdin: bool,
     stdin_path: Option<String>,
@@ -78,7 +78,7 @@ pub fn check_and_comment_on_pr(
     pg_version: Option<Version>,
     assume_in_transaction: bool,
 ) -> Result<()> {
-    let Command::UploadToGithub {
+    let UploadToGithubArgs {
         paths,
         fail_on_violations,
         github_private_key,
@@ -89,7 +89,7 @@ pub fn check_and_comment_on_pr(
         github_repo_name,
         github_pr_number,
         github_private_key_base64,
-    } = cmd;
+    } = args;
 
     let fail_on_violations =
         if let Some(fail_on_violations_cfg) = cfg.upload_to_github.fail_on_violations {

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/crates/squawk/src/main.rs

@@ -21,40 +21,45 @@ use std::path::PathBuf;
 use std::process::{self, ExitCode};
 use structopt::StructOpt;
 
+#[derive(StructOpt, Debug)]
+pub struct UploadToGithubArgs {
+    /// Paths to search
+    paths: Vec<String>,
+    /// Exits with an error if violations are found
+    #[structopt(long)]
+    fail_on_violations: bool,
+    #[structopt(long, env = "SQUAWK_GITHUB_PRIVATE_KEY")]
+    github_private_key: Option<String>,
+    #[structopt(long, env = "SQUAWK_GITHUB_PRIVATE_KEY_BASE64")]
+    github_private_key_base64: Option<String>,
+    #[structopt(long, env = "SQUAWK_GITHUB_TOKEN")]
+    github_token: Option<String>,
+    /// GitHub App Id.
+    #[structopt(long, env = "SQUAWK_GITHUB_APP_ID")]
+    github_app_id: Option<i64>,
+    /// GitHub Install Id. The installation that squawk is acting on.
+    #[structopt(long, env = "SQUAWK_GITHUB_INSTALL_ID")]
+    github_install_id: Option<i64>,
+    /// GitHub Repo Owner
+    /// github.com/sbdchd/squawk, sbdchd is the owner
+    #[structopt(long, env = "SQUAWK_GITHUB_REPO_OWNER")]
+    github_repo_owner: String,
+    /// GitHub Repo Name
+    /// github.com/sbdchd/squawk, squawk is the name
+    #[structopt(long, env = "SQUAWK_GITHUB_REPO_NAME")]
+    github_repo_name: String,
+    /// GitHub Pull Request Number
+    /// github.com/sbdchd/squawk/pull/10, 10 is the PR number
+    #[structopt(long, env = "SQUAWK_GITHUB_PR_NUMBER")]
+    github_pr_number: i64,
+}
+
 #[derive(StructOpt, Debug)]
 pub enum Command {
+    /// Run the language server
+    Server,
     /// Comment on a PR with Squawk's results.
-    UploadToGithub {
-        /// Paths to search
-        paths: Vec<String>,
-        /// Exits with an error if violations are found
-        #[structopt(long)]
-        fail_on_violations: bool,
-        #[structopt(long, env = "SQUAWK_GITHUB_PRIVATE_KEY")]
-        github_private_key: Option<String>,
-        #[structopt(long, env = "SQUAWK_GITHUB_PRIVATE_KEY_BASE64")]
-        github_private_key_base64: Option<String>,
-        #[structopt(long, env = "SQUAWK_GITHUB_TOKEN")]
-        github_token: Option<String>,
-        /// GitHub App Id.
-        #[structopt(long, env = "SQUAWK_GITHUB_APP_ID")]
-        github_app_id: Option<i64>,
-        /// GitHub Install Id. The installation that squawk is acting on.
-        #[structopt(long, env = "SQUAWK_GITHUB_INSTALL_ID")]
-        github_install_id: Option<i64>,
-        /// GitHub Repo Owner
-        /// github.com/sbdchd/squawk, sbdchd is the owner
-        #[structopt(long, env = "SQUAWK_GITHUB_REPO_OWNER")]
-        github_repo_owner: String,
-        /// GitHub Repo Name
-        /// github.com/sbdchd/squawk, squawk is the name
-        #[structopt(long, env = "SQUAWK_GITHUB_REPO_NAME")]
-        github_repo_name: String,
-        /// GitHub Pull Request Number
-        /// github.com/sbdchd/squawk/pull/10, 10 is the PR number
-        #[structopt(long, env = "SQUAWK_GITHUB_PR_NUMBER")]
-        github_pr_number: i64,
-    },
+    UploadToGithub(UploadToGithubArgs),
 }
 
 arg_enum! {
@@ -210,55 +215,63 @@ Please open an issue at https://github.com/sbdchd/squawk/issues/new with the log
     info!("assume in a transaction: {assume_in_transaction:?}");
 
     let mut clap_app = Opt::clap();
-    let stdout = io::stdout();
-    let mut handle = stdout.lock();
-
     let is_stdin = !atty::is(Stream::Stdin);
-
-    let found_paths = find_paths(&opts.path_patterns, &excluded_paths).unwrap_or_else(|e| {
-        eprintln!("Failed to find files: {e}");
-        process::exit(1);
-    });
-    if found_paths.is_empty() && !opts.path_patterns.is_empty() {
-        eprintln!(
-            "Failed to find files for provided patterns: {:?}",
-            opts.path_patterns
-        );
-        process::exit(1);
-    }
-    if let Some(subcommand) = opts.cmd {
-        github::check_and_comment_on_pr(
-            subcommand,
-            &conf,
-            is_stdin,
-            opts.stdin_filepath,
-            &excluded_rules,
-            &excluded_paths,
-            pg_version,
-            assume_in_transaction,
-        )
-        .context("Upload to GitHub failed")?;
-    } else if !found_paths.is_empty() || is_stdin {
-        let read_stdin = found_paths.is_empty() && is_stdin;
-        if let Some(kind) = opts.debug {
-            debug(&mut handle, &found_paths, read_stdin, &kind, opts.verbose)?;
-        } else {
-            let reporter = opts.reporter.unwrap_or(Reporter::Tty);
-            let exit_code = check_and_dump_files(
-                &mut handle,
-                &found_paths,
-                read_stdin,
+    match opts.cmd {
+        Some(Command::Server) => {
+            squawk_server::run().context("language server failed")?;
+        }
+        Some(Command::UploadToGithub(args)) => {
+            github::check_and_comment_on_pr(
+                args,
+                &conf,
+                is_stdin,
                 opts.stdin_filepath,
                 &excluded_rules,
+                &excluded_paths,
                 pg_version,
                 assume_in_transaction,
-                &reporter,
-            )?;
-            return Ok(exit_code);
+            )
+            .context("Upload to GitHub failed")?;
+        }
+        None => {
+            let found_paths =
+                find_paths(&opts.path_patterns, &excluded_paths).unwrap_or_else(|e| {
+                    eprintln!("Failed to find files: {e}");
+                    process::exit(1);
+                });
+            if found_paths.is_empty() && !opts.path_patterns.is_empty() {
+                eprintln!(
+                    "Failed to find files for provided patterns: {:?}",
+                    opts.path_patterns
+                );
+                process::exit(1);
+            }
+            if !found_paths.is_empty() || is_stdin {
+                let stdout = io::stdout();
+                let mut handle = stdout.lock();
+
+                let read_stdin = found_paths.is_empty() && is_stdin;
+                if let Some(kind) = opts.debug {
+                    debug(&mut handle, &found_paths, read_stdin, &kind, opts.verbose)?;
+                } else {
+                    let reporter = opts.reporter.unwrap_or(Reporter::Tty);
+                    let exit_code = check_and_dump_files(
+                        &mut handle,
+                        &found_paths,
+                        read_stdin,
+                        opts.stdin_filepath,
+                        &excluded_rules,
+                        pg_version,
+                        assume_in_transaction,
+                        &reporter,
+                    )?;
+                    return Ok(exit_code);
+                }
+            } else {
+                clap_app.print_long_help()?;
+                println!();
+            }
         }
-    } else {
-        clap_app.print_long_help()?;
-        println!();
     }
     Ok(ExitCode::SUCCESS)
 }

{squawk_cli-2.16.0 → squawk_cli-2.18.0}/crates/squawk_parser/src/generated/syntax_kind.rs

@@ -549,13 +549,11 @@ pub enum SyntaxKind {
     ALTER_AGGREGATE,
     ALTER_COLLATION,
     ALTER_COLUMN,
-    ALTER_COLUMN_OPTION,
     ALTER_CONSTRAINT,
     ALTER_CONVERSION,
     ALTER_DATABASE,
     ALTER_DEFAULT_PRIVILEGES,
     ALTER_DOMAIN,
-    ALTER_DOMAIN_ACTION,
     ALTER_EVENT_TRIGGER,
     ALTER_EXTENSION,
     ALTER_FOREIGN_DATA_WRAPPER,
@@ -583,7 +581,6 @@ pub enum SyntaxKind {
     ALTER_SYSTEM,
     ALTER_TABLE,
     ALTER_TABLESPACE,
-    ALTER_TABLE_ACTION,
     ALTER_TEXT_SEARCH_CONFIGURATION,
     ALTER_TEXT_SEARCH_DICTIONARY,
     ALTER_TEXT_SEARCH_PARSER,
@@ -628,7 +625,6 @@ pub enum SyntaxKind {
     COMMIT,
     COMPOUND_SELECT,
     COMPRESSION_METHOD,
-    CONSTRAINT,
     CONSTRAINT_EXCLUSIONS,
     CONSTRAINT_INCLUDE_CLAUSE,
     CONSTRAINT_INDEX_METHOD,
@@ -755,7 +751,6 @@ pub enum SyntaxKind {
     EXCLUDE_CONSTRAINT,
     EXECUTE,
     EXPLAIN,
-    EXPR,
     FAT_ARROW,
     FETCH,
     FETCH_CLAUSE,
@@ -766,7 +761,6 @@ pub enum SyntaxKind {
     FRAME_CLAUSE,
     FROM_CLAUSE,
     FROM_ITEM,
-    FUNC_OPTION,
     FUNC_OPTION_LIST,
     GENERATED_CONSTRAINT,
     GRANT,
@@ -811,18 +805,27 @@ pub enum SyntaxKind {
     JOIN_INNER,
     JOIN_LEFT,
     JOIN_RIGHT,
-    JOIN_TYPE,
     JOIN_USING_CLAUSE,
-    JSON_BEHAVIOR_CLAUSE,
+    JSON_BEHAVIOR_DEFAULT,
+    JSON_BEHAVIOR_EMPTY_ARRAY,
+    JSON_BEHAVIOR_EMPTY_OBJECT,
+    JSON_BEHAVIOR_ERROR,
+    JSON_BEHAVIOR_FALSE,
+    JSON_BEHAVIOR_NULL,
+    JSON_BEHAVIOR_TRUE,
+    JSON_BEHAVIOR_UNKNOWN,
     JSON_FORMAT_CLAUSE,
     JSON_KEYS_UNIQUE_CLAUSE,
     JSON_KEY_VALUE,
     JSON_NULL_CLAUSE,
+    JSON_ON_EMPTY_CLAUSE,
     JSON_ON_ERROR_CLAUSE,
+    JSON_PASSING_ARG,
     JSON_PASSING_CLAUSE,
     JSON_QUOTES_CLAUSE,
     JSON_RETURNING_CLAUSE,
     JSON_TABLE_COLUMN,
+    JSON_TABLE_COLUMN_LIST,
     JSON_VALUE_EXPR,
     JSON_WRAPPER_BEHAVIOR_CLAUSE,
     LANGUAGE_FUNC_OPTION,
@@ -838,7 +841,6 @@ pub enum SyntaxKind {
     MATCH_FULL,
     MATCH_PARTIAL,
     MATCH_SIMPLE,
-    MATCH_TYPE,
     MATERIALIZED,
     MERGE,
     MOVE,
@@ -872,7 +874,6 @@ pub enum SyntaxKind {
     OF_TYPE,
     ON_CLAUSE,
     ON_COMMIT,
-    ON_COMMIT_ACTION,
     ON_DELETE_ACTION,
     ON_UPDATE_ACTION,
     OP,
@@ -888,7 +889,6 @@ pub enum SyntaxKind {
     PARAM_IN,
     PARAM_IN_OUT,
     PARAM_LIST,
-    PARAM_MODE,
     PARAM_OUT,
     PARAM_VARIADIC,
     PAREN_EXPR,
@@ -900,7 +900,6 @@ pub enum SyntaxKind {
     PARTITION_FOR_VALUES_WITH,
     PARTITION_ITEM,
     PARTITION_OF,
-    PARTITION_TYPE,
     PATH,
     PATH_SEGMENT,
     PATH_TYPE,
@@ -919,7 +918,6 @@ pub enum SyntaxKind {
     REASSIGN,
     REFERENCES_CONSTRAINT,
     REFRESH,
-    REF_ACTION,
     REINDEX,
     RELATION_NAME,
     RELEASE_SAVEPOINT,
@@ -985,26 +983,20 @@ pub enum SyntaxKind {
     SORT_DESC,
     SORT_USING,
     SOURCE_FILE,
-    STMT,
     STORAGE,
     STRICT_FUNC_OPTION,
     SUPPORT_FUNC_OPTION,
     TABLE,
     TABLESPACE,
-    TABLE_ARG,
     TABLE_ARG_LIST,
-    TABLE_CONSTRAINT,
     TABLE_LIST,
     TARGET,
     TARGET_LIST,
-    TIMEZONE,
     TIME_TYPE,
-    TRANSACTION_MODE,
     TRANSACTION_MODE_LIST,
     TRANSFORM_FUNC_OPTION,
     TRUNCATE,
     TUPLE_EXPR,
-    TYPE,
     UNICODE_NORMAL_FORM,
     UNIQUE_CONSTRAINT,
     UNLISTEN,