From b09d645098844d1fc250ef8c7087846e4bdae32f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 8 Nov 2023 15:00:36 +0200
Subject: fix(kotlin): improve highlights

Co-authored-by: Anthony Shi <69449791+anthony-S93@users.noreply.github.com>
---
 queries/kotlin/highlights.scm | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'queries')

diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index f7b1b8c4d..36bf148f9 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -14,11 +14,15 @@
 ((simple_identifier) @variable.builtin
 (#eq? @variable.builtin "field"))
 
-; `this` this keyword inside classes
-(this_expression) @variable.builtin
+[
+	"this"
+	"super"
+	"this@"
+	"super@"
+] @variable.builtin
 
-; `super` keyword inside classes
-(super_expression) @variable.builtin
+; NOTE: for consistency with "super@"
+(super_expression "@" @variable.builtin)
 
 (class_parameter
 	(simple_identifier) @property)
@@ -114,8 +118,6 @@
 		(type_identifier) @function)?
 		(#lua-match? @_import "^[a-z]"))
 
-; TODO: Separate labeled returns/breaks/continue/super/this
-;       Must be implemented in the parser first
 (label) @label
 
 ;;; Function definitions
@@ -309,14 +311,13 @@
 ] @keyword
 
 [
-  "suspend"
-] @keyword.coroutine
+	"return"
+	"return@"
+] @keyword.return
 
-[
-  "fun"
-] @keyword.function
+"suspend" @keyword.coroutine
 
-(jump_expression) @keyword.return
+"fun" @keyword.function
 
 [
 	"if"
@@ -328,6 +329,10 @@
 	"for"
 	"do"
 	"while"
+	"continue"
+	"continue@"
+	"break"
+	"break@"
 ] @repeat
 
 [
@@ -412,6 +417,10 @@
 	"::"
 ] @punctuation.delimiter
 
+(super_expression [ "<" ">" ] @punctuation.delimiter)
+(type_arguments [ "<" ">" ] @punctuation.delimiter)
+(type_parameters [ "<" ">" ] @punctuation.delimiter)
+
 ; NOTE: `interpolated_identifier`s can be highlighted in any way
 (string_literal
 	"$" @punctuation.special
-- 
cgit v1.2.3-70-g09d2