From 2cd1eb6e2ab84be495feb2132094705e29ad33a8 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Thu, 11 Mar 2021 00:57:54 +0100
Subject: Update Kotlin parser

---
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua | 17 +++++++----------
 queries/kotlin/highlights.scm   |  7 ++++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5d41e9ef..51b5de47 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "0ba7a24b062b671263ae08e707e9e94383b25bb7"
   },
   "kotlin": {
-    "revision": "bfb1e2776b48139caa3125e2791c27340bfa34c2"
+    "revision": "5f4c8b4a9af6c246b5a181fc73f10cce2e9df700"
   },
   "ledger": {
     "revision": "609d5e5ab5955823b3faeaec8d2afc91860c639a"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f1c79611..bdfbf294 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -148,16 +148,13 @@ list.java = {
   maintainers = {"@p00f"},
 }
 
----Parser generation from source does not terminate in reasonable time
---list.kotlin = {
-  --install_info = {
-    --url = "https://github.com/QthCN/tree-sitter-kotlin",
-    --files = { "src/parser.c" },
-    --requires_generate_from_grammar  = true,
-    --generate_requires_npm = true,
-  --},
-  --maintainers = {"@tormodatt"},
---}
+list.kotlin = {
+  install_info = {
+    url = "https://github.com/tormodatt/tree-sitter-kotlin",
+    files = { "src/parser.c" },
+  },
+  maintainers = {"@tormodatt"},
+}
 
 list.html = {
   install_info = {
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 655ac798..5ac5a7e5 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -70,9 +70,10 @@
 (type_identifier) @type
 
 ;; Annotations
-(annotation (single_annotation) @attribute)
-(single_annotation (user_type (type_identifier) @attribute))
-(single_annotation (constructor_invocation (user_type (type_identifier) @attribute)))
+;; TODO:
+;(annotation (single_annotation) @attribute)
+;(single_annotation (user_type (type_identifier) @attribute))
+;(single_annotation (constructor_invocation (user_type (type_identifier) @attribute)))
 
 
 ;; it
-- 
cgit v1.2.3