fix(inspector): split CSV columns in one pass and keep column layout in sync

Author: datlechin

Plugins/CSVInspectorPlugin/CSVRowStore.swift

@@ -284,19 +284,22 @@ final class CSVRowStore {
     func splitColumn(at index: Int, spec: SplitSpec) {
         guard index >= 0, index < columnNames.count else { return }
         let baseName = columnNames[index]
+        var rowCells: [[String]] = []
         var pieceRows: [[String]] = []
+        rowCells.reserveCapacity(logicalRows.count)
         pieceRows.reserveCapacity(logicalRows.count)
         var pieceCount = 1
         for row in logicalRows.indices {
             let cells = cells(forRow: row)
             let value = index < cells.count ? cells[index] : ""
             let pieces = Self.split(value, spec: spec)
             pieceCount = max(pieceCount, pieces.count)
+            rowCells.append(cells)
             pieceRows.append(pieces)
         }
         let newNames = (0..<pieceCount).map { "\(baseName) \($0 + 1)" }
         for row in logicalRows.indices {
-            var cells = cells(forRow: row)
+            var cells = rowCells[row]
             let pieces = pieceRows[row]
             let padded = (0..<pieceCount).map { $0 < pieces.count ? pieces[$0] : "" }
             if index < cells.count { cells.remove(at: index) }

TablePro/Views/Inspector/InspectorViewController.swift

@@ -432,8 +432,10 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
         alert.accessoryView = accessoryStack(with: [field])
 
         alert.beginSheetModal(for: window) { [weak self] response in
-            guard response == .alertFirstButtonReturn else { return }
-            self?.inspectorDocument?.mergeColumns(at: column, separator: field.stringValue)
+            guard response == .alertFirstButtonReturn, let self, let inspector = self.inspectorDocument else { return }
+            let removedName = column + 1 < inspector.columnNames.count ? inspector.columnNames[column + 1] : nil
+            inspector.mergeColumns(at: column, separator: field.stringValue)
+            if let removedName { self.removeLayoutKey(removedName) }
         }
         DispatchQueue.main.async { alert.window.makeFirstResponder(field) }
     }
@@ -444,7 +446,15 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
             presentInvalidPattern()
             return
         }
-        inspectorDocument?.splitColumn(at: column, separator: separator, isRegex: isRegex)
+        guard let inspector = inspectorDocument else { return }
+        let oldName = column < inspector.columnNames.count ? inspector.columnNames[column] : nil
+        let oldCount = inspector.columnNames.count
+        inspector.splitColumn(at: column, separator: separator, isRegex: isRegex)
+        guard let oldName else { return }
+        let pieceCount = inspector.columnNames.count - oldCount + 1
+        let upper = min(column + max(pieceCount, 0), inspector.columnNames.count)
+        let newNames = column < upper ? Array(inspector.columnNames[column..<upper]) : []
+        replaceLayoutKey(oldName, with: newNames)
     }
 
     private func presentInvalidPattern() {
@@ -521,6 +531,15 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
         state.columnLayout.columnOrder = order
     }
 
+    private func replaceLayoutKey(_ oldName: String, with newNames: [String]) {
+        if var order = state.columnLayout.columnOrder, let position = order.firstIndex(of: oldName) {
+            order.replaceSubrange(position...position, with: newNames)
+            state.columnLayout.columnOrder = order
+        }
+        state.columnLayout.columnWidths.removeValue(forKey: oldName)
+        state.columnLayout.hiddenColumns.remove(oldName)
+    }
+
     private func promptForColumnName(
         title: String,
         initial: String,