tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-31 01:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix an unresponsive issue due to hide lines

Browse Source 
Fix swiching back to document which has processed hide lines makes Notepad++ unresponsive due to an infinite loop.
Fix also setting language makes hiding lines unhidden issue.

Fix #16316, close #16512
This commit is contained in:
Don Ho 2025-05-04 18:00:27 +02:00
parent 910f02dfd5
commit 0f79a51646
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PowerEditor/src/Notepad_plus.cpp
View File

@ -3880,6 +3880,9 @@ void Notepad_plus::setLanguage(LangType langType)
{
(_pEditView->getCurrentBuffer())->setLangType(langType);
}
_pEditView->restoreHiddenLines();
}
LangType Notepad_plus::menuID2LangType(int cmdID)

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

@ -4266,17 +4266,31 @@ void ScintillaEditView::restoreHiddenLines()
while (line != -1)
{
line = static_cast<int>(execute(SCI_MARKERNEXT, line, 1 << MARK_HIDELINESBEGIN));
if (line != -1)
{
int startHiding = line + 1;
line = static_cast<int>(execute(SCI_MARKERNEXT, line, 1 << MARK_HIDELINESEND));
int lineBegin = static_cast<int>(execute(SCI_MARKERNEXT, line, 1 << MARK_HIDELINESBEGIN));
int lineEnd = static_cast<int>(execute(SCI_MARKERNEXT, line, 1 << MARK_HIDELINESEND));
if (line != -1)
{
execute(SCI_HIDELINES, startHiding, line - 1);
}
if (lineBegin != -1 && lineEnd != -1 && lineBegin != lineEnd)
{
execute(SCI_HIDELINES, lineBegin + 1, lineEnd - 1);
// Check if the end mark & the begin mark are on the same line
lineBegin = static_cast<int>(execute(SCI_MARKERNEXT, lineEnd, 1 << MARK_HIDELINESBEGIN));
lineEnd = static_cast<int>(execute(SCI_MARKERNEXT, lineEnd, 1 << MARK_HIDELINESEND));
line = lineEnd + ((lineBegin == lineEnd) ? 0 : 1);
}
else if (lineBegin != -1 && lineEnd != -1 && lineBegin == lineEnd) // The end mark & the begin mark are on the same line
{
lineEnd = static_cast<int>(execute(SCI_MARKERNEXT, line + 1, 1 << MARK_HIDELINESEND));
if (lineEnd != -1)
execute(SCI_HIDELINES, lineBegin + 1, lineEnd - 1);
line = lineEnd;
}
else // one of (or both) lineBegin & lineEnd cannot be found - let's get out here
{
line = -1;
}
}
}