tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 15:54:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix UDL comment & comment line conflicting

Browse Source 
Fix #11897, close #15961
This commit is contained in:
Don Ho 2024-12-18 04:35:28 +01:00
parent cb1172e2a4
commit f205b12230
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lexilla/lexers/LexUser.cxx
View File

@ -1979,6 +1979,35 @@ static void ColouriseUserDoc(Sci_PositionU startPos, Sci_Position length, int in
break; break;
} }
if (!commentOpen.empty())
{
if (isInListForward(commentOpen, sc, ignoreCase, openIndex, skipForward))
{
if (foldComments)
{
isInComment = true;
if (isCommentLine != COMMENTLINE_SKIP_TESTING)
isCommentLine = COMMENTLINE_YES;
}
// any backward keyword 'glued' on the left side?
setBackwards(kwLists, sc, prefixes, ignoreCase, bwNesting, fwEndVectors, levelMinCurrent, levelNext, nlCount, dontMove, docLength);
// paint up to start of comment sequence
sc.SetState(SCE_USER_STYLE_COMMENT);
// record start of comment sequence (NI_OPEN) in BOTH nesting vectors
nestedVector.push_back(*NI.Set(sc.currentPos, ++nestedLevel, openIndex, SCE_USER_STYLE_COMMENT, NI_OPEN));
lastNestedGroup.push_back(NI);
// paint start of comment sequence
sc.Forward(skipForward);
sc.SetState(SCE_USER_STYLE_COMMENT);
dontMove = true;
if (sc.atLineEnd)
checkEOL = EOL_SKIP_CHECK;
break;
}
}
if (!commentLineOpen.empty()) if (!commentLineOpen.empty())
{ {
if ((pureLC == PURE_LC_NONE) || if ((pureLC == PURE_LC_NONE) ||
@ -2009,35 +2038,6 @@ static void ColouriseUserDoc(Sci_PositionU startPos, Sci_Position length, int in
} }
} }
if (!commentOpen.empty())
{
if (isInListForward(commentOpen, sc, ignoreCase, openIndex, skipForward))
{
if (foldComments)
{
isInComment = true;
if (isCommentLine != COMMENTLINE_SKIP_TESTING)
isCommentLine = COMMENTLINE_YES;
}
// any backward keyword 'glued' on the left side?
setBackwards(kwLists, sc, prefixes, ignoreCase, bwNesting, fwEndVectors, levelMinCurrent, levelNext, nlCount, dontMove, docLength);
// paint up to start of comment sequence
sc.SetState(SCE_USER_STYLE_COMMENT);
// record start of comment sequence (NI_OPEN) in BOTH nesting vectors
nestedVector.push_back(*NI.Set(sc.currentPos, ++nestedLevel, openIndex, SCE_USER_STYLE_COMMENT, NI_OPEN));
lastNestedGroup.push_back(NI);
// paint start of comment sequence
sc.Forward(skipForward);
sc.SetState(SCE_USER_STYLE_COMMENT);
dontMove = true;
if (sc.atLineEnd)
checkEOL = EOL_SKIP_CHECK;
break;
}
}
for (int i=0; i<SCE_USER_TOTAL_DELIMITERS; ++i) for (int i=0; i<SCE_USER_TOTAL_DELIMITERS; ++i)
{ {
if (!delimStart[i]->empty()) if (!delimStart[i]->empty())