Skip to content

Avoid looking up absent cells in rangeResolver #2111

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 2 commits into from
Mar 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions calc.go
Original file line number Diff line number Diff line change
Expand Up @@ -1690,16 +1690,31 @@
// extract value from ranges
if cellRanges.Len() > 0 {
arg.Type = ArgMatrix

var ws *xlsxWorksheet
ws, err = f.workSheetReader(sheet)
if err != nil {
return
}

for row := valueRange[0]; row <= valueRange[1]; row++ {
colMax := 0
if row <= len(ws.SheetData.Row) {
rowData := &ws.SheetData.Row[row-1]
colMax = min(valueRange[3], len(rowData.C))
}

var matrixRow []formulaArg
for col := valueRange[2]; col <= valueRange[3]; col++ {
var cell string
var value formulaArg
if cell, err = CoordinatesToCellName(col, row); err != nil {
return
}
if value, err = f.cellResolver(ctx, sheet, cell); err != nil {
return
value := newEmptyFormulaArg()
if col <= colMax {
var cell string
if cell, err = CoordinatesToCellName(col, row); err != nil {
return
}
if value, err = f.cellResolver(ctx, sheet, cell); err != nil {
return
}

Check warning on line 1717 in calc.go

View check run for this annotation

Codecov / codecov/patch

calc.go#L1716-L1717

Added lines #L1716 - L1717 were not covered by tests
}
matrixRow = append(matrixRow, value)
}
Expand Down
37 changes: 37 additions & 0 deletions calc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6303,6 +6303,43 @@ func TestCalcBetainvProbIterator(t *testing.T) {
assert.Equal(t, 1.0, betainvProbIterator(1, 1, 1, 1, 1, 1, 1, 1, 1))
}

func TestCalcRangeResolver(t *testing.T) {
f := NewFile()
assert.NoError(t, f.SetCellFormula("Sheet1", "A1", "=SUM(Sheet1!B:B)"))
cellRefs := list.New()
cellRanges := list.New()
// Test extract value from ranges on invalid ranges
cellRanges.PushBack(cellRange{
From: cellRef{Col: 1, Row: 1, Sheet: "SheetN"},
To: cellRef{Col: 1, Row: TotalRows, Sheet: "SheetN"},
})
_, err := f.rangeResolver(&calcContext{}, cellRefs, cellRanges)
assert.EqualError(t, err, "sheet SheetN does not exist")

ws, err := f.workSheetReader("Sheet1")
ws.SheetData.Row = make([]xlsxRow, TotalRows+1)
ws.SheetData.Row[TotalRows].C = make([]xlsxC, 3)
assert.NoError(t, err)
cellRanges.Init()
cellRanges.PushBack(cellRange{
From: cellRef{Col: 3, Row: TotalRows, Sheet: "Sheet1"},
To: cellRef{Col: 3, Row: TotalRows + 1, Sheet: "Sheet1"},
})
_, err = f.rangeResolver(&calcContext{}, cellRefs, cellRanges)
assert.Equal(t, ErrMaxRows, err)

// Test extract value from references with invalid references
cellRanges.Init()
cellRefs.PushBack(cellRef{Col: 1, Row: 1, Sheet: "SheetN"})
_, err = f.rangeResolver(&calcContext{}, cellRefs, cellRanges)
assert.EqualError(t, err, "sheet SheetN does not exist")

cellRefs.Init()
cellRefs.PushBack(cellRef{Col: 1, Row: TotalRows + 1, Sheet: "SheetN"})
_, err = f.rangeResolver(&calcContext{}, cellRefs, cellRanges)
assert.Equal(t, ErrMaxRows, err)
}

func TestNestedFunctionsWithOperators(t *testing.T) {
f := NewFile()
formulaList := map[string]string{
Expand Down