[HTML] Treat tag with namespace as custom tag, terminate ASP VB comme…

…nt line at `%>`.

scintilla/lexers/LexHTML.cxx

@@ -121,12 +121,12 @@ constexpr bool isStringState(int state) noexcept {
 	}
 }
 
-constexpr bool stateAllowsTermination(int state) noexcept {
+constexpr bool stateAllowsTermination(int state, int ch) noexcept {
 	bool allowTermination = !isStringState(state);
 	if (allowTermination) {
 		switch (state) {
 		case SCE_HB_COMMENTLINE:
-			allowTermination = false;
+			allowTermination = ch == '%'; // %>
 		}
 	}
 	return allowTermination;
@@ -165,31 +165,32 @@ bool classifyAttribHTML(script_mode inScriptType, Sci_PositionU start, Sci_Posit
 }
 
 // https://html.spec.whatwg.org/multipage/custom-elements.html#custom-elements-core-concepts
-bool isHTMLCustomElement(const char *tag, size_t length) noexcept {
+bool isHTMLCustomElement(const char *tag, size_t length, bool dashColon) noexcept {
 	// check valid HTML custom element name: starts with an ASCII lower alpha and contains hyphen.
 	// IsAlpha() is used for `html.tags.case.sensitive=1`.
 	if (length < 2 || !IsAlpha(tag[0])) {
 		return false;
 	}
-	if (strchr(tag, '-') == nullptr) {
-		return false;
-	}
-	return true;
+	return dashColon;
 }
 
 int classifyTagHTML(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, LexAccessor &styler, bool &tagDontFold,
-	bool caseSensitive, bool isXml, bool allowScripts) {
+	bool isXml, bool allowScripts) {
 	char withSpace[126 + 2] = " ";
 	const char *tag = withSpace + 1;
 	// Copy after the '<' and stop before space
 	Sci_PositionU i = 1;
+	bool dashColon = false;
 	for (Sci_PositionU cPos = start; cPos < end && i < sizeof(withSpace) - 2; cPos++) {
 		const char ch = styler[cPos];
-		if (IsASpace(ch)) {
+		if (static_cast<unsigned char>(ch) <= ' ') {
 			break;
 		}
 		if ((ch != '<') && (ch != '/')) {
-			withSpace[i++] = caseSensitive ? ch : MakeLowerCase(ch);
+			withSpace[i++] = isXml ? ch : MakeLowerCase(ch);
+			if (ch == ':' || ch == '-') {
+				dashColon = true;
+			}
 		}
 	}
 
@@ -213,7 +214,7 @@ int classifyTagHTML(Sci_PositionU start, Sci_PositionU end, const WordList &keyw
 		chAttr = SCE_H_SGML_DEFAULT;
 	} else if (!keywords || keywords.InList(tag)) {
 		chAttr = SCE_H_TAG;
-	} else if (!isXml && isHTMLCustomElement(tag, i - 1)) {
+	} else if (!isXml && isHTMLCustomElement(tag, i - 1, dashColon)) {
 		customElement = true;
 		chAttr = SCE_H_TAG;
 	}
@@ -420,11 +421,6 @@ void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, int init
 	//	The default is on.
 	const bool foldXmlAtTagOpen = isXml & fold;// && styler.GetPropertyBool("fold.xml.at.tag.open", true);
 
-	// property html.tags.case.sensitive
-	//	For XML and HTML, setting this property to 1 will make tags match in a case
-	//	sensitive way which is the expected behaviour for XML and XHTML.
-	constexpr bool caseSensitive = false;//styler.GetPropertyBool("html.tags.case.sensitive", false);
-
 	// property lexer.xml.allow.scripts
 	//	Set to 0 to disable scripts in XML.
 	const bool allowScripts = styler.GetPropertyBool("lexer.xml.allow.scripts", true);
@@ -671,7 +667,7 @@ void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, int init
 
 		// handle the end of a pre-processor = Non-HTML
 		else if ((((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) &&
-				  (((scriptLanguage != eScriptNone) && stateAllowsTermination(state))) &&
+				  (((scriptLanguage != eScriptNone) && stateAllowsTermination(state, ch))) &&
 				  (((ch == '%') || (ch == '?')) && (chNext == '>'))) ||
 		         ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) {
 			if (state == SCE_H_ASPAT) {
@@ -900,7 +896,7 @@ void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, int init
 		case SCE_H_TAGUNKNOWN:
 			if (!IsTagContinue(ch) && !((ch == '/') && (chPrev == '<'))) {
 				int eClass = classifyTagHTML(styler.GetStartSegment(),
-					i, keywordsTag, styler, tagDontFold, caseSensitive, isXml, allowScripts);
+					i, keywordsTag, styler, tagDontFold, isXml, allowScripts);
 				if (eClass == SCE_H_SCRIPT || eClass == SCE_H_COMMENT) {
 					if (!tagClosing) {
 						inScriptType = eNonHtmlScript;