Skip auto-complete of tags within HTML script

Closes #2282 Closes #2284
8 years ago · 10c6dc0174
parent eddafe55e8
commit 10c6dc0174
1 changed files with 8 additions and 0 deletions
--- a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
+++ b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
@ -370,6 +370,14 @@ bool AutoCompletion::showFunctionComplete()

 void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t caretPos, bool isHTML)
 {
+	if (isHTML)
+	{
+		// Skip if caretPos is within any scripting language
+		int style = static_cast<int>(_pEditView->execute(SCI_GETSTYLEAT, caretPos));
+		if (style >= SCE_HJ_START)
+			return;
+	}
+
 	char prev = static_cast<char>(_pEditView->execute(SCI_GETCHARAT, caretPos - 2));
 	char prevprev = static_cast<char>(_pEditView->execute(SCI_GETCHARAT, caretPos - 3));