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

Refactoring runMarkers

Browse Source
This commit is contained in:
Don Ho 2025-02-19 03:26:05 +01:00
parent 70059ea35d
commit 6f473da4ca
3 changed files with 125 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/ScintillaComponent/Buffer.cpp
View File

@ -649,13 +649,13 @@ void Buffer::setHideLineChanged(bool isHide, size_t location)
{ {
//First run through all docs without removing markers //First run through all docs without removing markers
for (int i = 0; i < _references; ++i) for (int i = 0; i < _references; ++i)
_referees.at(i)->notifyMarkers(this, isHide, location, false); // (i == _references-1)); _referees.at(i)->notifyHideMarkers(this, isHide, location, false); // (i == _references-1));
if (!isHide) // no deleting if hiding lines if (!isHide) // no deleting if hiding lines
{ {
//Then all docs to remove markers. //Then all docs to remove markers.
for (int i = 0; i < _references; ++i) for (int i = 0; i < _references; ++i)
_referees.at(i)->notifyMarkers(this, isHide, location, true); _referees.at(i)->notifyHideMarkers(this, isHide, location, true);
} }
} }

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

@ -2598,7 +2598,7 @@ void ScintillaEditView::foldIndentationBasedLevel(int level2Collapse, bool mode)
::InvalidateRect(_hSelf, nullptr, TRUE); ::InvalidateRect(_hSelf, nullptr, TRUE);
} }
//runMarkers(true, 0, true, false); hideMarkedLines(0, true);
} }
@ -2639,7 +2639,7 @@ void ScintillaEditView::foldLevel(int level2Collapse, bool mode)
::InvalidateRect(_hSelf, nullptr, TRUE); ::InvalidateRect(_hSelf, nullptr, TRUE);
} }
runMarkers(true, 0, true, false); hideMarkedLines(0, true);
} }
void ScintillaEditView::foldCurrentPos(bool mode) void ScintillaEditView::foldCurrentPos(bool mode)
@ -3045,7 +3045,7 @@ void ScintillaEditView::marginClick(Sci_Position position, int modifiers)
// Toggle this line // Toggle this line
bool mode = isFolded(lineClick); bool mode = isFolded(lineClick);
fold(lineClick, !mode); fold(lineClick, !mode);
runMarkers(true, lineClick, true, false); hideMarkedLines(lineClick, true);
} }
} }
} }
@ -3097,7 +3097,7 @@ void ScintillaEditView::expand(size_t& line, bool doExpand, bool force, intptr_t
++line; ++line;
} }
runMarkers(true, 0, true, false); hideMarkedLines(0, true);
} }
@ -4046,7 +4046,7 @@ void ScintillaEditView::scrollPosToCenter(size_t pos)
void ScintillaEditView::hideLines() void ScintillaEditView::hideLines()
{ {
//Folding can screw up hide lines badly if it unfolds a hidden section. //Folding can screw up hide lines badly if it unfolds a hidden section.
//Adding runMarkers(hide, foldstart) directly (folding on single document) can help //Adding hideMarkedLines() & showHiddenLines() directly (folding on single document) can help
//Special func on buffer. If markers are added, create notification with location of start, and hide bool set to true //Special func on buffer. If markers are added, create notification with location of start, and hide bool set to true
size_t startLine = execute(SCI_LINEFROMPOSITION, execute(SCI_GETSELECTIONSTART)); size_t startLine = execute(SCI_LINEFROMPOSITION, execute(SCI_GETSELECTIONSTART));
@ -4169,139 +4169,148 @@ bool ScintillaEditView::markerMarginClick(intptr_t lineNumber)
return true; return true;
} }
void ScintillaEditView::notifyMarkers(Buffer * buf, bool isHide, size_t location, bool del) void ScintillaEditView::notifyHideMarkers(Buffer * buf, bool isHide, size_t location, bool del)
{ {
if (buf != _currentBuffer) //if not visible buffer dont do a thing if (buf != _currentBuffer) //if not visible buffer dont do a thing
return; return;
runMarkers(isHide, location, false, del);
if (isHide)
hideMarkedLines(location, false);
else
showHiddenLines(location, false, del);
} }
//Run through full document. When switching in or opening folding //Run through full document. When switching in or opening folding
//hide is false only when user click on margin //hide is false only when user click on margin
void ScintillaEditView::runMarkers(bool doHide, size_t searchStart, bool endOfDoc, bool doDelete)
{
//Removes markers if opening
/*
AllLines = (start,ENDOFDOCUMENT)
Hide:
Run through all lines.
Find open hiding marker:
set hiding start
Find closing:
if (hiding):
Hide lines between now and start
if (endOfDoc = false)
return
else
search for other hidden sections
Show: //Removes markers if opening
Run through all lines /*
Find open hiding marker AllLines = (start,ENDOFDOCUMENT)
set last start Hide:
Find closing: Run through all lines.
Show from last start. Stop. Find open hiding marker:
Find closed folding header: set hiding start
Show from last start to folding header Find closing:
Skip to LASTCHILD if (hiding):
Set last start to lastchild Hide lines between now and start
*/ if (endOfDoc = false)
return
else
search for other hidden sections
Show:
Run through all lines
Find open hiding marker
set last start
Find closing:
Show from last start. Stop.
Find closed folding header:
Show from last start to folding header
Skip to LASTCHILD
Set last start to lastchild
*/
void ScintillaEditView::hideMarkedLines(size_t searchStart, bool toEndOfDoc)
{
size_t maxLines = execute(SCI_GETLINECOUNT); size_t maxLines = execute(SCI_GETLINECOUNT);
if (doHide)
auto startHiding = searchStart;
bool isInSection = false;
for (auto i = searchStart; i < maxLines; ++i)
{ {
auto startHiding = searchStart; auto state = execute(SCI_MARKERGET, i);
bool isInSection = false; if ( ((state & (1 << MARK_HIDELINESEND)) != 0) )
for (auto i = searchStart; i < maxLines; ++i)
{ {
auto state = execute(SCI_MARKERGET, i); if (isInSection)
if ( ((state & (1 << MARK_HIDELINESEND)) != 0) )
{ {
if (isInSection) execute(SCI_HIDELINES, startHiding, i-1);
if (!toEndOfDoc)
{ {
execute(SCI_HIDELINES, startHiding, i-1); return; //done, only single section requested
if (!endOfDoc) } //otherwise keep going
{ }
return; //done, only single section requested isInSection = false;
} //otherwise keep going }
}
if ((state & (1 << MARK_HIDELINESBEGIN)) != 0)
{
isInSection = true;
startHiding = i+1;
}
}
}
void ScintillaEditView::showHiddenLines(size_t searchStart, bool toEndOfDoc, bool doDelete)
{
size_t maxLines = execute(SCI_GETLINECOUNT);
auto startShowing = searchStart;
bool isInSection = false;
for (auto i = searchStart; i < maxLines; ++i)
{
auto state = execute(SCI_MARKERGET, i);
if ((state & (1 << MARK_HIDELINESBEGIN)) != 0 && !isInSection)
{
isInSection = true;
if (doDelete)
{
execute(SCI_MARKERDELETE, i, MARK_HIDELINESBEGIN);
}
else
{
startShowing = i + 1;
}
}
else if ( (state & (1 << MARK_HIDELINESEND)) != 0)
{
if (doDelete)
{
execute(SCI_MARKERDELETE, i, MARK_HIDELINESEND);
if (!toEndOfDoc)
{
return; //done, only single section requested
} //otherwise keep going
isInSection = false; isInSection = false;
} }
else if (isInSection)
if ((state & (1 << MARK_HIDELINESBEGIN)) != 0)
{ {
isInSection = true; if (startShowing >= i)
startHiding = i+1; { //because of fold skipping, we passed the close tag. In that case we cant do anything
} if (!toEndOfDoc)
}
}
else
{
auto startShowing = searchStart;
bool isInSection = false;
for (auto i = searchStart; i < maxLines; ++i)
{
auto state = execute(SCI_MARKERGET, i);
if ((state & (1 << MARK_HIDELINESBEGIN)) != 0 && !isInSection)
{
isInSection = true;
if (doDelete)
{
execute(SCI_MARKERDELETE, i, MARK_HIDELINESBEGIN);
}
else
{
startShowing = i + 1;
}
}
else if ( (state & (1 << MARK_HIDELINESEND)) != 0)
{
if (doDelete)
{
execute(SCI_MARKERDELETE, i, MARK_HIDELINESEND);
if (!endOfDoc)
{ {
return; //done, only single section requested return;
} //otherwise keep going
isInSection = false;
}
else if (isInSection)
{
if (startShowing >= i)
{ //because of fold skipping, we passed the close tag. In that case we cant do anything
if (!endOfDoc)
{
return;
}
else
{
isInSection = false; // assume we passed the close tag
continue;
}
} }
else
execute(SCI_SHOWLINES, startShowing, i-1);
if (!endOfDoc)
{ {
return; //done, only single section requested isInSection = false; // assume we passed the close tag
} //otherwise keep going continue;
isInSection = false; }
} }
}
auto levelLine = execute(SCI_GETFOLDLEVEL, i, 0); execute(SCI_SHOWLINES, startShowing, i-1);
if (levelLine & SC_FOLDLEVELHEADERFLAG)
{ //fold section. Dont show lines if fold is closed if (!toEndOfDoc)
if (isInSection && !isFolded(i))
{ {
execute(SCI_SHOWLINES, startShowing, i); return; //done, only single section requested
} } //otherwise keep going
isInSection = false;
}
}
auto levelLine = execute(SCI_GETFOLDLEVEL, i, 0);
if (levelLine & SC_FOLDLEVELHEADERFLAG)
{ //fold section. Dont show lines if fold is closed
if (isInSection && !isFolded(i))
{
execute(SCI_SHOWLINES, startShowing, i);
} }
} }
} }
} }
void ScintillaEditView::restoreHiddenLines() void ScintillaEditView::restoreHiddenLines()
{ {
int line = 0; int line = 0;
@ -4318,7 +4327,6 @@ void ScintillaEditView::restoreHiddenLines()
if (line != -1) if (line != -1)
{ {
execute(SCI_HIDELINES, startHiding, line - 1); execute(SCI_HIDELINES, startHiding, line - 1);
} }
} }
} }

5
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
View File

@ -817,8 +817,9 @@ public:
void hideLines(); void hideLines();
bool markerMarginClick(intptr_t lineNumber); //true if it did something bool markerMarginClick(intptr_t lineNumber); //true if it did something
void notifyMarkers(Buffer * buf, bool isHide, size_t location, bool del); void notifyHideMarkers(Buffer * buf, bool isHide, size_t location, bool del);
void runMarkers(bool doHide, size_t searchStart, bool endOfDoc, bool doDelete); void hideMarkedLines(size_t searchStart, bool endOfDoc);
void showHiddenLines(size_t searchStart, bool endOfDoc, bool doDelete);
void restoreHiddenLines(); void restoreHiddenLines();
bool hasSelection() const { return !execute(SCI_GETSELECTIONEMPTY); }; bool hasSelection() const { return !execute(SCI_GETSELECTIONEMPTY); };