From 00857eaadcb9466c504efa16411dc6caa1c777a4 Mon Sep 17 00:00:00 2001
From: Lennard Hofmann <lennard.hofmann@web.de>
Date: Sat, 14 Nov 2020 09:54:25 +0100
Subject: [PATCH 1/2] sh.kak: Do not treat bitwise operator << as here-document
 start

---
 rc/filetype/sh.kak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rc/filetype/sh.kak b/rc/filetype/sh.kak
index 55ae3251..06565a8d 100644
--- a/rc/filetype/sh.kak
+++ b/rc/filetype/sh.kak
@@ -22,12 +22,14 @@ provide-module sh %§
 
 add-highlighter shared/sh regions
 add-highlighter shared/sh/code default-region group
+add-highlighter shared/sh/arithmetic region -recurse \(.*?\( (\$|(?<=for)\h*)\(\( \)\) group
 add-highlighter shared/sh/double_string region  %{(?<!\\)(?:\\\\)*\K"} %{(?<!\\)(?:\\\\)*"} group
 add-highlighter shared/sh/single_string region %{(?<!\\)(?:\\\\)*\K'} %{'} fill string
 add-highlighter shared/sh/expansion region -recurse (?<!\\)(?:\\\\)*\K\$\{ (?<!\\)(?:\\\\)*\K\$\{ \}|\n fill value
 add-highlighter shared/sh/comment region (?<!\\)(?:\\\\)*(?:^|\h)\K# '$' fill comment
 add-highlighter shared/sh/heredoc region -match-capture '<<-?\h*''?(\w+)''?' '^\t*(\w+)$' fill string
 
+add-highlighter shared/sh/arithmetic/expansion ref sh/double_string/expansion
 add-highlighter shared/sh/double_string/fill fill string
 
 evaluate-commands %sh{

From 8972f77f7840841a159655c25071c46d78ef35e1 Mon Sep 17 00:00:00 2001
From: Lennard Hofmann <lennard.hofmann@web.de>
Date: Sat, 14 Nov 2020 09:57:23 +0100
Subject: [PATCH 2/2] sh.kak: Highlight special parameters, e.g. $@, in double
 quotes

---
 rc/filetype/sh.kak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc/filetype/sh.kak b/rc/filetype/sh.kak
index 06565a8d..156cf69d 100644
--- a/rc/filetype/sh.kak
+++ b/rc/filetype/sh.kak
@@ -64,7 +64,7 @@ add-highlighter shared/sh/code/alias regex \balias(\h+[-+]\w)*\h+([\w-.]+)= 2:va
 add-highlighter shared/sh/code/function regex ^\h*(\S+)\h*\(\) 1:function
 
 add-highlighter shared/sh/code/unscoped_expansion regex (?<!\\)(?:\\\\)*\K\$(\w+|#|@|\?|\$|!|-|\*) 0:value
-add-highlighter shared/sh/double_string/expansion regex (?<!\\)(?:\\\\)*\K\$(\w+|\{.+?\}) 0:value
+add-highlighter shared/sh/double_string/expansion regex (?<!\\)(?:\\\\)*\K\$(\w+|#|@|\?|\$|!|-|\*|\{.+?\}) 0:value
 
 # Commands
 # ‾‾‾‾‾‾‾‾