Merge pull request #4 from jakobhellermann/fix-combineinputs-eating-c…

…omments Fix `CombineInputs` eating comments
psyGamer · Jul 25, 2024 · 000776c · 000776c
2 parents bf4cc6e + 563b2d9
commit 000776c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Studio/CelesteStudio/Editing/Document.cs b/Studio/CelesteStudio/Editing/Document.cs
@@ -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();
 

diff --git a/Studio/CelesteStudio/Editing/Editor.cs b/Studio/CelesteStudio/Editing/Editor.cs
@@ -2015,8 +2015,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;