feat(keywords) add keyword.return & keyword.yield

23 files changed, 112 insertions, 25 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 909ad9eeb..d1dd66f6b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -136,6 +136,8 @@ effect on highlighting. We will work on improving highlighting in the near futur
 @keyword
 @keyword.function
 @keyword.operator (for operators that are English words, e.g. `and`, `or`)
+@keyword.return
+@keyword.yield
 @operator (for symbolic operators, e.g. `+`, `*`)
 @exception
 @include keywords for including modules (e.g. import/from in Python)
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 47ccdf72a..3161ca58d 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -528,6 +528,14 @@ For keywords used to define a fuction.
 `TSKeywordOperator`
 for operators that are English words, e.g. `and`, `as`, `or`.
 
+							  *hl-TSKeywordReturn*
+`TSKeywordReturn`
+for the `return` keyword.
+
+							   *hl-TSKeywordYield*
+`TSKeywordYield`
+for the `yield` keyword.
+
 								  *hl-TSLabel*
 `TSLabel`
 For labels: `label:` in C and `:label:` in Lua.
diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
index 176608622..9ffc5ac0e 100644
--- a/lua/nvim-treesitter/highlight.lua
+++ b/lua/nvim-treesitter/highlight.lua
@@ -46,6 +46,8 @@ hlmap["include"] = "TSInclude"
 hlmap["keyword"] = "TSKeyword"
 hlmap["keyword.function"] = "TSKeywordFunction"
 hlmap["keyword.operator"] = "TSKeywordOperator"
+hlmap["keyword.return"] = "TSKeywordReturn"
+hlmap["keyword.yield"] = "TSKeywordYield"
 
 hlmap["label"] = "TSLabel"
 
diff --git a/plugin/nvim-treesitter.vim b/plugin/nvim-treesitter.vim
index e9a630a22..30aba6699 100644
--- a/plugin/nvim-treesitter.vim
+++ b/plugin/nvim-treesitter.vim
@@ -63,6 +63,8 @@ highlight default link TSOperator Operator
 highlight default link TSKeyword Keyword
 highlight default link TSKeywordFunction Keyword
 highlight default link TSKeywordOperator TSOperator
+highlight default link TSKeywordReturn TSKeyword
+highlight default link TSKeywordYield TSKeyword
 highlight default link TSException Exception
 
 highlight default link TSType Type
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 3ff76e4c7..29fff0fc2 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -6,7 +6,6 @@
   "enum"
   "extern"
   "inline"
-  "return"
   "sizeof"
   "static"
   "struct"
@@ -18,6 +17,10 @@
 ] @keyword
 
 [
+  "return"
+] @keyword.return
+
+[
   "while"
   "for"
   "do"
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 0bf777f0d..d702187de 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -260,8 +260,6 @@
  "params"
  "operator"
  "default"
- "yield"
- "return"
  "abstract"
  "const"
  "extern"
@@ -288,3 +286,11 @@
  "where"
 ] @keyword
 
+[
+  "return"
+] @keyword.return
+
+[
+  "yield"
+] @keyword.yield
+
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index d873c9e52..343f6c905 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -182,11 +182,14 @@
     "in"
     "is"
     "new"
-    "return"
     "super"
     "with"
 ] @keyword
 
+[
+  "return"
+] @keyword.return
+
 
 ; Built in identifiers:
 ; alone these are marked as keywords
@@ -195,7 +198,6 @@
     "as"
     "async"
     "async*"
-    "yield"
     "sync*"
     "await"
     "covariant"
@@ -216,6 +218,10 @@
     "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 b202e3b4e..073a0d697 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -214,7 +214,6 @@
 "in"
 "instanceof"
 "let"
-"return"
 "set"
 "static"
 "switch"
@@ -223,10 +222,17 @@
 "var"
 "void"
 "with"
-"yield"
 ] @keyword
 
 [
+"return"
+] @keyword.return
+
+[
+"yield"
+] @keyword.yield
+
+[
  "function"
 ] @keyword.function
 
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 3a17ead21..bcac60a3e 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -76,11 +76,14 @@
 
 [
  "in"
- "return"
  (break)
  (continue)
 ] @keyword
 
+[
+ "return"
+] @keyword.return
+
 ;; Punctuation
 
 [
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index bc4bbd358..9bad6965f 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -70,7 +70,6 @@
   "print"
   "program"
   "read"
-  "return"
   "stop"
   "use"
   "write"
@@ -79,6 +78,10 @@
 ] @keyword
 
 [
+  "return"
+] @keyword.return
+
+[
   "else"
   "elseif"
   "endif"
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm