From c7f7e01bba1216c6d152b80ada242a8e36667f86 Mon Sep 17 00:00:00 2001
From: Yerlan <yerlaser@gmail.com>
Date: Mon, 17 May 2021 20:45:48 +0200
Subject: [PATCH] Kotlin: string interpolation and character literal

Adding highlighting for string interpolation inside double-quoted strings and character literals inside single-quotes.

Avoiding string interpolation in the form of $var as this is considered bad practice.
---
 rc/filetype/kotlin.kak | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rc/filetype/kotlin.kak b/rc/filetype/kotlin.kak
index c531dfe8..a57fd1ef 100644
--- a/rc/filetype/kotlin.kak
+++ b/rc/filetype/kotlin.kak
@@ -55,8 +55,8 @@ provide-module kotlin %§
 
 add-highlighter shared/kotlin regions
 add-highlighter shared/kotlin/code default-region group
-add-highlighter shared/kotlin/string region %{(?<!')"} %{(?<!\\)(\\\\)*"} fill string
-add-highlighter shared/kotlin/character region %{(?<!")'} %{(?<!\\)(\\\\)*'} fill string
+add-highlighter shared/kotlin/string region %{(?<!')"} %{(?<!\\)(\\\\)*"} group
+add-highlighter shared/kotlin/character region %{(?<!")'} %{(?<!\\)(\\\\)*'} fill value
 add-highlighter shared/kotlin/comment region /\* \*/ fill comment
 add-highlighter shared/kotlin/inline_documentation region /// $ fill documentation
 add-highlighter shared/kotlin/line_comment region // $ fill comment
@@ -65,6 +65,10 @@ add-highlighter shared/kotlin/code/annotations regex @\w+\b|\b\w+@(?=\{) 0:meta
 add-highlighter shared/kotlin/code/identifiers regex \b(field|it)\b 1:variable
 add-highlighter shared/kotlin/code/fields      regex \.([A-Za-z_][\w]*)\s*?\. 1:type
 
+# String interpolation
+add-highlighter shared/kotlin/string/ fill string
+add-highlighter shared/kotlin/string/ regex \$\{.*?\} 0:value
+
 # As at 15 March 2021, method see: https://regex101.com/r/Mhy4HG/1
 add-highlighter shared/kotlin/code/methods     regex ::([A-Za-z_][\w]*)|\.([A-Za-z_][\w]*)\s*?[\(\{]|\.([A-Za-z_][\w]*)[\s\)\}>](?=[^\(\{]) 1:function 2:function 3:function