ast-grep-cli 0.13.0__tar.gz → 0.13.2__tar.gz

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/Cargo.lock

@@ -97,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -128,7 +128,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "bit-set",
  "regex",
@@ -156,11 +156,11 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
- "libloading 0.8.0",
+ "libloading",
  "serde",
  "thiserror",
  "tree-sitter",
@@ -168,7 +168,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "ast-grep-core",
  "ast-grep-tree-sitter-c-sharp",
@@ -196,7 +196,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -211,7 +211,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -229,8 +229,8 @@ dependencies = [
 ]
 
 [[package]]
-name = "ast-grep-pyo3"
-version = "0.13.0"
+name = "ast-grep-py"
+version = "0.13.2"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -293,7 +293,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "benches"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -401,9 +401,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -411,9 +411,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
 dependencies = [
  "anstream",
  "anstyle",
@@ -954,16 +954,6 @@ version = "0.2.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
 
-[[package]]
-name = "libloading"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
 [[package]]
 name = "libloading"
 version = "0.8.0"
@@ -1056,9 +1046,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.13.3"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0"
+checksum = "f9d90182620f32fe34b6ac9b52cba898af26e94c7f5abc01eb4094c417ae2e6c"
 dependencies = [
  "anyhow",
  "bitflags 2.3.3",
@@ -1078,9 +1068,9 @@ checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
 
 [[package]]
 name = "napi-derive"
-version = "2.13.0"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367"
+checksum = "3619fa472d23cd5af94d63a2bae454a77a8863251f40230fbf59ce20eafa8a86"
 dependencies = [
  "cfg-if",
  "convert_case",
@@ -1092,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.52"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
+checksum = "ecd3ea4b54020c73d591a49cd192f6334c5f37f71a63ead54dbc851fa991ef00"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -1107,11 +1097,11 @@ dependencies = [
 
 [[package]]
 name = "napi-sys"
-version = "2.2.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
+checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b"
 dependencies = [
- "libloading 0.7.3",
+ "libloading",
 ]
 
 [[package]]
@@ -1537,9 +1527,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
+checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -1549,9 +1539,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
+checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1838,9 +1828,9 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 
 [[package]]
 name = "toml_edit"
-version = "0.20.7"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
  "indexmap",
  "toml_datetime",

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/Cargo.toml

@@ -6,7 +6,7 @@ default-members = ["crates/*"]
 lto = true
 
 [workspace.package]
-version = "0.13.0"
+version = "0.13.2"
 authors = ["Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>"]
 edition = "2021"
 license = "MIT"
@@ -17,11 +17,11 @@ rust-version = "1.63"
 readme = "README.md"
 
 [workspace.dependencies]
-ast-grep-core = { path = "crates/core", version = "0.13.0" }
-ast-grep-config = { path = "crates/config", version = "0.13.0" }
-ast-grep-dynamic = { path = "crates/dynamic", version = "0.13.0" }
-ast-grep-language = { path = "crates/language", version = "0.13.0" }
-ast-grep-lsp = { path = "crates/lsp", version = "0.13.0" }
+ast-grep-core = { path = "crates/core", version = "0.13.2" }
+ast-grep-config = { path = "crates/config", version = "0.13.2" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.13.2" }
+ast-grep-language = { path = "crates/language", version = "0.13.2" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.13.2" }
 
 bit-set = { version = "0.5.3" }
 ignore = { version = "0.4.20" }
@@ -29,5 +29,5 @@ regex = { version = "1.10.2" }
 serde = { version = "1.0", features = ["derive"] }
 tree-sitter = { version = "0.9.2", package = "tree-sitter-facade-sg" }
 thiserror = "1.0.50"
-schemars = "0.8.15"
+schemars = "0.8.16"
 anyhow = "1.0.75"

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ast-grep-cli
-Version: 0.13.0
+Version: 0.13.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/Cargo.toml

@@ -35,7 +35,7 @@ ast-grep-lsp.workspace = true
 ansi_term = "0.12"
 anyhow.workspace = true
 atty = "0.2.14"
-clap = { version = "4.4.7", features = ["derive"] }
+clap = { version = "4.4.8", features = ["derive"] }
 codespan-reporting = "0.11.1"
 crossterm = "0.27.0"
 ignore.workspace = true

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/completions.rs

@@ -49,7 +49,7 @@ fn run_shell_completion_impl<C: CommandFactory, W: io::Write>(
   output: &mut W,
 ) -> Result<()> {
   let Some(shell) = arg.shell.or_else(Shell::from_env) else {
-    return Err(anyhow::anyhow!(EC::CannotInferShell))
+    return Err(anyhow::anyhow!(EC::CannotInferShell));
   };
   let mut cmd = C::command();
   let cmd_name = match get_bin_name() {

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/config.rs

@@ -68,7 +68,9 @@ pub fn register_custom_language(config_path: Option<PathBuf>) {
   let Ok(mut path) = find_config_path_with_default(config_path, None) else {
     return;
   };
-  let Ok(config_str) = read_to_string(&path) else { return };
+  let Ok(config_str) = read_to_string(&path) else {
+    return;
+  };
   let sg_config: AstGrepConfig = from_str(&config_str).unwrap();
   path.pop();
   if let Some(custom_langs) = sg_config.custom_languages {
@@ -81,7 +83,7 @@ fn find_util_rules(
   util_dirs: Option<Vec<PathBuf>>,
 ) -> Result<GlobalRules<SgLang>> {
   let Some(util_dirs) = util_dirs else {
-    return Ok(GlobalRules::default())
+    return Ok(GlobalRules::default());
   };
   let mut utils = vec![];
   // TODO: use WalkBuilder::add to avoid loop

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/new.rs

@@ -268,7 +268,7 @@ invalid:
 
 fn create_new_test(test_configs: Option<Vec<TestConfig>>, name: Option<String>) -> Result<()> {
   let Some(tests) = test_configs else {
-    return Err(anyhow::anyhow!(EC::NoTestDirConfigured))
+    return Err(anyhow::anyhow!(EC::NoTestDirConfigured));
   };
   if tests.is_empty() {
     return Err(anyhow::anyhow!(EC::NoTestDirConfigured));

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/print/colored_print/test.rs

@@ -6,6 +6,8 @@ use ast_grep_core::replacer::Fixer;
 use ast_grep_language::{Language, SupportLang};
 use codespan_reporting::term::termcolor::Buffer;
 
+use std::fmt::Write;
+
 fn make_test_printer() -> ColoredPrinter<Buffer> {
   ColoredPrinter::new(Buffer::no_color()).color(ColorChoice::Never)
 }
@@ -49,11 +51,13 @@ fn test_print_matches() {
     let grep = SgLang::from(SupportLang::Tsx).ast_grep(source);
     let matches = grep.root().find_all(pattern);
     printer.print_matches(matches, "test.tsx".as_ref()).unwrap();
-    let expected: String = source
+    let expected = source
       .lines()
       .enumerate()
-      .map(|(i, l)| format!("{}│{l}\n", i + 1))
-      .collect();
+      .fold(String::new(), |mut b, (i, l)| {
+        _ = writeln!(b, "{}│{l}", i + 1);
+        b
+      });
     // append heading to expected
     let output = format!("test.tsx\n{expected}\n");
     assert_eq!(get_text(&printer), output, "{note}");
@@ -68,11 +72,13 @@ fn test_print_matches_without_heading() {
     let matches = grep.root().find_all(pattern);
     printer.print_matches(matches, "test.tsx".as_ref()).unwrap();
     // append heading to expected
-    let output: String = source
+    let output = source
       .lines()
       .enumerate()
-      .map(|(i, e)| format!("test.tsx:{}:{e}\n", i + 1))
-      .collect();
+      .fold(String::new(), |mut b, (i, e)| {
+        _ = writeln!(b, "test.tsx:{}:{e}", i + 1);
+        b
+      });
     assert_eq!(get_text(&printer), output, "{note}");
   }
 }

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/print/colored_print.rs

@@ -329,7 +329,7 @@ fn print_matches_with_heading<'a, W: WriteColor>(
   let writer = &mut *printer.writer.lock().expect("cannot get printer lock");
   print_prelude(path, styles, writer)?;
   let Some(first_match) = matches.next() else {
-    return Ok(())
+    return Ok(());
   };
   let source = first_match.root().get_text();
 
@@ -386,7 +386,7 @@ fn print_matches_with_prefix<'a, W: WriteColor>(
   let writer = &mut *printer.writer.lock().expect("cannot get printer lock");
   let path = path.display();
   let Some(first_match) = matches.next() else {
-    return Ok(())
+    return Ok(());
   };
   let source = first_match.root().get_text();
 
@@ -634,20 +634,24 @@ mod choose_color {
   /// Returns true if we should attempt to write colored output.
   pub fn should_use_color(color: &ColorChoice) -> bool {
     match *color {
-      ColorChoice::Always => env_allow_ansi(color),
+      // TODO: we should check if ansi is supported on windows console
+      ColorChoice::Always => true,
       ColorChoice::AlwaysAnsi => true,
       ColorChoice::Never => false,
       // NOTE tty check is added
-      ColorChoice::Auto => atty::is(atty::Stream::Stdout) && env_allows_color(color),
+      ColorChoice::Auto => atty::is(atty::Stream::Stdout) && env_allows_color(),
     }
   }
 
-  #[cfg(not(windows))]
-  fn env_allows_color(color: &ColorChoice) -> bool {
+  fn env_allows_color() -> bool {
     match env::var_os("TERM") {
-      // If TERM isn't set, then we are in a weird environment that
-      // probably doesn't support colors.
-      None => return false,
+      // On Windows, if TERM isn't set, then we should not automatically
+      // assume that colors aren't allowed. This is unlike Unix environments
+      None => {
+        if !cfg!(windows) {
+          return false;
+        }
+      }
       Some(k) => {
         if k == "dumb" {
           return false;
@@ -659,51 +663,6 @@ mod choose_color {
     if env::var_os("NO_COLOR").is_some() {
       return false;
     }
-    env_allow_ansi(color)
-  }
-
-  #[cfg(windows)]
-  fn env_allows_color(color: &ColorChoice) -> bool {
-    // On Windows, if TERM isn't set, then we should not automatically
-    // assume that colors aren't allowed. This is unlike Unix environments
-    // where TERM is more rigorously set.
-    if let Some(k) = env::var_os("TERM") {
-      if k == "dumb" {
-        return false;
-      }
-    }
-    // If TERM != dumb, then the only way we don't allow colors at this
-    // point is if NO_COLOR is set.
-    if env::var_os("NO_COLOR").is_some() {
-      return false;
-    }
-    env_allow_ansi(color)
-  }
-
-  #[cfg(not(windows))]
-  fn env_allow_ansi(_color: &ColorChoice) -> bool {
     true
   }
-
-  /// Returns true if this choice should forcefully use ANSI color codes.
-  ///
-  /// It's possible that ANSI is still the correct choice even if this
-  /// returns false.
-  #[cfg(windows)]
-  fn env_allow_ansi(color: &ColorChoice) -> bool {
-    match *color {
-      ColorChoice::Always => false,
-      ColorChoice::AlwaysAnsi => true,
-      ColorChoice::Never => false,
-      ColorChoice::Auto => {
-        match env::var("TERM") {
-          Err(_) => false,
-          // cygwin doesn't seem to support ANSI escape sequences
-          // and instead has its own variety. However, the Windows
-          // console API may be available.
-          Ok(k) => k != "dumb" && k != "cygwin",
-        }
-      }
-    }
-  }
 }

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/print/interactive_print.rs

@@ -205,7 +205,7 @@ fn print_matches_and_confirm_next<'a>(
 fn apply_rewrite(diffs: Vec<Diff>) -> String {
   let mut new_content = String::new();
   let Some(first) = diffs.first() else {
-    return new_content
+    return new_content;
   };
   let old_content = first.node_match.root().get_text();
   let mut start = 0;

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/verify/case_result.rs

@@ -120,7 +120,7 @@ mod test {
     let ret = CaseStatus::verify_snapshot(&rule, "function () { let a = 1 }", None);
     assert!(matches!(&ret, CaseStatus::Wrong { expected: None, .. }));
     let CaseStatus::Wrong { actual, source, .. } = ret else {
-        panic!("wrong");
+      panic!("wrong");
     };
     assert_eq!(source, "function () { let a = 1 }");
     let primary = &actual.labels[0];

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/verify/mod.rs

@@ -113,10 +113,10 @@ fn apply_snapshot_action(
   path_map: HashMap<String, PathBuf>,
 ) -> Result<()> {
   let Some(snapshots) = snapshots else {
-    return Ok(())
+    return Ok(());
   };
   let Some(merged) = action.update_snapshot_collection(snapshots, results) else {
-    return Ok(())
+    return Ok(());
   };
   write_merged_to_disk(merged, path_map)
 }

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/cli/src/verify/snapshot.rs

@@ -92,7 +92,10 @@ impl TestSnapshot {
     };
     let labels = Label::from_matched(matched);
     let Some(fix) = &rule_config.fixer else {
-      return Ok(Some(Self { fixed: None, labels }));
+      return Ok(Some(Self {
+        fixed: None,
+        labels,
+      }));
     };
     let changed = sg.replace(rule, fix)?;
     debug_assert!(changed);

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/core/src/meta_var.rs

@@ -74,7 +74,7 @@ impl<'tree, D: Doc> MetaVarEnv<'tree, D> {
     self
       .multi_matched
       .entry(label.into())
-      .or_insert_with(Vec::new)
+      .or_default()
       .push(node);
   }
 
@@ -131,7 +131,7 @@ impl<'tree, D: Doc> MetaVarEnv<'tree, D> {
       if let Some(node) = named_nodes.next() {
         let Some(cand) = named_cands.next() else {
           // cand is done but node is not
-          break false
+          break false;
         };
         if !does_node_match_exactly(node, cand) {
           break false;

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/core/src/traversal.rs

@@ -202,7 +202,11 @@ impl<'tree, D: Doc> Pre<'tree, D> {
       }
       self.current_depth -= 1;
       // go back to parent node
-      cursor.goto_parent();
+      if !cursor.goto_parent() {
+        // it should never fail here. However, tree-sitter has bad parsing bugs
+        // stop to avoid panic. https://github.com/ast-grep/ast-grep/issues/713
+        break;
+      }
     }
     // terminate traversal here
     self.start_id = None;

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/crates/language/src/lib.rs

@@ -16,6 +16,7 @@ mod kotlin;
 mod lua;
 mod parsers;
 mod python;
+mod ruby;
 mod rust;
 mod scala;
 mod swift;

ast_grep_cli-0.13.2/crates/language/src/ruby.rs

@@ -0,0 +1,34 @@
+#![cfg(test)]
+use ast_grep_core::source::TSParseError;
+
+use super::*;
+use ast_grep_core::Pattern;
+
+fn test_match(query: &str, source: &str) {
+  use crate::test::test_match_lang;
+  test_match_lang(query, source, Ruby);
+}
+
+#[test]
+fn test_ruby_pattern() {
+  test_match("Foo::bar", "Foo::bar");
+}
+
+// https://github.com/ast-grep/ast-grep/issues/713
+#[test]
+fn test_ruby_tree_sitter_panic() {
+  let pattern = Pattern::str("Foo::barbaz", Ruby);
+  assert_eq!(pattern.fixed_string(), "barbaz");
+}
+
+fn test_replace(src: &str, pattern: &str, replacer: &str) -> Result<String, TSParseError> {
+  use crate::test::test_replace_lang;
+  test_replace_lang(src, pattern, replacer, Ruby)
+}
+
+#[test]
+fn test_ruby_replace() -> Result<(), TSParseError> {
+  let ret = test_replace("Foo::bar()", "Foo::$METHOD()", "$METHOD()")?;
+  assert_eq!(ret, "bar()");
+  Ok(())
+}

{ast_grep_cli-0.13.0 → ast_grep_cli-0.13.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ast-grep-cli"
-version = "0.13.0"
+version = "0.13.2"
 description = "Structural Search and Rewrite code at large scale using precise AST pattern."
 authors = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme@users.noreply.github.com" }]
 maintainers = [{ name = "Herrington Darkholme", email = "2883231+HerringtonDarkholme@users.noreply.github.com" }]