diff --git a/languages.toml b/languages.toml
index 08d02a49ef00..e276b9341780 100644
--- a/languages.toml
+++ b/languages.toml
@@ -606,6 +606,7 @@ indent = { tab-width = 4, unit = "    " }
 name = "julia"
 source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "fc60b7cce87da7a1b7f8cb0f9371c3dc8b684500" }
 
+
 [[language]]
 name = "java"
 scope = "source.java"
@@ -1835,3 +1836,23 @@ roots = []
 [[grammar]]
 name = "wast"
 source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f9d709847bf7a3de0942a84e912f59088", subpath = "wast" }
+
+
+[[language]]
+name = "groovy"
+scope = "source.groovy"
+injection-regex = "groovy"
+file-types = ["groovy", "gvy", "gy", "gsh"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "java", args = ["-jar", "/Users/zephaniahong/Desktop/groovy-language-server/build/libs/groovy-language-server-all.jar"]}
+roots = []
+
+[[grammar]]
+name = "groovy"
+source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "bd6186c24d5eb13b4623efac9d944dcc095c0dad" }
+
+# [[grammar]]
+# name = "groovy"
+# source = { git = "https://github.com/codieboomboom/tree-sitter-groovy", rev = "de8e0c727a0de8cbc6f4e4884cba2d4e7c740570" }
+
diff --git a/runtime/queries/groovy/highlights.scm b/runtime/queries/groovy/highlights.scm
new file mode 100644
index 000000000000..dd0b7e570430
--- /dev/null
+++ b/runtime/queries/groovy/highlights.scm
@@ -0,0 +1 @@
+; inherits: java
\ No newline at end of file
diff --git a/runtime/queries/groovy/injections.scm b/runtime/queries/groovy/injections.scm
new file mode 100644
index 000000000000..dd0b7e570430
--- /dev/null
+++ b/runtime/queries/groovy/injections.scm
@@ -0,0 +1 @@
+; inherits: java
\ No newline at end of file