ast-grep-cli 0.27.2__tar.gz → 0.28.0__tar.gz

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/Cargo.lock

@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "assert_cmd"
@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "bit-set",
  "regex",
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -184,7 +184,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -217,12 +217,12 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
  "ast-grep-language",
- "dashmap 6.0.1",
+ "dashmap 6.1.0",
  "serde",
  "serde_json",
  "tokio",
@@ -231,7 +231,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -250,7 +250,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -318,7 +318,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.27.2"
+version = "0.28.0"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -429,9 +429,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -439,9 +439,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
 dependencies = [
  "anstream",
  "anstyle",
@@ -451,18 +451,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.23"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531d7959c5bbb6e266cecdd0f20213639c3a5c3e4d615f97db87661745f781ff"
+checksum = "74a01f4f9ee6c066d42a1c8dedf0dcddad16c72a8981a309d6398de3a75b0c39"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -634,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "6.0.1"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -688,9 +688,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "float-cmp"
@@ -813,9 +813,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -879,9 +879,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -895,9 +895,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -969,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libloading"
@@ -980,14 +980,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
@@ -1069,9 +1069,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.16.9"
+version = "2.16.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1277600d452e570cc83cf5f4e8efb389cc21e5cbefadcfba7239f4551e2e3e99"
+checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd"
 dependencies = [
  "anyhow",
  "bitflags 2.5.0",
@@ -1091,9 +1091,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.11"
+version = "2.16.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150d87c4440b9f4815cb454918db498b5aae9a57aa743d20783fe75381181d01"
+checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1"
 dependencies = [
  "cfg-if",
  "convert_case",
@@ -1105,9 +1105,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd81b794fc1d6051acf8c4f3cb4f82833b0621272a232b4ff0cf3df1dbddb61"
+checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -1318,9 +1318,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
+checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -1337,9 +1337,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
+checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1347,9 +1347,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
+checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1357,9 +1357,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
+checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1369,9 +1369,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
+checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1430,9 +1430,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1442,9 +1442,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1453,9 +1453,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-demangle"
@@ -1465,9 +1465,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags 2.5.0",
  "errno",
@@ -1529,18 +1529,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1560,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1672,9 +1672,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -1700,18 +1700,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1755,9 +1755,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1785,9 +1785,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "toml_datetime",

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 lto = true
 
 [workspace.package]
-version = "0.27.2"
+version = "0.28.0"
 authors = ["Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>"]
 edition = "2021"
 license = "MIT"
@@ -18,11 +18,11 @@ rust-version = "1.67"
 readme = "README.md"
 
 [workspace.dependencies]
-ast-grep-core = { path = "crates/core", version = "0.27.2" }
-ast-grep-config = { path = "crates/config", version = "0.27.2" }
-ast-grep-dynamic = { path = "crates/dynamic", version = "0.27.2" }
-ast-grep-language = { path = "crates/language", version = "0.27.2" }
-ast-grep-lsp = { path = "crates/lsp", version = "0.27.2" }
+ast-grep-core = { path = "crates/core", version = "0.28.0" }
+ast-grep-config = { path = "crates/config", version = "0.28.0" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.28.0" }
+ast-grep-language = { path = "crates/language", version = "0.28.0" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.28.0" }
 
 bit-set = { version = "0.8.0" }
 ignore = { version = "0.4.22" }

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ast-grep-cli
-Version: 0.27.2
+Version: 0.28.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/completions.rs

@@ -26,7 +26,7 @@ use anyhow::Result;
 use clap::{CommandFactory, Parser};
 use clap_complete::{generate, Shell};
 
-use crate::error::ErrorContext as EC;
+use crate::utils::ErrorContext as EC;
 
 use std::env;
 use std::io;

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/config.rs

@@ -1,5 +1,5 @@
-use crate::error::ErrorContext as EC;
 use crate::lang::{CustomLang, LanguageGlobs, SerializableInjection, SgLang};
+use crate::utils::{ErrorContext as EC, RuleStats};
 
 use anyhow::{Context, Result};
 use ast_grep_config::{
@@ -57,7 +57,7 @@ pub struct AstGrepConfig {
 pub fn find_rules(
   config_path: Option<PathBuf>,
   rule_filter: Option<&Regex>,
-) -> Result<RuleCollection<SgLang>> {
+) -> Result<(RuleCollection<SgLang>, RuleStats)> {
   let config_path =
     find_config_path_with_default(config_path, None).context(EC::ReadConfiguration)?;
   let config_str = read_to_string(&config_path).context(EC::ReadConfiguration)?;
@@ -132,7 +132,7 @@ fn read_directory_yaml(
   rule_dirs: Vec<PathBuf>,
   global_rules: GlobalRules<SgLang>,
   rule_filter: Option<&Regex>,
-) -> Result<RuleCollection<SgLang>> {
+) -> Result<(RuleCollection<SgLang>, RuleStats)> {
   let mut configs = vec![];
   for dir in rule_dirs {
     let dir_path = base_dir.join(dir);
@@ -154,14 +154,20 @@ fn read_directory_yaml(
       configs.extend(new_configs);
     }
   }
+  let total_rule_count = configs.len();
 
   let configs = if let Some(filter) = rule_filter {
     filter_rule_by_regex(configs, filter)?
   } else {
     configs
   };
-
-  RuleCollection::try_new(configs).context(EC::GlobPattern)
+  let collection = RuleCollection::try_new(configs).context(EC::GlobPattern)?;
+  let effective_rule_count = collection.total_rule_count();
+  let stats = RuleStats {
+    effective_rule_count,
+    skipped_rule_count: total_rule_count - effective_rule_count,
+  };
+  Ok((collection, stats))
 }
 
 fn filter_rule_by_regex(

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/lang/injection.rs

@@ -1,5 +1,5 @@
 use super::SgLang;
-use crate::error::ErrorContext as EC;
+use crate::utils::ErrorContext as EC;
 use ast_grep_config::{DeserializeEnv, RuleCore, SerializableRuleCore};
 use ast_grep_core::{
   language::{TSPoint, TSRange},

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/lang/lang_globs.rs

@@ -5,7 +5,7 @@ use std::path::Path;
 use std::ptr::{addr_of, addr_of_mut};
 use std::str::FromStr;
 
-use crate::error::ErrorContext as EC;
+use crate::utils::ErrorContext as EC;
 use anyhow::{Context, Result};
 
 // both use vec since lang will be small

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/lib.rs

@@ -1,7 +1,5 @@
 mod completions;
 mod config;
-mod debug;
-mod error;
 mod lang;
 mod lsp;
 mod new;
@@ -15,11 +13,11 @@ use anyhow::Result;
 use clap::{Parser, Subcommand};
 
 use completions::{run_shell_completion, CompletionsArg};
-use error::exit_with_error;
 use lsp::{run_language_server, LspArg};
 use new::{run_create_new, NewArg};
 use run::{register_custom_language_if_is_run, run_with_pattern, RunArg};
 use scan::{run_with_config, ScanArg};
+use utils::exit_with_error;
 use verify::{run_test_rule, TestArg};
 
 const LOGO: &str = r#"
@@ -183,6 +181,9 @@ mod test_cli {
     ok("run -p test --selector identifier"); // pattern + selector
     ok("run -p test --selector identifier -l js");
     ok("run -p test --follow");
+    ok("run -p test --globs '*.js'");
+    ok("run -p test --globs '*.{js, ts}'");
+    ok("run -p test --globs '*.js' --globs '*.ts'");
     error("run test");
     error("run --debug-query test"); // missing lang
     error("run -r Test dir");
@@ -209,6 +210,9 @@ mod test_cli {
     ok("scan --interactive");
     ok("scan --follow");
     ok("scan -r test.yml -c test.yml --json dir"); // allow registering custom lang
+    ok("scan --globs '*.js'");
+    ok("scan --globs '*.{js, ts}'");
+    ok("scan --globs '*.js' --globs '*.ts'");
     error("scan -i --json dir"); // conflict
     error("scan --report-style rich --json dir"); // conflict
     error("scan -r test.yml --inline-rules '{}'"); // conflict

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/lsp.rs

@@ -1,5 +1,5 @@
 use crate::config::{find_config_path_with_default, find_rules, register_custom_language};
-use crate::error::ErrorContext as EC;
+use crate::utils::ErrorContext as EC;
 use anyhow::{Context, Result};
 use ast_grep_lsp::{Backend, LspService, Server};
 use clap::Args;
@@ -25,13 +25,15 @@ async fn run_language_server_impl(arg: LspArg) -> Result<()> {
   let stdout = tokio::io::stdout();
   let config_base = find_config_base(arg.config.clone())?;
   let config_result = find_rules(arg.config, None);
-  let config_result_std: std::result::Result<_, String> = config_result.map_err(|e| {
-    // convert anyhow::Error to String with chain of causes
-    e.chain()
-      .map(|e| e.to_string())
-      .collect::<Vec<_>>()
-      .join(". ")
-  });
+  let config_result_std: std::result::Result<_, String> = config_result
+    .map_err(|e| {
+      // convert anyhow::Error to String with chain of causes
+      e.chain()
+        .map(|e| e.to_string())
+        .collect::<Vec<_>>()
+        .join(". ")
+    })
+    .map(|r| r.0);
   let (service, socket) =
     LspService::build(|client| Backend::new(client, config_base, config_result_std)).finish();
   Server::new(stdin, stdout, socket).serve(service).await;

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/new.rs

@@ -2,8 +2,8 @@ use crate::config::{
   find_config_path_with_default, read_config_from_dir, register_custom_language, AstGrepConfig,
   TestConfig,
 };
-use crate::error::ErrorContext as EC;
 use crate::lang::SgLang;
+use crate::utils::ErrorContext as EC;
 
 use anyhow::Result;
 use clap::{Parser, Subcommand};

{ast_grep_cli-0.27.2 → ast_grep_cli-0.28.0}/crates/cli/src/print/interactive_print.rs

@@ -1,7 +1,7 @@
 use super::{Diff, Printer};
-use crate::error::ErrorContext as EC;
 use crate::lang::SgLang;
 use crate::utils;
+use crate::utils::ErrorContext as EC;
 
 use anyhow::{Context, Result};
 use ast_grep_config::RuleConfig;