ast-grep-py 0.39.3__tar.gz → 0.39.5__tar.gz

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/Cargo.lock

@@ -87,9 +87,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
 [[package]]
 name = "assert_cmd"
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -143,7 +143,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-config"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "ast-grep-core",
  "bit-set",
@@ -152,24 +152,24 @@ dependencies = [
  "schemars",
  "serde",
  "serde_yaml",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tree-sitter-typescript",
 ]
 
 [[package]]
 name = "ast-grep-core"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "bit-set",
  "regex",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tree-sitter",
  "tree-sitter-typescript",
 ]
 
 [[package]]
 name = "ast-grep-dynamic"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -177,13 +177,13 @@ dependencies = [
  "serde",
  "serde_yaml",
  "target-triple",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "tree-sitter",
 ]
 
 [[package]]
 name = "ast-grep-language"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "ast-grep-core",
  "ignore",
@@ -218,21 +218,25 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-lsp"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
+ "anyhow",
  "ast-grep-config",
  "ast-grep-core",
  "ast-grep-language",
  "dashmap",
+ "futures",
  "serde",
  "serde_json",
  "tokio",
+ "tokio-stream",
+ "tokio-util",
  "tower-lsp-server",
 ]
 
 [[package]]
 name = "ast-grep-napi"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "ast-grep-config",
  "ast-grep-core",
