From 149fae4ce14d6c441b37d2824289977d1ffc3d2d Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:09:03 +0200
Subject: [PATCH 1/7] Fix block for ecma

---
 queries/ecma/textobjects.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/queries/ecma/textobjects.scm b/queries/ecma/textobjects.scm
index f84acc8f..2e5add1c 100644
--- a/queries/ecma/textobjects.scm
+++ b/queries/ecma/textobjects.scm
@@ -113,8 +113,7 @@
     ")") @call.outer)
 
 ; blocks
-(_
-  (statement_block) @block.inner) @block.outer
+(statement_block (_) @block.inner ) @block.outer
 
 ; parameters
 ; function ({ x }) ...

From cb364e1fcd3ae80ea888b5fcac18bb2d67d849bb Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:27:35 +0200
Subject: [PATCH 2/7] Fix block for rust

---
 queries/rust/textobjects.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/rust/textobjects.scm b/queries/rust/textobjects.scm
index 69aa90e9..f495e486 100644
--- a/queries/rust/textobjects.scm
+++ b/queries/rust/textobjects.scm
@@ -108,8 +108,8 @@
     "}")) @loop.outer
 
 ; blocks
-(_
-  (block) @block.inner) @block.outer
+(block 
+  (_)? @block.inner) @block.outer
 
 (unsafe_block
   (_)? @block.inner) @block.outer

From 35e171c92a3d89add816ca93cfe42275ee0c07a1 Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:29:06 +0200
Subject: [PATCH 3/7] Align ecma block with existing unsafe rust block

---
 queries/ecma/textobjects.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/ecma/textobjects.scm b/queries/ecma/textobjects.scm
index 2e5add1c..b1c3d1fc 100644
--- a/queries/ecma/textobjects.scm
+++ b/queries/ecma/textobjects.scm
@@ -113,7 +113,8 @@
     ")") @call.outer)
 
 ; blocks
-(statement_block (_) @block.inner ) @block.outer
+(statement_block 
+  (_)? @block.inner ) @block.outer
 
 ; parameters
 ; function ({ x }) ...

From d3c152110774676cb68779003d1385497e4db4ee Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:46:37 +0200
Subject: [PATCH 4/7] Attempt to satisfy linting for rust

---
 queries/rust/textobjects.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/rust/textobjects.scm b/queries/rust/textobjects.scm
index f495e486..32b1eb72 100644
--- a/queries/rust/textobjects.scm
+++ b/queries/rust/textobjects.scm
@@ -108,7 +108,7 @@
     "}")) @loop.outer
 
 ; blocks
-(block 
+(block
   (_)? @block.inner) @block.outer
 
 (unsafe_block

From 8824e3be4af073a18de20932f89e6479e546accd Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:47:16 +0200
Subject: [PATCH 5/7] Attempt to satisfy linting for ecma

---
 queries/ecma/textobjects.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/ecma/textobjects.scm b/queries/ecma/textobjects.scm
index b1c3d1fc..a26803d1 100644
--- a/queries/ecma/textobjects.scm
+++ b/queries/ecma/textobjects.scm
@@ -113,8 +113,8 @@
     ")") @call.outer)
 
 ; blocks
-(statement_block 
-  (_)? @block.inner ) @block.outer
+(statement_block
+  (_)? @block.inner) @block.outer
 
 ; parameters
 ; function ({ x }) ...

From f5e53e514c2959b283c4c4655fead323aed372a2 Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Thu, 28 Aug 2025 18:48:12 +0200
Subject: [PATCH 6/7] Capture all child nodes in block for rust

---
 queries/rust/textobjects.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/rust/textobjects.scm b/queries/rust/textobjects.scm
index 32b1eb72..6bffb50b 100644
--- a/queries/rust/textobjects.scm
+++ b/queries/rust/textobjects.scm
@@ -109,10 +109,10 @@
 
 ; blocks
 (block
-  (_)? @block.inner) @block.outer
+  (_)* @block.inner) @block.outer
 
 (unsafe_block
-  (_)? @block.inner) @block.outer
+  (_)* @block.inner) @block.outer
 
 ; calls
 (macro_invocation) @call.outer

From 2dea4bb5772b3dc78a6b35951620ae616a90af0b Mon Sep 17 00:00:00 2001
From: oiiiiiiii <63345269+oiiiiiiii@users.noreply.github.com>
Date: Thu, 28 Aug 2025 18:48:39 +0200
Subject: [PATCH 7/7] Capture all child nodes in block for rust

---
 queries/ecma/textobjects.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/ecma/textobjects.scm b/queries/ecma/textobjects.scm
index a26803d1..7e653661 100644
--- a/queries/ecma/textobjects.scm
+++ b/queries/ecma/textobjects.scm
@@ -114,7 +114,7 @@
 
 ; blocks
 (statement_block
-  (_)? @block.inner) @block.outer
+  (_)* @block.inner) @block.outer
 
 ; parameters
 ; function ({ x }) ...