Speed up merge cells

Author: threeq

adjust.go

@@ -145,7 +145,7 @@ func (f *File) adjustAutoFilter(ws *xlsxWorksheet, dir adjustDirection, num, off
 		return nil
 	}
 
-	coordinates, err := f.areaRefToCoordinates(ws.AutoFilter.Ref)
+	coordinates, err := areaRefToCoordinates(ws.AutoFilter.Ref)
 	if err != nil {
 		return err
 	}
@@ -199,7 +199,7 @@ func (f *File) adjustMergeCells(ws *xlsxWorksheet, dir adjustDirection, num, off
 
 	for i := 0; i < len(ws.MergeCells.Cells); i++ {
 		areaData := ws.MergeCells.Cells[i]
-		coordinates, err := f.areaRefToCoordinates(areaData.Ref)
+		coordinates, err := areaRefToCoordinates(areaData.Ref)
 		if err != nil {
 			return err
 		}
@@ -219,7 +219,7 @@ func (f *File) adjustMergeCells(ws *xlsxWorksheet, dir adjustDirection, num, off
 			x1 = f.adjustMergeCellsHelper(x1, num, offset)
 			x2 = f.adjustMergeCellsHelper(x2, num, offset)
 		}
-		if x1 == x2 && y1 == y2 {
+		if x1 == x2 && y1 == y2 && i >= 0 {
 			f.deleteMergeCell(ws, i)
 			i--
 		}
@@ -234,7 +234,7 @@ func (f *File) adjustMergeCells(ws *xlsxWorksheet, dir adjustDirection, num, off
 // compare and calculate cell axis by the given pivot, operation axis and
 // offset.
 func (f *File) adjustMergeCellsHelper(pivot, num, offset int) int {
-	if pivot >= num {
+	if pivot > num {
 		pivot += offset
 		if pivot < 1 {
 			return 1

adjust_test.go

@@ -84,6 +84,10 @@ func TestAdjustHelper(t *testing.T) {
 	assert.EqualError(t, f.adjustHelper("SheetN", rows, 0, 0), "sheet SheetN is not exist")
 }
 
+func TestAdjustMergeCellsHelper(t *testing.T) {
+	assert.Equal(t, 1, NewFile().adjustMergeCellsHelper(1, 0, -2))
+}
+
 func TestAdjustCalcChain(t *testing.T) {
 	f := NewFile()
 	f.CalcChain = &xlsxCalcChain{

calc.go

@@ -5103,11 +5103,11 @@ func (fn *formulaFuncs) kth(name string, argsList *list.List) formulaArg {
 		return newErrorFormulaArg(formulaErrorVALUE, fmt.Sprintf("%s requires 2 arguments", name))
 	}
 	array := argsList.Front().Value.(formulaArg).ToList()
-	kArg := argsList.Back().Value.(formulaArg).ToNumber()
-	if kArg.Type != ArgNumber {
-		return kArg
+	argK := argsList.Back().Value.(formulaArg).ToNumber()
+	if argK.Type != ArgNumber {
+		return argK
 	}
-	k := int(kArg.Number)
+	k := int(argK.Number)
 	if k < 1 {
 		return newErrorFormulaArg(formulaErrorNUM, "k should be > 0")
 	}
@@ -7177,7 +7177,7 @@ func (fn *formulaFuncs) VLOOKUP(argsList *list.List) formulaArg {
 func vlookupBinarySearch(tableArray, lookupValue formulaArg) (matchIdx int, wasExact bool) {
 	var low, high, lastMatchIdx int = 0, len(tableArray.Matrix) - 1, -1
 	for low <= high {
-		var mid int = low + (high-low)/2
+		mid := low + (high-low)/2
 		mtx := tableArray.Matrix[mid]
 		lhs := mtx[0]
 		switch lookupValue.Type {
@@ -7216,7 +7216,7 @@ func vlookupBinarySearch(tableArray, lookupValue formulaArg) (matchIdx int, wasE
 func hlookupBinarySearch(row []formulaArg, lookupValue formulaArg) (matchIdx int, wasExact bool) {
 	var low, high, lastMatchIdx int = 0, len(row) - 1, -1
 	for low <= high {
-		var mid int = low + (high-low)/2
+		mid := low + (high-low)/2
 		mtx := row[mid]
 		result := compareFormulaArg(mtx, lookupValue, false, false)
 		if result == criteriaEq {

cell.go

@@ -101,6 +101,28 @@ func (f *File) SetCellValue(sheet, axis string, value interface{}) error {
 	return err
 }
 
+// String extracts characters from a string item.
+func (x xlsxSI) String() string {
+	if len(x.R) > 0 {
+		var rows strings.Builder
+		for _, s := range x.R {
+			if s.T != nil {
+				rows.WriteString(s.T.Val)
+			}
+		}
+		return bstrUnmarshal(rows.String())
+	}
+	if x.T != nil {
+		return bstrUnmarshal(x.T.Val)
+	}
+	return ""
+}
+
+// hasValue determine if cell non-blank value.
+func (c *xlsxC) hasValue() bool {
+	return c.S != 0 || c.V != "" || c.F != nil || c.T != ""
+}
+
 // setCellIntFunc is a wrapper of SetCellInt.
 func (f *File) setCellIntFunc(sheet, axis string, value interface{}) error {
 	var err error
@@ -431,13 +453,11 @@ func (f *File) GetCellHyperLink(sheet, axis string) (bool, string, error) {
 	if _, _, err := SplitCellName(axis); err != nil {
 		return false, "", err
 	}
-
 	ws, err := f.workSheetReader(sheet)
 	if err != nil {
 		return false, "", err
 	}
-	axis, err = f.mergeCellsParser(ws, axis)
-	if err != nil {
+	if axis, err = f.mergeCellsParser(ws, axis); err != nil {
 		return false, "", err
 	}
 	if ws.Hyperlinks != nil {
@@ -485,8 +505,7 @@ func (f *File) SetCellHyperLink(sheet, axis, link, linkType string, opts ...Hype
 	if err != nil {
 		return err
 	}
-	axis, err = f.mergeCellsParser(ws, axis)
-	if err != nil {
+	if axis, err = f.mergeCellsParser(ws, axis); err != nil {
 		return err
 	}
 
@@ -932,7 +951,7 @@ func (f *File) checkCellInArea(cell, area string) (bool, error) {
 	if len(rng) != 2 {
 		return false, err
 	}
-	coordinates, err := f.areaRefToCoordinates(area)
+	coordinates, err := areaRefToCoordinates(area)
 	if err != nil {
 		return false, err
 	}

col.go

@@ -616,10 +616,10 @@ func (f *File) positionObjectPixels(sheet string, col, row, x1, y1, width, heigh
 // getColWidth provides a function to get column width in pixels by given
 // sheet name and column number.
 func (f *File) getColWidth(sheet string, col int) int {
-	xlsx, _ := f.workSheetReader(sheet)
-	if xlsx.Cols != nil {
+	ws, _ := f.workSheetReader(sheet)
+	if ws.Cols != nil {
 		var width float64
-		for _, v := range xlsx.Cols.Col {
+		for _, v := range ws.Cols.Col {
 			if v.Min <= col && col <= v.Max {
 				width = v.Width
 			}

lib.go

@@ -221,12 +221,11 @@ func CoordinatesToCellName(col, row int, abs ...bool) (string, error) {
 
 // areaRefToCoordinates provides a function to convert area reference to a
 // pair of coordinates.
-func (f *File) areaRefToCoordinates(ref string) ([]int, error) {
+func areaRefToCoordinates(ref string) ([]int, error) {
 	rng := strings.Split(strings.Replace(ref, "$", "", -1), ":")
 	if len(rng) < 2 {
 		return nil, ErrParameterInvalid
 	}
-
 	return areaRangeToCoordinates(rng[0], rng[1])
 }
 
@@ -290,7 +289,7 @@ func (f *File) flatSqref(sqref string) (cells map[int][][]int, err error) {
 			}
 			cells[col] = append(cells[col], []int{col, row})
 		case 2:
-			if coordinates, err = f.areaRefToCoordinates(ref); err != nil {
+			if coordinates, err = areaRefToCoordinates(ref); err != nil {
 				return
 			}
 			_ = sortCoordinates(coordinates)