Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Fixed reformat opening collapsed regions

Browse source
This commit is contained in:
Brian Fiete 2022-04-16 08:23:43 -07:00
parent 2205090e73
commit 61a39f2a92
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
IDE/src/Compiler/BfParser.bf
View file

@ -240,16 +240,16 @@ namespace IDE.Compiler
return BfParser_Reduce(mNativeBfParser, passInstance.mNativeBfPassInstance); return BfParser_Reduce(mNativeBfParser, passInstance.mNativeBfPassInstance);
} }
public void Reformat(int formatStart, int formatEnd, out int32[] char8Mapping, String str) public void Reformat(int formatStart, int formatEnd, out int32[] charMapping, String str)
{ {
int32* char8MappingPtr; int32* charMappingPtr;
var maxCol = gApp.mSettings.mEditorSettings.mWrapCommentsAt; var maxCol = gApp.mSettings.mEditorSettings.mWrapCommentsAt;
var stringPtr = BfParser_Format(mNativeBfParser, (int32)formatStart, (int32)formatEnd, out char8MappingPtr, maxCol); var stringPtr = BfParser_Format(mNativeBfParser, (int32)formatStart, (int32)formatEnd, out charMappingPtr, maxCol);
str.Append(stringPtr); str.Append(stringPtr);
char8Mapping = new int32[str.Length]; charMapping = new int32[str.Length];
for (int32 i = 0; i < char8Mapping.Count; i++) for (int32 i = 0; i < charMapping.Count; i++)
char8Mapping[i] = char8MappingPtr[i]; charMapping[i] = charMappingPtr[i];
} }
public bool GetDebugExpressionAt(int cursorIdx, String outExpr) public bool GetDebugExpressionAt(int cursorIdx, String outExpr)
@ -312,14 +312,17 @@ namespace IDE.Compiler
{ {
var editWidgetContent = (SourceEditWidgetContent)editWidget.Content; var editWidgetContent = (SourceEditWidgetContent)editWidget.Content;
editWidgetContent.mCollapseNoCheckOpen = true;
defer { editWidgetContent.mCollapseNoCheckOpen = false; }
let oldText = scope String(); let oldText = scope String();
editWidget.GetText(oldText); editWidget.GetText(oldText);
/*File.WriteAllText(@"c:\temp\orig.txt", origText);*/ /*File.WriteAllText(@"c:\temp\orig.txt", origText);*/
int32[] char8Mapping; int32[] charMapping;
String newText = scope String(); String newText = scope String();
Reformat(formatStart, formatEnd, out char8Mapping, newText); Reformat(formatStart, formatEnd, out charMapping, newText);
defer delete char8Mapping; defer delete charMapping;
//File.WriteAllText(@"c:\temp\new.txt", newText); //File.WriteAllText(@"c:\temp\new.txt", newText);
@ -333,9 +336,9 @@ namespace IDE.Compiler
int32 insertStartIdx = -1; int32 insertStartIdx = -1;
int32 expectedOldIdx = 0; int32 expectedOldIdx = 0;
for (int32 i = 0; i < char8Mapping.Count; i++) for (int32 i = 0; i < charMapping.Count; i++)
{ {
int32 oldIdx = (int32)char8Mapping[i]; int32 oldIdx = (int32)charMapping[i];
if ((oldIdx != -1) && (insertStartIdx != -1)) if ((oldIdx != -1) && (insertStartIdx != -1))
{ {
@ -391,6 +394,7 @@ namespace IDE.Compiler
deleteCharAction.mMoveCursor = false; deleteCharAction.mMoveCursor = false;
editWidgetContent.mData.mUndoManager.Add(deleteCharAction); editWidgetContent.mData.mUndoManager.Add(deleteCharAction);
editWidgetContent.PhysDeleteChars(0, charsToDelete); editWidgetContent.PhysDeleteChars(0, charsToDelete);
expectedOldIdx = oldIdx + 1; expectedOldIdx = oldIdx + 1;
deleteCount++; deleteCount++;
deleteChars += charsToDelete; deleteChars += charsToDelete;

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

@ -732,6 +732,7 @@ namespace IDE.ui
public int32 mCollapseParseRevision; public int32 mCollapseParseRevision;
public int32 mCollapseTextVersionId; public int32 mCollapseTextVersionId;
public bool mCollapseNeedsUpdate; public bool mCollapseNeedsUpdate;
public bool mCollapseNoCheckOpen;
public List<PersistentTextPosition> PersistentTextPositions public List<PersistentTextPosition> PersistentTextPositions
{ {
@ -5185,6 +5186,9 @@ namespace IDE.ui
if (cursorMoveKind == .FromTyping_Deleting) if (cursorMoveKind == .FromTyping_Deleting)
return true; return true;
if (mCollapseNoCheckOpen)
return true;
if (IsLineCollapsed(checkLine)) if (IsLineCollapsed(checkLine))
{ {
if ((cursorMoveKind == .SelectLeft) || (cursorMoveKind == .SelectRight)) if ((cursorMoveKind == .SelectLeft) || (cursorMoveKind == .SelectRight))