From e00e6edca063d40e876ddafe12f4de863d44e45c Mon Sep 17 00:00:00 2001
From: Andre Simon <as@andre-simon.de>
Date: Wed, 21 Jun 2017 11:05:22 +0200
Subject: [PATCH] fixed Bash variable highlighting

---
 ChangeLog        | 3 ++-
 langDefs/sh.lang | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a2d07b..4123cd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,9 @@ CHANGELOG Highlight
 
 highlight 3.38
 
-xx.xx.2017
+20.06.2017
 
+-fixed Bash variable highlighting issue
 -updated astyle code to release 3.0.1 (https://sourceforge.net/p/astyle/bugs/438/)
 -added bash_ref_man7_org.lua plugin
 
diff --git a/langDefs/sh.lang b/langDefs/sh.lang
index 63819ff..8596851 100644
--- a/langDefs/sh.lang
+++ b/langDefs/sh.lang
@@ -34,9 +34,9 @@ Keywords={
         "printenv", "lp", "tee", "mkfifo", "pathchk", "dd", "od", "hexdump", "m4"},
   },
   
-  -- FIXME issue with expressions like ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+  -- fixes issue with expressions like ${SHELL="${CONFIG_SHELL-/bin/sh}"}
   { Id=4,
-    Regex=[[\$\{.+?\}]],
+    Regex=[[\$\{.+\$\{.+?\}.+?\}|\$\{.+?\} ]],
   },
   { Id=4,
     Regex=[[ \$[\w\#]+ ]],
@@ -61,8 +61,6 @@ Comments={
 
 Operators=[[\(|\)|\[|\]|\{|\}|\,|\;|\:|\&|<|>|\!|\=|\/|\*|\%|\+|\-]]
 
--- FIXME: : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-
 function OnStateChange(oldState, newState, token)
 
    if oldState==HL_STRING and token==hereDoc then