diff options
| author | Jaakko Paju | 2024-01-22 18:51:56 +0000 |
|---|---|---|
| committer | GitHub | 2024-01-22 18:51:56 +0000 |
| commit | 9ed3dc52e0d56f0f0fd721d7f10da5f935f56ef9 (patch) | |
| tree | 4fa2b6c45a5abcfbe1c1454d79bc5095163692b0 | |
| parent | 52a43bcdfcc258a2871be468a3e31496dd2d80c8 (diff) | |
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'
| -rw-r--r-- | languages.toml | 2 | ||||
| -rw-r--r-- | runtime/queries/scala/highlights.scm | 2 | ||||
| -rw-r--r-- | runtime/queries/scala/textobjects.scm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/languages.toml b/languages.toml index 1638cac4..a785828c 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 67603fdd..40b230ec 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 fe0b8c25..6e551c41 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 |