From 8b1a843cb06967efd65a6495fce13160b69b87ad Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 22 Jan 2024 20:51:56 +0200
Subject: [PATCH] Update Scala tree-sitter grammar (#9348)

* Update Scala tree-sitter grammar

* Support block comments

Modify comment handling in textobjects and highlights to support new TS-scala node type 'block_comment'
---
 languages.toml                        | 2 +-
 runtime/queries/scala/highlights.scm  | 2 +-
 runtime/queries/scala/textobjects.scm | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/languages.toml b/languages.toml
index 1638cac496144..a785828c1e552 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1393,7 +1393,7 @@ language-servers = [ "metals" ]
 
 [[grammar]]
 name = "scala"
-source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "23d21310fe4ab4b3273e7a6810e781224a3e7fe1" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "7891815f42dca9ed6aeb464c2edc39d479ab965c" }
 
 [[language]]
 name = "dockerfile"
diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index 67603fdda3ca0..40b230ec44cca 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -263,7 +263,7 @@
 
 "return" @keyword.control.return
 
-(comment) @comment
+[(comment) (block_comment)] @comment
 
 ;; `case` is a conditional keyword in case_block
 
diff --git a/runtime/queries/scala/textobjects.scm b/runtime/queries/scala/textobjects.scm
index fe0b8c255fe65..6e551c417bf78 100644
--- a/runtime/queries/scala/textobjects.scm
+++ b/runtime/queries/scala/textobjects.scm
@@ -51,8 +51,8 @@
 
 ; Comment queries
 
-(comment) @comment.inside
-(comment) @comment.around ; Does not match consecutive block comments
+[(comment) (block_comment)] @comment.inside
+[(comment) (block_comment)] @comment.around ; Does not match consecutive block comments
 
 
 ; Test queries