Merge pull request #4718 from MidnightCommander/4715_fix_heredoc_highlighting

Ticket #4715: fix basic heredoc highlighting for shell syntax

Author: zyv

misc/syntax/sh.syntax

@@ -1091,11 +1091,19 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
 context # \n brown
     spellcheck
 
-context exclusive whole <<\[\s\]\[-\]\[\s\]\[\\\]EOF EOF green
-context exclusive whole <<\[\s\]\[-\]\[\s\]\[\\\]END END green
-
 context ' ' green
 
+# Basic support for heredocs with suppressed variable expansion: 'exclusive' keyword breaks the matching due
+# to a conflict with the rules for quotes, so remove it in all cases, including `\`, for consistency.
+wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'"\\
+context whole <<\[\s\]\[-\]\[\s\]\\EOF EOF green
+context whole <<\[\s\]\[-\]\[\s\]\\END END green
+context whole <<\[\s\]\[-\]\[\s\]'EOF' EOF green
+context whole <<\[\s\]\[-\]\[\s\]'END' END green
+context whole <<\[\s\]\[-\]\[\s\]"EOF" EOF green
+context whole <<\[\s\]\[-\]\[\s\]"END" END green
+wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
+
 context " " green
     keyword \\* brightgreen
     keyword \\@ brightgreen
@@ -1119,6 +1127,53 @@ context " " green
 
     keyword $ brightgreen
 
+# Basic support for heredocs with variable expansion
+context exclusive whole <<\[\s\]\[-\]\[\s\]EOF EOF green
+    keyword \\* brightgreen
+    keyword \\@ brightgreen
+    keyword \\$ brightgreen
+    keyword \\\\ brightgreen
+    keyword \\` brightgreen
+    keyword \\" brightgreen
+    keyword $(*) brightgreen
+    keyword ${*} brightgreen
+    keyword $\* brightred
+    keyword $@ brightred
+    keyword $# brightred
+    keyword $? brightred
+    keyword $- brightred
+    keyword $$ brightred
+    keyword $! brightred
+    keyword $_ brightred
+    keyword wholeright $\[0123456789\] brightred
+
+    keyword wholeright $+ brightgreen
+
+    keyword $ brightgreen
+
+context exclusive whole <<\[\s\]\[-\]\[\s\]END END green
+    keyword \\* brightgreen
+    keyword \\@ brightgreen
+    keyword \\$ brightgreen
+    keyword \\\\ brightgreen
+    keyword \\` brightgreen
+    keyword \\" brightgreen
+    keyword $(*) brightgreen
+    keyword ${*} brightgreen
+    keyword $\* brightred
+    keyword $@ brightred
+    keyword $# brightred
+    keyword $? brightred
+    keyword $- brightred
+    keyword $$ brightred
+    keyword $! brightred
+    keyword $_ brightred
+    keyword wholeright $\[0123456789\] brightred
+
+    keyword wholeright $+ brightgreen
+
+    keyword $ brightgreen
+
 context exclusive ` ` lightgray black
     keyword '*' green
     keyword " green