ast-grep-cli 0.36.0__tar.gz → 0.36.2__tar.gz

{ast_grep_cli-0.36.0 → ast_grep_cli-0.36.2}/Cargo.lock

@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.96"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
 [[package]]
 name = "assert_cmd"
@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -137,6 +137,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "similar",
+ "smallvec",
  "tempfile",
  "tokio",
  "tree-sitter-facade-sg",
@@ -144,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -155,23 +156,23 @@ dependencies = [
  "serde",
  "serde_yaml",
  "thiserror",
- "tree-sitter-typescript 0.21.2",
+ "tree-sitter-typescript",
 ]
 
 [[package]]
 name = "ast-grep-core"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "bit-set",
  "regex",
  "thiserror",
  "tree-sitter-facade-sg",
- "tree-sitter-typescript 0.21.2",
+ "tree-sitter-typescript",
 ]
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -184,7 +185,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -209,13 +210,13 @@ dependencies = [
  "tree-sitter-rust",
  "tree-sitter-scala",
  "tree-sitter-swift",
- "tree-sitter-typescript 0.23.2",
+ "tree-sitter-typescript",
  "tree-sitter-yaml",
 ]
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -229,7 +230,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -245,7 +246,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -313,7 +314,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.36.0"
+version = "0.36.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -427,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -437,9 +438,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -458,9 +459,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.28"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -681,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -823,9 +824,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "globset"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1324,9 +1325,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
+checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -1343,9 +1344,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
+checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1353,9 +1354,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
+checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1363,9 +1364,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
+checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1375,9 +1376,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
+checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1492,7 +1493,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.2",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1512,9 +1513,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -1524,9 +1525,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1548,18 +1549,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1668,9 +1669,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "streaming-iterator"
@@ -1703,16 +1704,15 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tempfile"
-version = "3.18.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
+checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
 dependencies = [
- "cfg-if",
  "fastrand",
  "getrandom",
  "once_cell",
  "rustix 1.0.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1732,18 +1732,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1787,9 +1787,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2150,16 +2150,6 @@ dependencies = [
  "tree-sitter-language",
 ]
 
-[[package]]
-name = "tree-sitter-typescript"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecb35d98a688378e56c18c9c159824fd16f730ccbea19aacf4f206e5d5438ed9"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
 [[package]]
 name = "tree-sitter-typescript"
 version = "0.23.2"
@@ -2413,15 +2403,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"

{ast_grep_cli-0.36.0 → ast_grep_cli-0.36.2}/Cargo.toml

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

{ast_grep_cli-0.36.0 → ast_grep_cli-0.36.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ast-grep-cli
-Version: 0.36.0
+Version: 0.36.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_cli-0.36.0 → ast_grep_cli-0.36.2}/crates/cli/Cargo.toml

@@ -46,6 +46,7 @@ serde.workspace = true
 serde_json = "1.0.116"
 serde_yaml.workspace = true
 similar = { version = "2.5.0", features = ["inline"] }
+smallvec = "1.13.2"
 tokio = { version = "1.37.0", features = ["rt-multi-thread", "io-std"] }
 clap_complete = "4.5.2"
 

{ast_grep_cli-0.36.0 → ast_grep_cli-0.36.2}/crates/cli/src/print/colored_print/test.rs

@@ -239,17 +239,13 @@ fn test_non_overlap_print() {
   test_non_overlap_print_impl(Heading::Auto);
 }
 
