#137 Treat "<<" in arithmetic contexts as left bitwise shift operator instead of here-doc.

zufuliu · nyamatongwe · commit 682f573d28eb · 2023-05-11T15:58:25.000+10:00
diff --git a/doc/LexillaHistory.html b/doc/LexillaHistory.html
@@ -610,6 +610,10 @@ <h3>
 	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
 	</li>
 	<li>
+	Bash: treat "&lt;&lt;" in arithmetic contexts as left bitwise shift operator instead of here-doc.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/137">Issue #137</a>.
+	</li>
+	<li>
 	Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed.
 	<a href="https://github.com/ScintillaOrg/lexilla/issues/148">Issue #148</a>.
 	</li>
diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx
@@ -876,7 +876,7 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 				} else {
 					continue;	// scalar has no delimiter pair
 				}
-			} else if (sc.Match('<', '<')) {
+			} else if (cmdState != CmdState::Arithmetic && sc.Match('<', '<')) {
 				sc.SetState(SCE_SH_HERE_DELIM);
 				HereDoc.State = 0;
 				if (sc.GetRelative(2) == '-') {	// <<- indent case
diff --git a/test/examples/bash/x.bsh b/test/examples/bash/x.bsh
@@ -31,4 +31,9 @@ while read -r f; do
   } >> $OUT_FILE
 done
 
+# Issue 137, should be shift but here-doc was detected
+echo $(( x << END ))
+pwd
+END
+
 INVALID_NUMBER=0#0000
diff --git a/test/examples/bash/x.bsh.folded b/test/examples/bash/x.bsh.folded
@@ -31,5 +31,10 @@
  0 402   0 |   } >> $OUT_FILE
  0 401   0 | done
  1 400   0   
+ 0 400   0   # Issue 137, should be shift but here-doc was detected
+ 0 400   0   echo $(( x << END ))
+ 0 400   0   pwd
+ 0 400   0   END
+ 1 400   0   
  0 400   0   INVALID_NUMBER=0#0000
  0 400   0   
diff --git a/test/examples/bash/x.bsh.styled b/test/examples/bash/x.bsh.styled
@@ -31,4 +31,9 @@ EOF{0}
   {7}}{0} {7}>>{0} {9}$OUT_FILE{0}
 {4}done{0}
 
+{2}# Issue 137, should be shift but here-doc was detected{0}
+{4}echo{0} {7}$(({0} {8}x{0} {7}<<{0} {8}END{0} {7})){0}
+{8}pwd{0}
+{8}END{0}
+
 {8}INVALID_NUMBER{7}={1}0#0000{0}

Original file line number	Diff line number	Diff line change
`@@ -876,7 +876,7 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int`
`876`	`876`	`} else {`
`877`	`877`	`continue; // scalar has no delimiter pair`
`878`	`878`	`}`
`879`		`- } else if (sc.Match('<', '<')) {`
	`879`	`+ } else if (cmdState != CmdState::Arithmetic && sc.Match('<', '<')) {`
`880`	`880`	`sc.SetState(SCE_SH_HERE_DELIM);`
`881`	`881`	`HereDoc.State = 0;`
`882`	`882`	`if (sc.GetRelative(2) == '-') { // <<- indent case`