Fix regression to entity format validation

Since 139908f, HTML entities are not replaced if a colon appears at *any*
further position in the document

This also tightens up the logic of automatic entity decoding

Author: rdipardo

src/Entities.cpp

@@ -79,10 +79,11 @@ int Entities::decode() {
 			return result;
 	}
 
-	// Disallow `:` inside entities, and `;` inside emoji
-	if ((target.find(chInvalid, charIndex) != std::wstring::npos) ||
-	    // Make sure the selection includes the terminating char
-	    (target.find(chEnd, charIndex) == std::wstring::npos)) {
+	size_t endPos = target.find(chEnd, charIndex);
+	// Make sure the selection includes the terminating char
+	if ((endPos == std::wstring::npos) ||
+	    // Disallow `:` inside entities, and `;` inside emoji
+	    (target.find(chInvalid, charIndex) < endPos)) {
 		return result;
 	}
 

src/HtmlTag.cpp

@@ -626,7 +626,11 @@ void findAndDecode(const int keyCode, DecodeCmd cmd) {
 			break;
 		if (plugin.options.liveEntityDecoding || cmd == dcEntity) {
 			if (anchor == startPos)
-				skipEntities = !isEndOfEntity(chCurrent); // No adjacent entity here
+				skipEntities =
+				    // No adjacent entity here
+				    !isEndOfEntity(chCurrent) ||
+				    // Do nothing if current text is `:;`, `;:`, `;;` or `::`
+				    isEndOfEntity(static_cast<int>(doc.sendMessage(SCI_GETCHARAT, anchor - 1)));
 			else if (anchor < startPos && !skipEntities && isStartOfEntity(chCurrent)) { // Handle entities
 				didReplace = replace(Entities::decode, anchor, caret);
 				if (!(ch == 0x0A || ch == 0x0D))