Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CombineInputs eating comments #4

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Fix CombineInputs eating comments #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00bf205
fix CombineInputs eating up comments
jakobhellermann Jul 24, 2024
563b2d9
Fix some code-style issues
psyGamer Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Studio/CelesteStudio/Editing/Document.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ public void RemoveLine(int row) {
ChangedText(row, row);
}

/// Removes an inclusive range of lines from min..max
public void RemoveLines(int min, int max) {
PushUndoState();

Expand Down
14 changes: 13 additions & 1 deletion Studio/CelesteStudio/Editing/Editor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,8 +2006,20 @@ private void CombineInputs(bool sameActions) {
int activeRowStart = -1;

for (int row = minRow; row <= maxRow; row++) {
if (!TryParseAndFormatActionLine(row, out var currActionLine))
if (!TryParseAndFormatActionLine(row, out var currActionLine)) {
// "Flush" the previous lines
if (activeActionLine != null) {
Document.RemoveLines(activeRowStart, row - 1);
Document.InsertLine(activeRowStart, activeActionLine.Value.ToString());

maxRow -= row - 1 - activeRowStart;
row = activeRowStart + 1;

activeActionLine = null;
activeRowStart = -1;
}
continue; // Skip non-input lines
}

if (activeActionLine == null) {
activeActionLine = currActionLine;
Expand Down
Loading