From b426d7adae6ffb2b963ce73a4c3a208a07ea6c16 Mon Sep 17 00:00:00 2001
From: Volodymyr Chernetskyi <volodymyr_chernetskyi@goodyear.com>
Date: Mon, 19 Feb 2024 19:37:02 +0200
Subject: [PATCH] Add Groovy grammar (#9350)

* Add Groovy grammar

* Rewrite Neovim captures into Helix for Groovy

* Simplify Groovy injections

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Remove Neovim's spell from Groovy highlights

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Apply suggestions to languages.toml

* Escape backslash in groovy highlights.scm

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 13 ++++
 runtime/queries/groovy/highlights.scm | 96 +++++++++++++++++++++++++++
 runtime/queries/groovy/injections.scm |  2 +
 4 files changed, 112 insertions(+)
 create mode 100644 runtime/queries/groovy/highlights.scm
 create mode 100644 runtime/queries/groovy/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index f46c9f5e2de2..7aec37778080 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -65,6 +65,7 @@
 | gotmpl | ✓ |  |  | `gopls` |
 | gowork | ✓ |  |  | `gopls` |
 | graphql | ✓ |  |  | `graphql-lsp` |
+| groovy | ✓ |  |  |  |
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | haskell-persistent | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index e52dcabbcf0a..1c4c612673af 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3125,3 +3125,16 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "pkl"
 source = { git = "https://github.com/apple/tree-sitter-pkl", rev = "c03f04a313b712f8ab00a2d862c10b37318699ae" }
+
+[[language]]
+name = "groovy"
+language-id = "groovy"
+scope = "source.groovy"
+file-types = ["groovy", "jenkinsfile", { glob = "Jenkinsfile" },  { glob = "Jenkinsfile.*" }]
+shebangs = ["groovy"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "groovy"
+source = { git = "https://github.com/Decodetalkers/tree-sitter-groovy", rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec" }
diff --git a/runtime/queries/groovy/highlights.scm b/runtime/queries/groovy/highlights.scm
new file mode 100644
index 000000000000..4e94ccd3a1ee
--- /dev/null
+++ b/runtime/queries/groovy/highlights.scm
@@ -0,0 +1,96 @@
+(unit
+  (identifier) @variable)
+
+(string
+  (identifier) @variable)
+
+(escape_sequence) @constant.character.escape
+
+(block
+  (unit
+    (identifier) @namespace))
+
+(func
+  (identifier) @function)
+
+(number) @constant.numeric
+
+((identifier) @constant.builtin.boolean
+  (#any-of? @constant.builtin.boolean "true" "false"))
+
+((identifier) @constant
+  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "null"))
+
+((identifier) @type
+  (#any-of? @type
+    "String"
+    "Map"
+    "Object"
+    "Boolean"
+    "Integer"
+    "List"))
+
+((identifier) @function.builtin
+  (#any-of? @function.builtin
+    "void"
+    "id"
+    "version"
+    "apply"
+    "implementation"
+    "testImplementation"
+    "androidTestImplementation"
+    "debugImplementation"))
+
+((identifier) @keyword.storage.modifier
+  (#eq? @keyword.storage.modifier "static"))
+
+((identifier) @keyword.storage.type
+  (#any-of? @keyword.storage.type "class" "def" "interface"))
+
+((identifier) @keyword
+  (#any-of? @keyword
+    "assert"
+    "new"
+    "extends"
+    "implements"
+    "instanceof"))
+
+((identifier) @keyword.control.import
+  (#any-of? @keyword.control.import "import" "package"))
+
+((identifier) @keyword.storage.modifier
+  (#any-of? @keyword.storage.modifier
+    "abstract"
+    "protected"
+    "private"
+    "public"))
+
+((identifier) @keyword.control.exception
+  (#any-of? @keyword.control.exception
+    "throw"
+    "finally"
+    "try"
+    "catch"))
+
+(string) @string
+
+[
+  (line_comment)
+  (block_comment)
+] @comment
+
+((block_comment) @comment.block.documentation
+  (#match? @comment.block.documentation "^/[*][*][^*](?s:.)*[*]/$"))
+
+((line_comment) @comment.block.documentation
+  (#match? @comment.block.documentation "^///[^/]*.*$"))
+
+[
+  (operators)
+  (leading_key)
+] @operator
+
+["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
diff --git a/runtime/queries/groovy/injections.scm b/runtime/queries/groovy/injections.scm
new file mode 100644
index 000000000000..e4509a5fd317
--- /dev/null
+++ b/runtime/queries/groovy/injections.scm
@@ -0,0 +1,2 @@
+([(line_comment) (block_comment)] @injection.content
+ (#set! injection.language "comment"))