@@ -248,7 +252,7 @@ dependencies = [
 
 [[package]]
 name = "ast-grep-py"
-version = "0.39.3"
+version = "0.39.5"
 dependencies = [
  "anyhow",
  "ast-grep-config",
@@ -365,9 +369,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "clap"
-version = "4.5.42"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
+checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -375,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.42"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
+checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -387,18 +391,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.55"
+version = "4.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
+checksum = "4d9501bd3f5f09f7bbee01da9a511073ed30a80cd7a509f1214bb74eadea71ad"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.41"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -458,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "crokey"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5282b45c96c5978c8723ea83385cb9a488b64b7d175733f48d07bf9da514a863"
+checksum = "51360853ebbeb3df20c76c82aecf43d387a62860f1a59ba65ab51f00eea85aad"
 dependencies = [
  "crokey-proc_macros",
  "crossterm 0.29.0",
@@ -471,9 +475,9 @@ dependencies = [
 
 [[package]]
 name = "crokey-proc_macros"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ea0218d3fedf0797fa55676f1964ef5d27103d41ed0281b4bbd2a6e6c3d8d28"
+checksum = "3bf1a727caeb5ee5e0a0826a97f205a9cf84ee964b0b48239fef5214a00ae439"
 dependencies = [
  "crossterm 0.29.0",
  "proc-macro2",
@@ -583,9 +587,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4735f265ba6a1188052ca32d461028a7d1125868be18e287e756019da7607b5"
+checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb"
 dependencies = [
  "ctor-proc-macro",
  "dtor",
@@ -593,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "ctor-proc-macro"
-version = "0.0.5"
+version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d"
+checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2"
 
 [[package]]
 name = "dashmap"
@@ -655,18 +659,18 @@ dependencies = [
 
 [[package]]
 name = "dtor"
-version = "0.0.6"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8"
+checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934"
 dependencies = [
  "dtor-proc-macro",
 ]
 
 [[package]]
 name = "dtor-proc-macro"
-version = "0.0.5"
+version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
 
 [[package]]
 name = "dyn-clone"
@@ -722,6 +726,7 @@ checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
+ "futures-executor",
  "futures-io",
  "futures-sink",
  "futures-task",
@@ -744,6 +749,17 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.31"
@@ -1084,9 +1100,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "3.1.4"
+version = "3.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb4ea803c02e45ebdc6bb45627279e8bdc4e16662e442080cbbc97a8e54d49f7"
+checksum = "fc1d56eed08a179e1c5bedb1613c58e882087cec97fcaa7788cc42366335a41d"
 dependencies = [
  "anyhow",
  "bitflags 2.9.0",
@@ -1107,9 +1123,9 @@ checksum = "dcae8ad5609d14afb3a3b91dee88c757016261b151e9dcecabf1b2a31a6cab14"
 
 [[package]]
 name = "napi-derive"
-version = "3.1.2"
+version = "3.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e6d190d5e09d449b2b38127cdcdb7aed860599e492a15c73f977d5d87df69a5"
+checksum = "3a9ad4169931359f24cc9ad3fae4ab272f0390c59f7a764f7719b1b8a3dde1af"
 dependencies = [
  "convert_case 0.8.0",
  "ctor",
@@ -1121,9 +1137,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "2.0.3"
+version = "2.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15158ced16693eaa0c709e4c9768ca08eb56325691e68510db8440d27ccd41d1"
+checksum = "55a014314cb458d5832b4fc7d0041764ac136396447303d95e3fa0a5ea7cf5d3"
 dependencies = [
  "convert_case 0.8.0",
  "proc-macro2",
@@ -1280,9 +1296,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
  "anyhow",
  "indoc",
@@ -1298,19 +1314,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1318,9 +1333,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1330,9 +1345,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1343,9 +1358,9 @@ dependencies = [
 
 [[package]]
 name = "pythonize"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597907139a488b22573158793aa7539df36ae863eba300c75f3a0d65fc475e27"
+checksum = "11e06e4cff9be2bbf2bddf28a486ae619172ea57e79787f856572878c62dcfe2"
 dependencies = [
  "pyo3",
  "serde",
@@ -1397,9 +1412,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1534,9 +1549,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.141"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1676,9 +1691,9 @@ checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
 dependencies = [
  "fastrand",
  "getrandom",
@@ -1698,9 +1713,9 @@ dependencies = [
 
 [[package]]
 name = "termimad"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23646cdde4c2e9d6f2621424751b48653e5755f50163b2ff5ce3b32ebf17104"
+checksum = "68ff5ca043d65d4ea43b65cdb4e3aba119657d0d12caf44f93212ec3168a8e20"
 dependencies = [
  "coolor",
  "crokey",
@@ -1708,7 +1723,7 @@ dependencies = [
  "lazy-regex",
  "minimad",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
  "unicode-width 0.1.14",
 ]
 
@@ -1741,11 +1756,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.16",
 ]
 
 [[package]]
@@ -1761,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1793,13 +1808,36 @@ dependencies = [
  "mio 1.0.3",
  "pin-project-lite",
  "slab",
+ "tokio-macros",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.14"
+version = "0.7.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1819,9 +1857,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.23.2"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1dee9dc43ac2aaf7d3b774e2fba5148212bf2bd9374f4e50152ebe9afd03d42"
+checksum = "7211ff1b8f0d3adae1663b7da9ffe396eabe1ca25f0b0bee42b0da29a9ddce93"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1832,9 +1870,9 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
 dependencies = [
  "winnow",
 ]
@@ -2048,9 +2086,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-javascript"
-version = "0.23.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf40bf599e0416c16c125c3cec10ee5ddc7d1bb8b0c60fa5c4de249ad34dc1b1"
+checksum = "68204f2abc0627a90bdf06e605f5c470aa26fdcb2081ea553a04bdad756693f5"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2104,9 +2142,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-php"
-version = "0.23.11"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f066e94e9272cfe4f1dcb07a1c50c66097eca648f2d7233d299c8ae9ed8c130c"
+checksum = "0d8c17c3ab69052c5eeaa7ff5cd972dd1bc25d1b97ee779fec391ad3b5df5592"
 dependencies = [
  "cc",
  "tree-sitter-language",

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/Cargo.toml

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

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ast-grep-py
-Version: 0.39.3
+Version: 0.39.5
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/crates/core/src/match_tree/match_node.rs

@@ -295,6 +295,7 @@ mod test {
       "import { foo, } from 'bar'",
       M::Relaxed,
     );
+    matched("foo($A, $B)", "foo(1/*test*/, 2/*test*/)", M::Relaxed);
     unmatched(
       "import { foo } from 'bar'",
       "import { foo, bar, baz } from 'bar'",

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/crates/core/src/match_tree/strictness.rs

@@ -46,6 +46,15 @@ impl MatchStrictness {
       M::Signature => false,
     }
   }
+
+  fn should_skip_comment(&self) -> bool {
+    use MatchStrictness as M;
+    match self {
+      M::Cst | M::Smart | M::Ast => false,
+      M::Relaxed | M::Signature | M::Template => true,
+    }
+  }
+
   pub(crate) fn match_terminal(
     &self,
     is_named: bool,
@@ -62,16 +71,19 @@ impl MatchStrictness {
     if is_kind_matched && (!is_named || text == candidate.text()) {
       return MatchOneNode::MatchedBoth;
     }
+    if self.should_skip_comment() && skip_comment(candidate) {
+      return MatchOneNode::SkipCandidate;
+    }
     let (skip_goal, skip_candidate) = match self {
       M::Cst => (false, false),
       M::Smart => (false, !candidate.is_named()),
       M::Ast => (!is_named, !candidate.is_named()),
-      M::Relaxed => (!is_named, skip_comment_or_unnamed(candidate)),
+      M::Relaxed => (!is_named, !candidate.is_named()),
       M::Signature => {
         if is_kind_matched {
           return MatchOneNode::MatchedBoth;
         }
-        (!is_named, skip_comment_or_unnamed(candidate))
+        (!is_named, !candidate.is_named())
       }
       M::Template => {
         if text == candidate.text() {

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/crates/language/Cargo.toml

@@ -26,13 +26,13 @@ tree-sitter-elixir = { version = "0.3.0", optional = true }
 tree-sitter-go = { version = "0.23.0", optional = true }
 tree-sitter-haskell = { version = "0.23.0", optional = true }
 tree-sitter-html = { version = "0.23.0", optional = true }
-tree-sitter-javascript = { version = "0.23.0", optional = true }
+tree-sitter-javascript = { version = "0.25.0", optional = true }
 tree-sitter-java = { version = "0.23.0", optional = true }
 tree-sitter-json = { version = "0.23.0", optional = true }
 tree-sitter-kotlin = { version = "0.4.0", optional = true, package = "tree-sitter-kotlin-sg" }
 tree-sitter-lua = { version = "0.2.0", optional = true }
 tree-sitter-nix = { version = "0.3.0", optional = true }
-tree-sitter-php = { version = "0.23.11", optional = true }
+tree-sitter-php = { version = "0.24.0", optional = true }
 tree-sitter-python = { version = "0.23.0", optional = true }
 tree-sitter-ruby = { version = "0.23.0", optional = true }
 tree-sitter-rust = { version = "0.24.0", optional = true }

ast_grep_py-0.39.5/crates/language/src/hcl.rs

@@ -0,0 +1,61 @@
+#![cfg(test)]
+use super::*;
+use crate::test::{test_match_lang, test_replace_lang};
+
+fn test_match(s1: &str, s2: &str) {
+  test_match_lang(s1, s2, Hcl)
+}
+
+#[test]
+fn test_hcl_pattern() {
+  test_match("$A = $B", r#"foo = "bar""#);
+  test_match(
+    "resource $TYPE $NAME $BODY",
+    r#"resource "aws_instance" "example" { ami = "ami-123" }"#,
+  );
+  test_match(
+    "$BLOCK $BODY",
+    r#"terraform { required_providers { aws = { source = "hashicorp/aws" } } }"#,
+  );
+  test_match(
+    "variable $NAME $CONFIG",
+    r#"variable "region" { default = "us-west-2" }"#,
+  );
+  test_match(
+    "output $NAME $VALUE",
+    r#"output "instance_ip" { value = aws_instance.example.public_ip }"#,
+  );
+  test_match("$VAR = [$$$ITEMS]", r#"tags = ["production", "web"]"#);
+  test_match(
+    "$VAR = { $$$PAIRS }",
+    r#"labels = { environment = "prod", team = "backend" }"#,
+  );
+  test_match(r#"$VAR = "$CONTENT""#, r#"name = "instance""#);
+}
+
+fn test_replace(src: &str, pattern: &str, replacer: &str) -> String {
+  test_replace_lang(src, pattern, replacer, Hcl)
+}
+
+#[test]
+fn test_hcl_replace() {
+  let ret = test_replace(r#"foo = "bar""#, r#"$A = $B"#, r#"$B = $A"#);
+  assert_eq!(ret, r#""bar" = foo"#);
+
+  let ret = test_replace(
+    r#"resource "aws_instance" "example" { ami = "ami-123" }"#,
+    r#"resource $TYPE $NAME $BODY"#,
+    r#"resource $NAME $TYPE $BODY"#,
+  );
+  assert_eq!(
+    ret,
+    r#"resource "example" "aws_instance" { ami = "ami-123" }"#
+  );
+
+  let ret = test_replace(
+    r#"variable "region" { default = "us-west-2" }"#,
+    r#"variable "region" { default = $DEFAULT }"#,
+    r#"variable "region" { default = "eu-west-1" }"#,
+  );
+  assert_eq!(ret, r#"variable "region" { default = "eu-west-1" }"#);
+}

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/crates/language/src/lib.rs

@@ -276,8 +276,8 @@ impl SupportLang {
   pub const fn all_langs() -> &'static [SupportLang] {
     use SupportLang::*;
     &[
-      Bash, C, Cpp, CSharp, Css, Elixir, Go, Haskell, Hcl, Html, Java, JavaScript, Json, Kotlin, Lua,
-      Nix, Php, Python, Ruby, Rust, Scala, Solidity, Swift, Tsx, TypeScript, Yaml,
+      Bash, C, Cpp, CSharp, Css, Elixir, Go, Haskell, Hcl, Html, Java, JavaScript, Json, Kotlin,
+      Lua, Nix, Php, Python, Ruby, Rust, Scala, Solidity, Swift, Tsx, TypeScript, Yaml,
     ]
   }
 

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/crates/pyo3/Cargo.toml

@@ -23,8 +23,8 @@ ast-grep-config.workspace = true
 ast-grep-language.workspace = true
 ast-grep-dynamic.workspace = true
 anyhow.workspace = true
-pyo3 = { version = "0.25.0", optional = true, features = ["anyhow", "py-clone"] }
-pythonize = { version = "0.25.0", optional = true }
+pyo3 = { version = "0.26.0", optional = true, features = ["anyhow", "py-clone"] }
+pythonize = { version = "0.26.0", optional = true }
 serde.workspace = true
 
 # uncomment default features when developing pyo3

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/crates/pyo3/src/py_node.rs

@@ -29,7 +29,7 @@ unsafe impl Send for SgNode {}
 impl SgNode {
   /*----------  Node Inspection ----------*/
   fn range(&self) -> Range {
-    Python::with_gil(|py| {
+    Python::attach(|py| {
       let root = self.root.bind(py);
       let root = root.borrow();
       Range::from(&self.inner, &root.position)
@@ -254,7 +254,7 @@ impl SgNode {
   /*---------- Edit  ----------*/
   fn replace(&self, text: &str) -> Edit {
     let byte_range = self.inner.range();
-    Python::with_gil(|py| {
+    Python::attach(|py| {
       let root = self.root.bind(py);
       let root = root.borrow();
       let start_pos = root.position.byte_to_char(byte_range.start);
@@ -271,7 +271,7 @@ impl SgNode {
     edits.sort_by_key(|edit| edit.start_pos);
     let mut new_content = String::new();
     let old_content = self.text();
-    let converted: Vec<_> = Python::with_gil(move |py| {
+    let converted: Vec<_> = Python::attach(move |py| {
       let root = self.root.bind(py);
       let root = root.borrow();
       let conv = &root.position;

{ast_grep_py-0.39.3 → ast_grep_py-0.39.5}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "maturin"
 [project]
 name = "ast-grep-py"
 requires-python = ">=3.8"
-version = "0.39.3"
+version = "0.39.5"
 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" }]

ast_grep_py-0.39.3/crates/language/src/hcl.rs

@@ -1,47 +0,0 @@
-#![cfg(test)]
-use super::*;
-use crate::test::{test_match_lang,test_replace_lang};
-
-fn test_match(s1: &str, s2: &str) {
-  test_match_lang(s1, s2, Hcl)
-}
-
-#[test]
-fn test_hcl_pattern() {
-  test_match("$A = $B", "foo = \"bar\"");
-  test_match("resource $TYPE $NAME $BODY", "resource \"aws_instance\" \"example\" { ami = \"ami-123\" }");
-  test_match("$BLOCK $BODY", "terraform { required_providers { aws = { source = \"hashicorp/aws\" } } }");
-  test_match("variable $NAME $CONFIG", "variable \"region\" { default = \"us-west-2\" }");
-  test_match("output $NAME $VALUE", "output \"instance_ip\" { value = aws_instance.example.public_ip }");
-  test_match("$VAR = [$$$ITEMS]", "tags = [\"production\", \"web\"]");
-  test_match("$VAR = { $$$PAIRS }", "labels = { environment = \"prod\", team = \"backend\" }");
-  test_match("$VAR = \"$CONTENT\"", "name = \"instance\"");
-}
-
-fn test_replace(src: &str, pattern: &str, replacer: &str) -> String {
-  test_replace_lang(src, pattern, replacer, Hcl)
-}
-
-#[test]
-fn test_hcl_replace() {
-    let ret = test_replace(
-      "foo = \"bar\"",
-      "$A = $B",
-      "$B = $A"
-    );
-    assert_eq!(ret, "\"bar\" = foo");
-
-    let ret = test_replace(
-      "resource \"aws_instance\" \"example\" { ami = \"ami-123\" }",
-      "resource $TYPE $NAME $BODY",
-      "resource $NAME $TYPE $BODY",
-    );
-    assert_eq!(ret, "resource \"example\" \"aws_instance\" { ami = \"ami-123\" }");
-
-    let ret = test_replace(
-        "variable \"region\" { default = \"us-west-2\" }",
-        "variable \"region\" { default = $DEFAULT }",
-        "variable \"region\" { default = \"eu-west-1\" }",
-    );
-    assert_eq!(ret, "variable \"region\" { default = \"eu-west-1\" }");
-}