-#[test]
-fn test_print_rule_diffs() {
+fn get_printed_text(mut printer: ColoredPrinter<Buffer>, diff_case: &DiffCase) -> String {
+  let (source, pattern, rewrite, _) = diff_case;
   let globals = GlobalRules::default();
-  for &(source, pattern, rewrite, note) in DIFF_CASES {
-    let mut printer = make_test_printer()
-      .heading(Heading::Never)
-      .style(ReportStyle::Short);
-    let grep = SgLang::from(SupportLang::TypeScript).ast_grep(source);
-    let rule = from_yaml_string(
-      &format!(
-        r"
+  let grep = SgLang::from(SupportLang::TypeScript).ast_grep(source);
+  let rule = from_yaml_string(
+    &format!(
+      r"
 id: test-id
 message: test rule
 severity: info
@@ -257,28 +253,52 @@ language: TypeScript
 rule:
   pattern: {pattern}
 fix: '{rewrite}'"
-      ),
-      &globals,
-    )
-    .expect("should parse")
-    .pop()
-    .unwrap();
-    let matcher = rule.get_matcher(&globals).expect("should parse");
-    let fixer = matcher.fixer.as_ref().expect("should have fixer");
-    let matches = grep.root().find_all(&matcher);
-    let diffs = matches.map(|n| (Diff::generate(n, &pattern, fixer), &rule));
-    let buffer = printer
-      .get_processor()
-      .print_rule_diffs(diffs.collect(), Path::new("test.tsx"))
-      .expect("test only");
-    printer.process(buffer).expect("test only");
-    let text = get_text(&printer);
+    ),
+    &globals,
+  )
+  .expect("should parse")
+  .pop()
+  .unwrap();
+  let matcher = rule.get_matcher(&globals).expect("should parse");
+  let fixer = matcher.fixer.as_ref().expect("should have fixer");
+  let matches = grep.root().find_all(&matcher);
+  let diffs = matches.map(|n| (Diff::generate(n, &pattern, fixer), &rule));
+  let buffer = printer
+    .get_processor()
+    .print_rule_diffs(diffs.collect(), Path::new("test.tsx"))
+    .expect("test only");
+  printer.process(buffer).expect("test only");
+  get_text(&printer)
+}
+
+#[test]
+fn test_print_rule_diffs() {
+  for diff_case in DIFF_CASES {
+    let printer = make_test_printer()
+      .heading(Heading::Never)
+      .style(ReportStyle::Rich);
+    let text = get_printed_text(printer, diff_case);
+    let (_, _, rewrite, note) = diff_case;
     assert!(text.contains("test.tsx"), "{note}");
     assert!(text.contains("note[test-id]"), "{note}");
     assert!(text.contains(rewrite), "{note}");
   }
 }
 
+#[test]
+fn test_print_rule_diffs_short() {
+  for diff_case in DIFF_CASES {
+    let printer = make_test_printer()
+      .heading(Heading::Never)
+      .style(ReportStyle::Short);
+    let text = get_printed_text(printer, diff_case);
+    let (_, _, rewrite, note) = diff_case;
+    assert!(text.contains("test.tsx:"), "{note}");
+    assert!(text.contains("note[test-id]"), "{note}");
+    assert!(rewrite.is_empty() || !text.contains(rewrite), "{note}");
+  }
+}
+
 #[test]
 fn test_before_after() {
   let src = "

{ast_grep_cli-0.36.0 → ast_grep_cli-0.36.2}/crates/cli/src/print/colored_print.rs

@@ -217,7 +217,7 @@ impl PrintProcessor<Buffer> for ColoredProcessor {
     let mut buffer = create_buffer(self.color);
     let writer = &mut buffer;
     let mut start = 0;
-    self.styles.print_prelude(path, writer)?;
+    let display_style = &self.config.display_style;
     for (diff, rule) in diffs {
       let range = &diff.range;
       // skip overlapping diff
@@ -225,21 +225,37 @@ impl PrintProcessor<Buffer> for ColoredProcessor {
         continue;
       }
       start = range.end;
+      if matches!(display_style, DisplayStyle::Rich) {
+        self.styles.print_prelude(path, writer)?;
+      } else {
+        let pos = diff.node_match.start_pos();
+        write!(
+          writer,
+          "{}:{}:{}: ",
+          path.display(),
+          pos.line() + 1,
+          pos.column(&diff.node_match) + 1
+        )?;
+      }
       print_rule_title(rule, &diff.node_match, &self.styles.rule, writer)?;
-      let source = diff.get_root_text();
-      let new_str = format!(
-        "{}{}{}",
-        &source[..range.start],
-        diff.replacement,
-        &source[start..],
-      );
-      self
-        .styles
-        .diff
-        .print_diff(source, &new_str, writer, context)?;
-      if let Some(note) = &rule.note {
-        writeln!(writer, "{}", self.styles.rule.note.paint("Note:"))?;
-        writeln!(writer, "{note}")?;
+      if matches!(display_style, DisplayStyle::Rich) {
+        let source = diff.get_root_text();
+        let new_str = format!(
+          "{}{}{}",
+          &source[..range.start],
+          diff.replacement,
+          &source[start..],
+        );
+        self
+          .styles
+          .diff
+          .print_diff(source, &new_str, writer, context)?;
+      }
+      if matches!(display_style, DisplayStyle::Medium | DisplayStyle::Rich) {
+        if let Some(note) = &rule.note {
+          writeln!(writer, "{}", self.styles.rule.note.paint("Note:"))?;
+          writeln!(writer, "{note}")?;
+        }
       }
     }
     Ok(buffer)