fixed Bash variable highlighting

andre-simon · Jun 21, 2017 · e00e6ed · e00e6ed
1 parent 62c0282
commit e00e6ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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