Skip to content

Commit 42da359

Browse files
committed
Add tests for undo/redo renameSheet()
1 parent 81f9e8d commit 42da359

File tree

3 files changed

+461
-19
lines changed

3 files changed

+461
-19
lines changed

src/DependencyGraph/DependencyGraph.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ export class DependencyGraph {
346346
* - vertices may have dependents in placeholderSheetToDelete and other sheets,
347347
*/
348348
public mergeSheets(sheetToKeep: number, placeholderSheetToDelete: number): void {
349-
this.adjustRangeVerticesWhenMergingSheets(sheetToKeep, placeholderSheetToDelete)
350-
this.adjustCellVerticesWhenMergingSheets(sheetToKeep, placeholderSheetToDelete)
349+
this.mergeRangeVertices(sheetToKeep, placeholderSheetToDelete)
350+
this.mergeCellVertices(sheetToKeep, placeholderSheetToDelete)
351351
this.addressMapping.removeSheet(placeholderSheetToDelete)
352352
this.addStructuralNodesToChangeSet()
353353
}
@@ -787,7 +787,7 @@ export class DependencyGraph {
787787
* - removes range vertex from graph and range mapping
788788
* - cleans up dependencies of the removed vertex
789789
*/
790-
private adjustRangeVerticesWhenMergingSheets(sheetToKeep: number, placeholderSheetToDelete: number): void {
790+
private mergeRangeVertices(sheetToKeep: number, placeholderSheetToDelete: number): void {
791791
const rangeVertices = Array.from(this.rangeMapping.rangesInSheet(placeholderSheetToDelete))
792792

793793
for (const vertexToDelete of rangeVertices) {
@@ -826,7 +826,7 @@ export class DependencyGraph {
826826
* - removes cell vertex from graph and address mapping
827827
* - cleans up dependencies of the removed vertex
828828
*/
829-
private adjustCellVerticesWhenMergingSheets(sheetToKeep: number, placeholderSheetToDelete: number): void {
829+
private mergeCellVertices(sheetToKeep: number, placeholderSheetToDelete: number): void {
830830
const cellVertices = Array.from(this.addressMapping.sheetEntries(placeholderSheetToDelete))
831831

832832
for (const [addressToDelete, vertexToDelete] of cellVertices) {

test/unit/cruds/adding-sheet.spec.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -579,18 +579,3 @@ describe('recalculates formulas after adding new sheet (issue #1116)', () => {
579579
})
580580
})
581581
})
582-
583-
// IMPLEMENTATION PLAN:
584-
// - [x] during parseing dont create ERROR vertex - instead add a placeholder shett to sheetMapping and addressMapping
585-
// - [x] handle this non-error vertec when reading cell (similar to not-added named expressions?)
586-
// - [x] unit tests: addSheet + ranges, with and without quotes (completed a week ago)
587-
// - [x] handle addSheet
588-
// - [x] comprehensive range testing
589-
// - [x] unit tests: removeSheet + ranges
590-
// - [x] handle removeSheet
591-
// - [x] unit tests: renameSheet + ranges
592-
// - [x] handle renameSheet
593-
// - [x] refactor
594-
// - [ ] unit tests: undo-redo
595-
// - [ ] handle undo-redo
596-
// - [ ] agent review

0 commit comments

Comments
 (0)