19 files changed, 19 insertions, 61 deletions

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 29fff0fc2..757dc232e 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -16,9 +16,7 @@
   "register"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 [
   "while"
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index d702187de..de5f72066 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -288,9 +288,6 @@
 
 [
   "return"
-] @keyword.return
-
-[
   "yield"
-] @keyword.yield
+] @keyword.return
 
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 343f6c905..9974d4095 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -188,6 +188,7 @@
 
 [
   "return"
+  "yield"
 ] @keyword.return
 
 
@@ -218,10 +219,6 @@
     "typedef"
 ] @keyword
 
-[
-  "yield"
-] @keyword.yield
-
 ; when used as an identifier:
 ((identifier) @variable.builtin
  (#any-of? @variable.builtin
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 073a0d697..7e96eb4ac 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -226,11 +226,8 @@
 
 [
 "return"
-] @keyword.return
-
-[
 "yield"
-] @keyword.yield
+] @keyword.return
 
 [
  "function"
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index bcac60a3e..fc5338b2e 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -80,9 +80,7 @@
  (continue)
 ] @keyword
 
-[
- "return"
-] @keyword.return
+"return" @keyword.return
 
 ;; Punctuation
 
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 9bad6965f..6ef4867e7 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -77,9 +77,7 @@
   (procedure_qualifier)
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 [
   "else"
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 8be07a0b4..2c88a52f3 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -126,6 +126,4 @@
   "puppetsync"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index c076b774c..5c6bdf94c 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -101,9 +101,7 @@
   "fallthrough"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 "for" @repeat
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index c494b687b..6a2cf2f40 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -187,11 +187,8 @@
 
 [
 "return"
-] @keyword.return
-
-[
 "yield"
-] @keyword.yield
+] @keyword.return
 
 [
  "new"
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 760d26bff..c24bd68b4 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -133,9 +133,7 @@
   "type"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 ((identifier) @keyword (#any-of? @keyword "global" "local"))
 
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index f47358e48..bdbe36293 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -121,9 +121,7 @@
  "throw"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 (null_literal) @keyword
 
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 53020c2d8..e15008e8a 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -58,9 +58,7 @@
  "goto"
 ] @keyword
 
-[
- "return"
-] @keyword.return
+"return" @keyword.return
 
 ;; Operators
 
diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index 760dd8f5f..d3dfff0b7 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -110,9 +110,7 @@
  "trait"
  ] @keyword
 
-[
- "return"
-] @keyword.return
+"return" @keyword.return
 
 [
  "case"
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index ce5970747..9d9f8a5bb 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -217,11 +217,8 @@
 
 [
   "return"
-] @keyword.return
-
-[
   "yield"
-] @keyword.yield
+] @keyword.return
 
 ["from" "import"] @include
 (aliased_import "as" @include)
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 718268aaf..af21c64ce 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -24,11 +24,8 @@
 
 [
  "return"
-] @keyword.return
-
-[
  "yield"
-] @keyword.yield
+] @keyword.return
 
 [
  "and"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 912ce2800..6258c2fa8 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -173,9 +173,7 @@
 (super)
 ] @keyword
 
-[
-"return"
-] @keyword.return
+"return" @keyword.return
 
 "fn" @keyword.function
 
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index cf074d1f0..8e9621242 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -20,7 +20,7 @@
 [ "if" "then" "elseif" "else" ] @conditional
 [ "for" "while" "repeat" "until" ] @repeat
 [ "in" "local" (break) (goto) "do" "end" ] @keyword
-[ "return" ] @keyword.return
+"return" @keyword.return
 (label) @label
 
 ;; Global isn't a real keyword, but it gets special treatment in these places
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 3e8df8339..1c9d3b6fd 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -27,9 +27,7 @@
   "assert"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 [
   "begin"
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index a76f65a98..bad60855c 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -112,9 +112,7 @@
   "while"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 "fn" @keyword.function