This closes qax-os#2130, remove shared formula in calculation chain when remove row

xuri · xuri · commit 4180c2082e5b · 2025-05-13T00:11:29.000+08:00
- Add unit tests
- Update dependencies modules
diff --git a/cell.go b/cell.go
@@ -194,7 +194,7 @@ func (f *File) removeFormula(c *xlsxC, ws *xlsxWorksheet, sheet string) error {
 				for col, cell := range row.C {
 					if cell.F != nil && cell.F.Si != nil && *cell.F.Si == *si {
 						ws.SheetData.Row[r].C[col].F = nil
-						ws.deleteSharedFormula(c)
+						ws.formulaSI.Delete(si)
 						_ = f.deleteCalcChain(sheetID, cell.R)
 					}
 				}
diff --git a/go.mod b/go.mod
@@ -5,13 +5,13 @@ go 1.23.0
 require (
 	github.com/richardlehane/mscfb v1.0.4
 	github.com/stretchr/testify v1.10.0
-	github.com/tiendc/go-deepcopy v1.5.2
-	github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79
-	github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba
-	golang.org/x/crypto v0.36.0
+	github.com/tiendc/go-deepcopy v1.6.0
+	github.com/xuri/efp v0.0.1
+	github.com/xuri/nfp v0.0.1
+	golang.org/x/crypto v0.38.0
 	golang.org/x/image v0.25.0
-	golang.org/x/net v0.38.0
-	golang.org/x/text v0.23.0
+	golang.org/x/net v0.40.0
+	golang.org/x/text v0.25.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -9,20 +9,20 @@ github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM
 github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tiendc/go-deepcopy v1.5.2 h1:fzTSgAOzxw4MFuDzvyxRDUsdwA7qs7FBTvgXVj28NpQ=
-github.com/tiendc/go-deepcopy v1.5.2/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
-github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 h1:78nKszZqigiBRBVcoe/AuPzyLTWW5B+ltBaUX1rlIXA=
-github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba h1:DhIu6n3qU0joqG9f4IO6a/Gkerd+flXrmlJ+0yX2W8U=
-github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+github.com/tiendc/go-deepcopy v1.6.0 h1:0UtfV/imoCwlLxVsyfUd4hNHnB3drXsfle+wzSCA5Wo=
+github.com/tiendc/go-deepcopy v1.6.0/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
+github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
+github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/nfp v0.0.1 h1:MDamSGatIvp8uOmDP8FnmjuQpu90NzdJxo7242ANR9Q=
+github.com/xuri/nfp v0.0.1/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
 golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/rows.go b/rows.go
@@ -643,6 +643,16 @@ func (f *File) RemoveRow(sheet string, row int) error {
 	if row > len(ws.SheetData.Row) {
 		return f.adjustHelper(sheet, rows, row, -1)
 	}
+	for rowIdx := range ws.SheetData.Row {
+		v := &ws.SheetData.Row[rowIdx]
+		if v.R == row {
+			for _, c := range v.C {
+				if err := f.removeFormula(&c, ws, sheet); err != nil {
+					return err
+				}
+			}
+		}
+	}
 	keep := 0
 	for rowIdx := range ws.SheetData.Row {
 		v := &ws.SheetData.Row[rowIdx]
diff --git a/rows_test.go b/rows_test.go
@@ -315,41 +315,27 @@ func TestRemoveRow(t *testing.T) {
 	assert.EqualError(t, f.RemoveRow(sheet1, 0), newInvalidRowNumberError(0).Error())
 
 	assert.NoError(t, f.RemoveRow(sheet1, 4))
-	if !assert.Len(t, r.SheetData.Row, rowCount-1) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount-1)
 
 	assert.NoError(t, f.MergeCell(sheet1, "B3", "B5"))
 
 	assert.NoError(t, f.RemoveRow(sheet1, 2))
-	if !assert.Len(t, r.SheetData.Row, rowCount-2) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount-2)
 
 	assert.NoError(t, f.RemoveRow(sheet1, 4))
-	if !assert.Len(t, r.SheetData.Row, rowCount-3) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount-3)
 
 	err = f.AutoFilter(sheet1, "A2:A2", []AutoFilterOptions{{Column: "A", Expression: "x != blanks"}})
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
+	assert.NoError(t, err)
 
 	assert.NoError(t, f.RemoveRow(sheet1, 1))
-	if !assert.Len(t, r.SheetData.Row, rowCount-4) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount-4)
 
 	assert.NoError(t, f.RemoveRow(sheet1, 2))
-	if !assert.Len(t, r.SheetData.Row, rowCount-5) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount-5)
 
 	assert.NoError(t, f.RemoveRow(sheet1, 1))
-	if !assert.Len(t, r.SheetData.Row, rowCount-6) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount-6)
 
 	assert.NoError(t, f.RemoveRow(sheet1, 10))
 	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestRemoveRow.xlsx")))
@@ -367,6 +353,14 @@ func TestRemoveRow(t *testing.T) {
 	assert.EqualError(t, f.RemoveRow("SheetN", 1), "sheet SheetN does not exist")
 	// Test remove row with invalid sheet name
 	assert.EqualError(t, f.RemoveRow("Sheet:1", 1), ErrSheetNameInvalid.Error())
+
+	f = NewFile()
+	formulaType, ref := STCellFormulaTypeShared, "C1:C5"
+	assert.NoError(t, f.SetCellFormula("Sheet1", "C1", "=A1+B1",
+		FormulaOpts{Ref: &ref, Type: &formulaType}))
+	f.CalcChain = nil
+	f.Pkg.Store(defaultXMLPathCalcChain, MacintoshCyrillicCharset)
+	assert.EqualError(t, f.RemoveRow("Sheet1", 1), "XML syntax error on line 1: invalid UTF-8")
 }
 
 func TestInsertRows(t *testing.T) {
@@ -383,19 +377,13 @@ func TestInsertRows(t *testing.T) {
 	assert.NoError(t, f.SetCellHyperLink(sheet1, "A5", "https://github.com/xuri/excelize", "External"))
 
 	assert.NoError(t, f.InsertRows(sheet1, 1, 1))
-	if !assert.Len(t, r.SheetData.Row, rowCount+1) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount+1)
 
 	assert.NoError(t, f.InsertRows(sheet1, 4, 1))
-	if !assert.Len(t, r.SheetData.Row, rowCount+2) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount+2)
 
 	assert.NoError(t, f.InsertRows(sheet1, 4, 2))
-	if !assert.Len(t, r.SheetData.Row, rowCount+4) {
-		t.FailNow()
-	}
+	assert.Len(t, r.SheetData.Row, rowCount+4)
 	// Test insert rows with invalid sheet name
 	assert.EqualError(t, f.InsertRows("Sheet:1", 1, 1), ErrSheetNameInvalid.Error())
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (f File) removeFormula(c xlsxC, ws *xlsxWorksheet, sheet string) error {`
`194`	`194`	`for col, cell := range row.C {`
`195`	`195`	`if cell.F != nil && cell.F.Si != nil && cell.F.Si == si {`
`196`	`196`	`ws.SheetData.Row[r].C[col].F = nil`
`197`		`- ws.deleteSharedFormula(c)`
	`197`	`+ ws.formulaSI.Delete(si)`
`198`	`198`	`_ = f.deleteCalcChain(sheetID, cell.R)`
`199`	`199`	`}`
`200`	`200`	`}`