From 48a07888de6078c7d9690de8188e3e4d8fdd4ace Mon Sep 17 00:00:00 2001
From: Yerlan <yerlaser@gmail.com>
Date: Wed, 19 May 2021 22:44:27 +0200
Subject: [PATCH] Fixing strings in Dart

1. Deleted back-tick strings which are not a valid Dart syntax
2. Added string interpolation for ${}
3. NOT adding string interpolation for $var as this is considered a bad practice
---
 rc/filetype/dart.kak | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/rc/filetype/dart.kak b/rc/filetype/dart.kak
index 8cf7d652..a11dbb8d 100644
--- a/rc/filetype/dart.kak
+++ b/rc/filetype/dart.kak
@@ -39,14 +39,19 @@ provide-module dart %§
 
 add-highlighter shared/dart regions
 add-highlighter shared/dart/code default-region group
-add-highlighter shared/dart/back_string region '`' '`' fill string
-add-highlighter shared/dart/double_string region '"' (?<!\\)(\\\\)*" fill string
-add-highlighter shared/dart/single_string region "'" (?<!\\)(\\\\)*' fill string
+add-highlighter shared/dart/double_string region '"' (?<!\\)(\\\\)*" group
+add-highlighter shared/dart/single_string region "'" (?<!\\)(\\\\)*' group
 add-highlighter shared/dart/comment region /\* \*/ fill comment
 add-highlighter shared/dart/comment_line region '//' $ fill comment
 
 add-highlighter shared/dart/code/ regex %{-?([0-9]*\.(?!0[xX]))?\b([0-9]+|0[xX][0-9a-fA-F]+)\.?([eE][+-]?[0-9]+)?i?\b} 0:value
 
+# String interpolation
+add-highlighter shared/dart/double_string/ fill string
+add-highlighter shared/dart/double_string/ regex \$\{.*?\} 0:value
+add-highlighter shared/dart/single_string/ fill string
+add-highlighter shared/dart/single_string/ regex \$\{.*?\} 0:value
+
 evaluate-commands %sh{
     # Grammar
     keywords="abstract|do|import|super|as|in|switch|assert|else|interface|async"