Skip to content

DefinedNames SheetNames are not escaped correctly, if a sheet gets renamed #2127

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.

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

Merged
merged 9 commits into from
May 8, 2025
11 changes: 3 additions & 8 deletions adjust.go
Original file line number Diff line number Diff line change
Expand Up @@ -457,20 +457,15 @@ func transformParenthesesToken(token efp.Token) string {
// adjustRangeSheetName returns replaced range reference by given source and
// target sheet name.
func adjustRangeSheetName(rng, source, target string) string {
source = escapeSheetName(source)
cellRefs := strings.Split(rng, ",")
for i, cellRef := range cellRefs {
rangeRefs := strings.Split(cellRef, ":")
for j, rangeRef := range rangeRefs {
parts := strings.Split(rangeRef, "!")
for k, part := range parts {
singleQuote := strings.HasPrefix(part, "'") && strings.HasSuffix(part, "'")
if singleQuote {
part = strings.TrimPrefix(strings.TrimSuffix(part, "'"), "'")
}
if part == source {
if part = target; singleQuote {
part = "'" + part + "'"
}
if strings.TrimPrefix(strings.TrimSuffix(part, "'"), "'") == source {
part = escapeSheetName(target)
}
parts[k] = part
}
Expand Down
10 changes: 8 additions & 2 deletions sheet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,8 @@ func TestSetSheetName(t *testing.T) {
assert.Equal(t, "sheet1", f.GetSheetName(0))
// Test set sheet name with invalid sheet name
assert.Equal(t, f.SetSheetName("Sheet:1", "Sheet1"), ErrSheetNameInvalid)
_, err := f.NewSheet("Sheet 3")
assert.NoError(t, err)

// Test set worksheet name with existing defined name and auto filter
assert.NoError(t, f.AutoFilter("Sheet1", "A1:A2", nil))
Expand All @@ -496,8 +498,12 @@ func TestSetSheetName(t *testing.T) {
Name: "Name3",
RefersTo: "Sheet1!$A$1:'Sheet1'!A1:Sheet1!$A$1,Sheet1!A1:Sheet3!A1,Sheet3!A1",
}))
assert.NoError(t, f.SetSheetName("Sheet1", "Sheet2"))
for i, expected := range []string{"'Sheet2'!$A$1:$A$2", "$B$2", "$A1$2:A2", "Sheet2!$A$1:'Sheet2'!A1:Sheet2!$A$1,Sheet2!A1:Sheet3!A1,Sheet3!A1"} {
assert.NoError(t, f.SetDefinedName(&DefinedName{
Name: "Name4",
RefersTo: "'Sheet 3'!$A1$2:A2",
}))
assert.NoError(t, f.SetSheetName("Sheet1", "Sheet 2"))
for i, expected := range []string{"'Sheet 2'!$A$1:$A$2", "$B$2", "$A1$2:A2", "'Sheet 2'!$A$1:'Sheet 2'!A1:'Sheet 2'!$A$1,'Sheet 2'!A1:Sheet3!A1,Sheet3!A1", "'Sheet 3'!$A1$2:A2"} {
assert.Equal(t, expected, f.WorkBook.DefinedNames.DefinedName[i].Data)
}
}
Expand Down