#40 Recognize comments in more situations.

Author: nyamatongwe

doc/LexillaHistory.html

@@ -612,6 +612,10 @@ <h3>
 	Errorlist: Fix reset escape sequence to set style SCE_ERR_DEFAULT (0) instead of SCE_ERR_ES_BLACK.
 	<a href="https://github.com/ScintillaOrg/lexilla/issues/333">Issue #333</a>.
 	</li>
+	<li>
+	Makefile: Recognize comments in more situations.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/40">Issue #40</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla546.zip">Release 5.4.6</a>

lexers/LexMake.cxx

@@ -167,8 +167,13 @@ void LexerMakeFile::ColouriseMakeLine(
 		}
 	}
 	int varCount = 0;
+	char previous = 0;
 	while (i < lengthLine) {
-		if (lineBuffer.substr(i, 2) == "$(") {
+		if (lineBuffer[i] == '#' && !bCommand && (varCount == 0) && (previous != '\\')) {
+			styler.ColourTo(startLine + i - 1, state);
+			styler.ColourTo(endPos, SCE_MAKE_COMMENT);
+			return;
+		} else if (lineBuffer.substr(i, 2) == "$(") {
 			styler.ColourTo(startLine + i - 1, state);
 			state = SCE_MAKE_IDENTIFIER;
 			varCount++;
@@ -200,6 +205,7 @@ void LexerMakeFile::ColouriseMakeLine(
 		if (!isspacechar(lineBuffer[i])) {
 			lastNonSpace = i;
 		}
+		previous = lineBuffer[i];
 		i++;
 	}
 	if (state == SCE_MAKE_IDENTIFIER) {

test/examples/makefile/40Comment.mak

@@ -0,0 +1,17 @@
+# Comment
+
+test = 5 # Comment
+
+$(info $(test)) # Comment
+
+clean: # Comment
+	echo # Not comment
+
+# Quoting a #
+HASH = \#
+
+# Inside variable reference
+OUT = $(#SYM)
+
+# Inside function call
+X = $(subst /,#,$1)

test/examples/makefile/40Comment.mak.folded

@@ -0,0 +1,18 @@
+ 0 400   0   # Comment
+ 0 400   0   
+ 0 400   0   test = 5 # Comment
+ 0 400   0   
+ 0 400   0   $(info $(test)) # Comment
+ 0 400   0   
+ 0 400   0   clean: # Comment
+ 0 400   0   	echo # Not comment
+ 0 400   0   
+ 0 400   0   # Quoting a #
+ 0 400   0   HASH = \#
+ 0 400   0   
+ 0 400   0   # Inside variable reference
+ 0 400   0   OUT = $(#SYM)
+ 0 400   0   
+ 0 400   0   # Inside function call
+ 0 400   0   X = $(subst /,#,$1)
+ 0 400   0   

test/examples/makefile/40Comment.mak.styled

@@ -0,0 +1,17 @@
+{1}# Comment
+{0}
+{3}test{0} {4}={0} 5 {1}# Comment
+{0}
+{3}$(info $(test)){0} {1}# Comment
+{0}
+{5}clean{4}:{0} {1}# Comment
+{0}	echo # Not comment
+
+{1}# Quoting a #
+{3}HASH{0} {4}={0} \#
+
+{1}# Inside variable reference
+{3}OUT{0} {4}={0} {3}$(#SYM){0}
+
+{1}# Inside function call
+{3}X{0} {4}={0} {3}$(subst /,#,$1){0}