From 7954412b70b96db99199daf9a38f2f173ca19d1d Mon Sep 17 00:00:00 2001
From: ArArgon <liaozping@gmail.com>
Date: Fri, 28 Jun 2024 14:14:20 -0700
Subject: [PATCH] chore: support address block scope matching

---
 .../src/semgrep-move-on-aptos/grammar.js      |  6 +++++
 .../test/corpus/semgrep.txt                   | 23 ++++++++++++++++++-
 .../src/tree-sitter-move-on-aptos             |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lang/semgrep-grammars/src/semgrep-move-on-aptos/grammar.js b/lang/semgrep-grammars/src/semgrep-move-on-aptos/grammar.js
index ed76ffe..b8ecdb7 100644
--- a/lang/semgrep-grammars/src/semgrep-move-on-aptos/grammar.js
+++ b/lang/semgrep-grammars/src/semgrep-move-on-aptos/grammar.js
@@ -79,6 +79,12 @@ module.exports = grammar(base_grammar, {
     _script_func_decl: ($, previous) => choice(previous, $.ellipsis),
     _script_spec_block: ($, previous) => choice(previous, $.ellipsis),
 
+    // Address block members
+    _address_member: ($, previous) => choice(
+      previous,
+      $.ellipsis,
+    ),
+
     // Spec block members
     _spec_block_member: ($, previous) => choice(
       previous,
diff --git a/lang/semgrep-grammars/src/semgrep-move-on-aptos/test/corpus/semgrep.txt b/lang/semgrep-grammars/src/semgrep-move-on-aptos/test/corpus/semgrep.txt
index c512d56..0cedbc7 100644
--- a/lang/semgrep-grammars/src/semgrep-move-on-aptos/test/corpus/semgrep.txt
+++ b/lang/semgrep-grammars/src/semgrep-move-on-aptos/test/corpus/semgrep.txt
@@ -442,4 +442,25 @@ script {
       (spec_block
         (ellipsis)))
     (declaration
-      (ellipsis))))
\ No newline at end of file
+      (ellipsis))))
+
+=======================
+Address Block
+=======================
+
+address $ADDR {
+  ...
+  module $MOD { ... }
+  ...
+}
+---
+
+(source_file
+  (address_block
+    (identifier)
+    (ellipsis)
+    (module
+      (identifier)
+      (declaration
+        (ellipsis)))
+    (ellipsis)))
\ No newline at end of file
diff --git a/lang/semgrep-grammars/src/tree-sitter-move-on-aptos b/lang/semgrep-grammars/src/tree-sitter-move-on-aptos
index 09e7c0f..e6d412d 160000
--- a/lang/semgrep-grammars/src/tree-sitter-move-on-aptos
+++ b/lang/semgrep-grammars/src/tree-sitter-move-on-aptos
@@ -1 +1 @@
-Subproject commit 09e7c0f3172686e6f7887fcf7170285211f7f3a6
+Subproject commit e6d412dcd503b99308f75b596da66c26f491ece8