ast-grep-cli 0.22.0__tar.gz → 0.22.2__tar.gz

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/Cargo.lock

@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -144,7 +144,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "anyhow",
  "ast-grep-core",
@@ -160,7 +160,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-core"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "bit-set",
  "regex",
@@ -171,7 +171,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -183,7 +183,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-language"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -196,6 +196,7 @@ dependencies = [
  "tree-sitter-dart",
  "tree-sitter-elixir",
  "tree-sitter-go",
+ "tree-sitter-haskell",
  "tree-sitter-html",
  "tree-sitter-java",
  "tree-sitter-javascript-sg",
@@ -213,7 +214,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -227,7 +228,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -245,7 +246,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -311,7 +312,7 @@ dependencies = [
 
 [[package]]
 name = "benches"
-version = "0.22.0"
+version = "0.22.2"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -1877,9 +1878,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-c"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d463580f35b642e3073d163c9ba84f5212bfde538e5c06c40a085b3d560190ea"
+checksum = "b4f0e5c383fd633a792eb8878367dc9d4a3c0e788bad5dcc84c200332ed1b8f2"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -1937,9 +1938,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-facade-sg"
-version = "0.21.3"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56b01a682080bbfb3cc9cc52550929b936f1838b22870a82ad34aafb1010991"
+checksum = "e7ca50a891218430da4837d9f411b365b83ce6a22c28f8d99933bcc5bc18cd0c"
 dependencies = [
  "js-sys",
  "tree-sitter",
@@ -1958,6 +1959,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-haskell"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25a7e6c73cc1cbe0c0b7dbd5406e7b3485b370bd61c5d8d852ae0781f9bf9a"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-html"
 version = "0.20.3"

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 lto = true
 
 [workspace.package]
-version = "0.22.0"
+version = "0.22.2"
 authors = ["Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>"]
 edition = "2021"
 license = "MIT"
@@ -18,17 +18,17 @@ rust-version = "1.67"
 readme = "README.md"
 
 [workspace.dependencies]
-ast-grep-core = { path = "crates/core", version = "0.22.0" }
-ast-grep-config = { path = "crates/config", version = "0.22.0" }
-ast-grep-dynamic = { path = "crates/dynamic", version = "0.22.0" }
-ast-grep-language = { path = "crates/language", version = "0.22.0" }
-ast-grep-lsp = { path = "crates/lsp", version = "0.22.0" }
+ast-grep-core = { path = "crates/core", version = "0.22.2" }
+ast-grep-config = { path = "crates/config", version = "0.22.2" }
+ast-grep-dynamic = { path = "crates/dynamic", version = "0.22.2" }
+ast-grep-language = { path = "crates/language", version = "0.22.2" }
+ast-grep-lsp = { path = "crates/lsp", version = "0.22.2" }
 
 bit-set = { version = "0.5.3" }
 ignore = { version = "0.4.22" }
 regex = { version = "1.10.4" }
 serde = { version = "1.0.200", features = ["derive"] }
-tree-sitter = { version = "0.21.3", package = "tree-sitter-facade-sg" }
+tree-sitter = { version = "0.21.4", package = "tree-sitter-facade-sg" }
 thiserror = "1.0.59"
 schemars = "0.8.17"
 anyhow = "1.0.82"

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/PKG-INFO

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

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/crates/cli/src/verify/reporter.rs

@@ -165,7 +165,7 @@ fn report_case_detail_impl<W: Write>(
     CaseStatus::Updated { source, .. } => {
       writeln!(
         output,
-        "[{update}] Rule {case_id}'s snapshot baselien has been updated."
+        "[{update}] Rule {case_id}'s snapshot baseline has been updated."
       )?;
       writeln!(output)?;
       indented_write(output, source)?;

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/crates/language/Cargo.toml

@@ -24,6 +24,7 @@ tree-sitter-css = { version = "0.21.0", optional = true }
 tree-sitter-dart= { version = "0.0.4", optional = true }
 tree-sitter-elixir = { version = "0.2.0", optional = true }
 tree-sitter-go = { version = "0.21.0", optional = true }
+tree-sitter-haskell = { version = "0.21.0", optional = true }
 tree-sitter-html = { version = "0.20.3", optional = true }
 tree-sitter-java = { version = "0.21.0", optional = true }
 # https://github.com/tree-sitter/tree-sitter-javascript/issues/316
@@ -50,6 +51,7 @@ builtin-parser = [
   "tree-sitter-dart",
   "tree-sitter-elixir",
   "tree-sitter-go",
+  "tree-sitter-haskell",
   "tree-sitter-html",
   "tree-sitter-java",
   "tree-sitter-javascript",
@@ -64,4 +66,4 @@ builtin-parser = [
   "tree-sitter-swift",
   "tree-sitter-typescript",
 ]
-default = ["builtin-parser"]
+default = ["builtin-parser"]

ast_grep_cli-0.22.2/crates/language/src/haskell.rs

@@ -0,0 +1,68 @@
+#![cfg(test)]
+use ast_grep_core::source::TSParseError;
+
+use super::*;
+
+fn test_match(query: &str, source: &str) {
+  use crate::test::test_match_lang;
+  test_match_lang(query, source, Haskell);
+}
+
+fn test_non_match(query: &str, source: &str) {
+  use crate::test::test_non_match_lang;
+  test_non_match_lang(query, source, Haskell);
+}
+
+#[test]
+fn test_haskell_str() {
+  test_match("return $A", "return 3");
+  test_match(r#""abc""#, r#""abc""#);
+  test_match("$A $B", "f x");
+  test_match("$A ($B $C)", "f (x y)");
+  test_match("let $A = $B in $A + $A", "let x = 3 in x + x");
+  test_non_match("$A $B", "f");
+  test_non_match("$A + $A", "3 + 4");
+  test_non_match("$A ($B $C)", "f x y");
+}
+
+fn test_replace(src: &str, pattern: &str, replacer: &str) -> Result<String, TSParseError> {
+  use crate::test::test_replace_lang;
+  test_replace_lang(src, pattern, replacer, Haskell)
+}
+
+#[test]
+fn test_haskell_replace() -> Result<(), TSParseError> {
+  let ret = test_replace(
+    r#"
+fibonacci :: [Int]
+fibonacci =
+  1 : 1 : zipWith (+) fibonacci (tail fibonacci)
+"#,
+    r#"$F = $$$BODY"#,
+    r#"$F = undefined"#,
+  )?;
+  assert_eq!(
+    ret,
+    r#"
+fibonacci :: [Int]
+fibonacci = undefined
+"#
+  );
+
+  let ret = test_replace(
+    r#"
+flip :: (a -> b -> c) -> b -> a -> c
+flip f x y = f y x
+"#,
+    r#"$F :: $A -> $B"#,
+    r#"$F :: ($B) -> $A"#,
+  )?;
+  assert_eq!(
+    ret,
+    r#"
+flip :: (b -> a -> c) -> (a -> b -> c)
+flip f x y = f y x
+"#
+  );
+  Ok(())
+}

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/crates/language/src/lib.rs

@@ -13,6 +13,7 @@ mod csharp;
 mod css;
 mod elixir;
 mod go;
+mod haskell;
 mod html;
 mod json;
 mod kotlin;
@@ -109,6 +110,10 @@ impl_lang_expando!(Elixir, language_elixir, 'µ');
 // we can use any Unicode code point categorized as "Letter"
 // https://go.dev/ref/spec#letter
 impl_lang_expando!(Go, language_go, 'µ');
+// GHC supports Unicode syntax per
+// https://ghc.gitlab.haskell.org/ghc/doc/users_guide/exts/unicode_syntax.html
+// and the tree-sitter-haskell grammar parses it too.
+impl_lang_expando!(Haskell, language_haskell, 'µ');
 // tree-sitter-html uses locale dependent iswalnum for tagName
 // https://github.com/tree-sitter/tree-sitter-html/blob/b5d9758e22b4d3d25704b72526670759a9e4d195/src/scanner.c#L194
 impl_lang_expando!(Html, language_html, 'z');
@@ -152,6 +157,7 @@ pub enum SupportLang {
   Dart,
   Go,
   Elixir,
+  Haskell,
   Html,
   Java,
   JavaScript,
@@ -172,8 +178,8 @@ impl SupportLang {
   pub const fn all_langs() -> &'static [SupportLang] {
     use SupportLang::*;
     &[
-      Bash, C, Cpp, CSharp, Css, Dart, Elixir, Go, Html, Java, JavaScript, Json, Kotlin, Lua, Php,
-      Python, Ruby, Rust, Scala, Swift, Tsx, TypeScript,
+      Bash, C, Cpp, CSharp, Css, Dart, Elixir, Go, Haskell, Html, Java, JavaScript, Json, Kotlin,
+      Lua, Php, Python, Ruby, Rust, Scala, Swift, Tsx, TypeScript,
     ]
   }
 
@@ -225,6 +231,7 @@ const fn alias(lang: &SupportLang) -> &[&str] {
     Dart => &["dart"],
     Elixir => &["ex", "elixir"],
     Go => &["go", "golang"],
+    Haskell => &["hs", "haskell"],
     Html => &["html"],
     Java => &["java"],
     JavaScript => &["javascript", "js", "jsx"],
@@ -269,6 +276,7 @@ macro_rules! execute_lang_method {
       S::Dart => Dart.$method($($pname,)*),
       S::Elixir => Elixir.$method($($pname,)*),
       S::Go => Go.$method($($pname,)*),
+      S::Haskell => Haskell.$method($($pname,)*),
       S::Html => Html.$method($($pname,)*),
       S::Java => Java.$method($($pname,)*),
       S::JavaScript => JavaScript.$method($($pname,)*),
@@ -324,6 +332,7 @@ fn extensions(lang: &SupportLang) -> &[&str] {
     Dart => &["dart"],
     Elixir => &["ex", "exs"],
     Go => &["go"],
+    Haskell => &["hs"],
     Html => &["html", "htm", "xhtml"],
     Java => &["java"],
     JavaScript => &["cjs", "js", "mjs", "jsx"],

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/crates/language/src/parsers.rs

@@ -32,6 +32,9 @@ mod parser_implementation {
   pub fn language_go() -> TSLanguage {
     tree_sitter_go::language().into()
   }
+  pub fn language_haskell() -> TSLanguage {
+    tree_sitter_haskell::language().into()
+  }
   pub fn language_html() -> TSLanguage {
     tree_sitter_html::language().into()
   }
@@ -104,6 +107,7 @@ mod parser_implementation {
     language_dart,
     language_elixir,
     language_go,
+    language_haskell,
     language_html,
     language_java,
     language_javascript,

{ast_grep_cli-0.22.0 → ast_grep_cli-0.22.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ast-grep-cli"
-version = "0.22.0"
+version = "0.22.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" }]