Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-19 08:30:25 +02:00
Code Activity

Fixes collapse case where anchorLine==startLine, and anchorLine==endLine

Browse source
This commit is contained in:
Brian Fiete 2022-03-01 10:49:12 -08:00
parent f0ff0d3630
commit fa3b69e0c7
1 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

47
IDE/src/ui/SourceEditWidgetContent.bf
View file

@ -216,6 +216,21 @@ namespace IDE.ui
public int32 mParseRevision; public int32 mParseRevision;
public int32 mTextRevision; public int32 mTextRevision;
public bool mDeleted; public bool mDeleted;
public void FixAfterUpdate() mut
{
if (mKind == .Region)
mStartLine++;
if (mAnchorLine == mEndLine)
{
mDeleted = true;
}
else if (mAnchorLine == mStartLine)
{
mStartLine++;
}
}
} }
public class Data : DarkEditWidgetContent.Data public class Data : DarkEditWidgetContent.Data
@ -5194,8 +5209,14 @@ namespace IDE.ui
for (var entry in mOrderedCollapseEntries) for (var entry in mOrderedCollapseEntries)
{ {
if (entry.mKind == .Region) entry.FixAfterUpdate();
entry.mStartLine++;
if (entry.mDeleted)
{
if (mEmbeds.GetAndRemove(entry.mAnchorIdx) case .Ok(let val))
delete val.value;
continue;
}
if ((entry.mPrevAnchorLine != -1) && (entry.mPrevAnchorLine != entry.mAnchorLine)) if ((entry.mPrevAnchorLine != -1) && (entry.mPrevAnchorLine != entry.mAnchorLine))
{ {
@ -5600,6 +5621,18 @@ namespace IDE.ui
for (var entry in mOrderedCollapseEntries) for (var entry in mOrderedCollapseEntries)
{ {
int32 prevAnchorLine = entry.mAnchorLine;
if (!entry.mDeleted)
{
failed = false;
Update(entry.mAnchorId, ref entry.mAnchorIdx, ref entry.mAnchorLine);
Update(entry.mStartId, ref entry.mStartIdx, ref entry.mStartLine);
Update(entry.mEndId, ref entry.mEndIdx, ref entry.mEndLine);
entry.FixAfterUpdate();
}
if (entry.mDeleted) if (entry.mDeleted)
{ {
if (mEmbeds.GetAndRemove(entry.mAnchorIdx) case .Ok(let val)) if (mEmbeds.GetAndRemove(entry.mAnchorIdx) case .Ok(let val))
@ -5607,16 +5640,6 @@ namespace IDE.ui
continue; continue;
} }
int32 prevAnchorLine = entry.mAnchorLine;
failed = false;
Update(entry.mAnchorId, ref entry.mAnchorIdx, ref entry.mAnchorLine);
Update(entry.mStartId, ref entry.mStartIdx, ref entry.mStartLine);
Update(entry.mEndId, ref entry.mEndIdx, ref entry.mEndLine);
if (entry.mKind == .Region)
entry.mStartLine++;
if (failed) if (failed)
needsRefresh = true; needsRefresh = true;