polyglot-piranha 0.3.3__tar.gz → 0.3.4__tar.gz

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/Cargo.lock

@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -106,9 +106,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bstr"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
 dependencies = [
  "memchr",
  "once_cell",
@@ -130,9 +130,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.2.4"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62"
+checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -141,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.2.4"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749"
+checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
 dependencies = [
  "anstream",
  "anstyle",
@@ -154,21 +154,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.2.0"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "colorchoice"
@@ -405,6 +405,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -471,9 +477,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi 0.3.1",
  "libc",
@@ -531,15 +537,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "lock_api"
@@ -631,7 +637,7 @@ dependencies = [
 
 [[package]]
 name = "piranha"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "assert_cmd",
  "cc",
@@ -640,6 +646,7 @@ dependencies = [
  "derive_builder",
  "env_logger",
  "getset",
+ "glob",
  "itertools",
  "json",
  "jwalk",
@@ -721,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
@@ -801,9 +808,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
@@ -878,9 +885,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -895,9 +902,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "remove_dir_all"
@@ -910,9 +917,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.14"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
  "bitflags",
  "errno",
@@ -936,19 +943,19 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.17",
 ]
 
 [[package]]
@@ -964,9 +971,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
 dependencies = [
  "serde",
 ]
@@ -996,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "45b6ddbb36c5b969c182aec3c4a0bce7df3fbad4b77114706a49aacc80567388"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1007,9 +1014,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.6"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"
+checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
 
 [[package]]
 name = "tempdir"
@@ -1038,9 +1045,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -1050,18 +1057,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
 dependencies = [
  "indexmap",
  "serde",
@@ -1120,7 +1127,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-swift"
 version = "0.3.6"
-source = "git+https://github.com/satyam1749/tree-sitter-swift.git?rev=c92496b5273e4d3b094148fee51de371c94729bf#c92496b5273e4d3b094148fee51de371c94729bf"
+source = "git+https://github.com/satyam1749/tree-sitter-swift.git?rev=895cd7814488cb32cf73f68a75458b4bc6d50a85#895cd7814488cb32cf73f68a75458b4bc6d50a85"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -1157,9 +1164,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
 [[package]]
 name = "unindent"
@@ -1353,9 +1360,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.1"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
 dependencies = [
  "memchr",
 ]

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/Cargo.toml

@@ -7,7 +7,7 @@ authors = [
 ]
 name = "piranha"
 description = "Polyglot Piranha is a library for performing structural find and replace with deep cleanup."
-version = "0.3.3"
+version = "0.3.4"
 edition = "2021"
 include = ["pyproject.toml", "src/"]
 exclude = ["legacy"]
@@ -28,6 +28,7 @@ path = "src/main.rs"
 name = "polyglot_piranha"
 path = "src/lib.rs"
 crate-type = ["cdylib", "rlib"]
+doctest = false
 
 [build-dependencies]
 cc = "1.0.73"
@@ -53,7 +54,7 @@ tree-sitter-kotlin = { git = "https://github.com/ketkarameya/tree-sitter-kotlin.
 # TODO: Update after next version is released (https://github.com/tree-sitter/tree-sitter-java/issues/146)
 tree-sitter-java = { git = "https://github.com/tree-sitter/tree-sitter-java.git", rev = "c194ee5e6ede5f26cf4799feead4a8f165dcf14d" }
 # TODO: Update after: https://github.com/alex-pinkus/tree-sitter-swift/issues/278 resolves
-tree-sitter-swift = { git = "https://github.com/satyam1749/tree-sitter-swift.git", rev = "c92496b5273e4d3b094148fee51de371c94729bf" }
+tree-sitter-swift = { git = "https://github.com/satyam1749/tree-sitter-swift.git", rev = "895cd7814488cb32cf73f68a75458b4bc6d50a85" }
 tree-sitter-python = "0.20.2"
 tree-sitter-typescript = "0.20.1"
 # TODO: Update after https://github.com/tree-sitter/tree-sitter-go/pull/103 lands
@@ -63,6 +64,7 @@ derive_builder = "0.12.0"
 getset = "0.1.2"
 pyo3 = "0.18.2"
 pyo3-log = "0.8.1"
+glob = "0.3.1"
 
 [features]
 extension-module = ["pyo3/extension-module"]

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyglot_piranha
-Version: 0.3.3
+Version: 0.3.4
 License-File: LICENSE
 License-File: LICENSE
 License-File: NOTICE
@@ -10,9 +10,9 @@ Author: Uber Technologies Inc.
 Author-email: Ameya Ketkar <ketkara@uber.com>, Lazaro Clapp <lazaro@uber.com>
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: repository, https://github.com/uber/piranha
 Project-URL: homepage, https://github.com/uber/piranha
 Project-URL: documentation, https://github.com/uber/piranha
+Project-URL: repository, https://github.com/uber/piranha
 
 # Piranha
 

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/src/cleanup_rules/go/rules.toml

@@ -452,10 +452,10 @@ replace_node = "short_v_decl"
 is_seed_rule = false
 # Check if there is an assignment to @variable_name with a value other than @value
 # Note that the query is against a short_var_declaration while
-# the constraint is against an assigment_statement
-[[rules.constraints]]
-matcher = "(block) @block"
-queries = ["""
+# the filter is against an assigment_statement
+[[rules.filters]]
+enclosing_node = "(block) @block"
+not_contains = ["""
 (
     (assignment_statement
         left: (expression_list
@@ -482,9 +482,9 @@ replace = "@value"
 replace_node = "identifier"
 holes = ["variable_name", "value"]
 is_seed_rule = false
-[[rules.constraints]]
-matcher = "(block) @block"
-queries = ["""
+[[rules.filters]]
+enclosing_node = "(block) @block"
+not_contains = ["""
 (
     [
         (short_var_declaration

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/src/cleanup_rules/go/scope_config.toml

@@ -12,15 +12,15 @@
 [[scopes]]
 name = "File"
 [[scopes.rules]]
-matcher = """
+enclosing_node = """
 (source_file) @source_file
 """
-generator = """(source_file) @sf"""
+scope = """(source_file) @sf"""
 
 [[scopes]]
 name = "Function-Method"
 [[scopes.rules]]
-matcher = """
+enclosing_node = """
 (
     (
         [
@@ -36,7 +36,7 @@ matcher = """
     ) @f_decl1
 )
 """
-generator = """
+scope = """
 (
     (
         [

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/src/cleanup_rules/java/rules.toml

@@ -486,9 +486,9 @@ query = """
 replace = ""
 replace_node = "enum_declaration"
 is_seed_rule = false
-[[rules.constraints]]
-matcher = "(enum_declaration) @ed"
-queries = ["(enum_constant) @ec"]
+[[rules.filters]]
+enclosing_node = "(enum_declaration) @ed"
+not_contains = ["(enum_constant) @ec"]
 
 
 # This rule deltes all the content of the file if it contains 
@@ -503,9 +503,9 @@ query = """(
 replace = ""
 replace_node = "program"
 is_seed_rule = false
-[[rules.constraints]]
-matcher = "(program) @c_program"
-queries = [
+[[rules.filters]]
+enclosing_node = "(program) @c_program"
+not_contains = [
   "(enum_declaration) @c_enum_declaration",
   "(class_declaration) @c_class_declaration",
   "(interface_declaration) @c_interface_declaration",
@@ -555,11 +555,11 @@ is_seed_rule = false
 
 # Check if there is no assignment where the variable @variable_name is 
 # assigned to a value other than @init, within the method body
-# Please note that the tree-sitter queries in the constraint uses holes (i.e. `@variable_name` and `@init`).
+# Please note that the tree-sitter queries in the filter uses holes (i.e. `@variable_name` and `@init`).
 # These holes will be filled contextually based on the code snippet matched to `rule.query
-[[rules.constraints]]
-matcher = "[(method_declaration) (constructor_declaration)] @md"
-queries = ["""
+[[rules.filters]]
+enclosing_node = "[(method_declaration) (constructor_declaration)] @md"
+not_contains = ["""
 (
 ((assignment_expression
                     left: (_) @a.lhs
@@ -586,9 +586,9 @@ is_seed_rule = false
 
 # Check if there is no assignment where the variable @variable_name is 
 # assigned to a value other than @init, within the method body
-[[rules.constraints]]
-matcher = "(class_declaration) @cd"
-queries = ["""(
+[[rules.filters]]
+enclosing_node = "(class_declaration) @cd"
+not_contains = ["""(
 ((assignment_expression
                     left: (_) @a.lhs
                     right: (_) @a.rhs) @assignment)
@@ -617,9 +617,9 @@ is_seed_rule = false
 holes = ["variable_name", "init"]
 # The enclosing methode declaration should not contain a local variable decalration named "@variable_name"
 # which is initialized to "@init".
-[[rules.constraints]]
-matcher = "[(method_declaration) (constructor_declaration)] @md"
-queries = ["""(
+[[rules.filters]]
+enclosing_node = "[(method_declaration) (constructor_declaration)] @md"
+not_contains = ["""(
 ((local_variable_declaration 
                 declarator: (variable_declarator 
                                     name: (_) @vdcl.lhs
@@ -645,9 +645,9 @@ replace = ""
 replace_node = "expression_statement"
 is_seed_rule = false
 # The enclosing methode declaration should not contain a local variable decalration named "@variable_name"
-[[rules.constraints]]
-matcher = "(method_declaration) @md"
-queries = [
+[[rules.filters]]
+enclosing_node = "(method_declaration) @md"
+not_contains = [
   """(
 ((local_variable_declaration
                 declarator: (variable_declarator 
@@ -656,11 +656,11 @@ queries = [
 (#eq? @vdcl.lhs "@variable_name")
 )""",
 ]
-[[rules.constraints]]
+[[rules.filters]]
 # There should exist no field declaration named `@variable_name` and
 # there should be no assignments to @variable_name that are not same as `@init`.
-matcher = "(class_declaration) @cd"
-queries = ["""(
+enclosing_node = "(class_declaration) @cd"
+not_contains = ["""(
 ((assignment_expression
                     left: (_) @a.lhs
                     right: (_) @a.rhs) @a)
@@ -677,7 +677,7 @@ queries = ["""(
 
 # Replace identifier with value if :
 # (i) There is no local variable declaration in the enclosing method with the name as the identifier 
-# TODO: Add field constraint
+# TODO: Add field filter
 [[rules]]
 name = "replace_identifier_with_value"
 query = """
@@ -690,10 +690,10 @@ replace = "@init"
 replace_node = "identifier"
 holes = ["variable_name", "init"]
 is_seed_rule = false
-[[rules.constraints]]
+[[rules.filters]]
 # There should exist no local variable declaration named `@identifer`
-matcher = "[(method_declaration) (constructor_declaration)] @md"
-queries = ["""(
+enclosing_node = "[(method_declaration) (constructor_declaration)] @md"
+not_contains = ["""(
 ((local_variable_declaration 
                 declarator: (variable_declarator 
                                     name: (_) @vdcl.lhs

{polyglot_piranha-0.3.3 → polyglot_piranha-0.3.4}/src/cleanup_rules/java/scope_config.toml

@@ -17,11 +17,11 @@
 # Each language has a syntax to define methods, classes, functions, therefore capturing such scopees is language dependent. 
 # This file allows users to define these language dependent scopes. 
 # Each scope consists of a scope name and a list of scope rules. 
-# Each scope rule consists of a `matcher` and a `generator`. 
+# Each scope rule consists of a `enclosing_node` and a `scope`.
 
 # When Piranha encounters a "Method" or "Class" scope, it looks up these configurations to obtain the list of scope rules. 
 # It then applies each `scope.rules.matcher` to the ancestors of changed node in the previous edit.
-# Upon finding the match (it short-circuits), Piranha substitutes the tags in `scope.rules.generator` based on the tag matches obtained from 
+# Upon finding the match (it short-circuits), Piranha substitutes the tags in `scope.rulesscope` based on the tag matches obtained from
 # matching `scope.rules.matcher` to create a context specific rule for the changed node.
 
 [[scopes]]
@@ -35,7 +35,7 @@ name = "Method"
 #
 # To capture the signature of the enclosing method, Piranha will match the below rule against the method.
 # This will result in matches - { n: "foo", fp: "int a, int b, int c, int d, int e"} 
-# Substituting these matches in the `scopes.rules.generator` will result in : 
+# Substituting these matches in the `scopes.rulesscope` will result in :
 #
 #(((method_declaration 
 #           name : (_) @z
@@ -45,7 +45,7 @@ name = "Method"
 # (#eq? @tp "int a, int b, int c, int d, int e")
 # )
 #
-matcher = """
+enclosing_node = """
 (
   [(method_declaration 
             name : (_) @n
@@ -56,7 +56,7 @@ matcher = """
             
   ]          
             @xdn)"""
-generator = """
+scope = """
 (
   [(((method_declaration 
             name : (_) @z
@@ -73,17 +73,17 @@ generator = """
   ]
 )@qdn"""
 
-# Scope generators for Java Class.
+# Scope generator for Java Class.
 [[scopes]]
 name = "Class"
 [[scopes.rules]]
-matcher = """(
+enclosing_node = """(
   [
     (class_declaration name:(_) @n) @c
     (enum_declaration name:(_) @n) @c
   ]
 )"""
-generator = """(
+scope = """(
   [
     ((class_declaration name:(_) @z) @qc)
     ((enum_declaration name:(_) @z) @qc)
@@ -96,7 +96,7 @@ generator = """(
 [[scopes]]
 name = "File"
 [[scopes.rules]]
-matcher = """
+enclosing_node = """
 (program) @c_u
 """
-generator = "(program) @compilation_unit"
+scope = "(program) @compilation_unit"