github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix HTML syntax highlighting in PHP files regression 

Restore HTML syntax highlighting in PHP files.

Fix #11585, fix #11602, close #11588
pull/11608/head
Robert Di Pardo 2022-04-28 20:31:17 -04:00 committed by Don Ho
parent 100d45f7cf
commit 2fbac354ed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -633,10 +633,10 @@ void ScintillaEditView::setStyle(Style styleToSet)
void ScintillaEditView::setXmlLexer(LangType type) void ScintillaEditView::setXmlLexer(LangType type)
{ {
setLexerFromLangID(type);
if (type == L_XML) if (type == L_XML)
{ {
setLexerFromLangID(L_XML);
for (int i = 0 ; i < 4 ; ++i) for (int i = 0 ; i < 4 ; ++i)
execute(SCI_SETKEYWORDS, i, reinterpret_cast<LPARAM>(TEXT(""))); execute(SCI_SETKEYWORDS, i, reinterpret_cast<LPARAM>(TEXT("")));
@ -646,6 +646,7 @@ void ScintillaEditView::setXmlLexer(LangType type)
} }
else if ((type == L_HTML) || (type == L_PHP) || (type == L_ASP) || (type == L_JSP)) else if ((type == L_HTML) || (type == L_PHP) || (type == L_ASP) || (type == L_JSP))
{ {
setLexerFromLangID(L_HTML);
const TCHAR *htmlKeyWords_generic = NppParameters::getInstance().getWordList(L_HTML, LANG_INDEX_INSTR); const TCHAR *htmlKeyWords_generic = NppParameters::getInstance().getWordList(L_HTML, LANG_INDEX_INSTR);
WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance();
@ -1426,7 +1427,7 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
pStyle = stylers.findByID(defaultIndicatorStyle._styleID); pStyle = stylers.findByID(defaultIndicatorStyle._styleID);
setSpecialIndicator(pStyle ? *pStyle : defaultIndicatorStyle); setSpecialIndicator(pStyle ? *pStyle : defaultIndicatorStyle);
// Il faut surtout faire un test ici avant d'exécuter SCI_SETCODEPAGE // Il faut surtout faire un test ici avant d'exécuter SCI_SETCODEPAGE
// Sinon y'aura un soucis de performance! // Sinon y'aura un soucis de performance!
if (isCJK()) if (isCJK())
{ {