From 638bd44dd5940bfcc5921171dc00978f3a24f7e8 Mon Sep 17 00:00:00 2001 From: Ri Xu Date: Wed, 31 Jan 2018 11:12:43 +0800 Subject: [PATCH] - gofmted with -s; - Fix ineffectual assignments in Go code; - Godoc has been updated --- cell_test.go | 14 +++++++------- chart.go | 4 ++-- lib_test.go | 34 +++++++++++++++++----------------- styles.go | 2 -- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/cell_test.go b/cell_test.go index 2ab5413c..4f9accdd 100644 --- a/cell_test.go +++ b/cell_test.go @@ -4,10 +4,10 @@ import "testing" func TestCheckCellInArea(t *testing.T) { expectedTrueCellInAreaList := [][2]string{ - [2]string{"c2", "A1:AAZ32"}, - [2]string{"AA0", "Z0:AB1"}, - [2]string{"B9", "A1:B9"}, - [2]string{"C2", "C2:C2"}, + {"c2", "A1:AAZ32"}, + {"AA0", "Z0:AB1"}, + {"B9", "A1:B9"}, + {"C2", "C2:C2"}, } for _, expectedTrueCellInArea := range expectedTrueCellInAreaList { @@ -22,9 +22,9 @@ func TestCheckCellInArea(t *testing.T) { } expectedFalseCellInAreaList := [][2]string{ - [2]string{"c2", "A4:AAZ32"}, - [2]string{"C4", "D6:A1"}, // weird case, but you never know - [2]string{"AEF42", "BZ40:AEF41"}, + {"c2", "A4:AAZ32"}, + {"C4", "D6:A1"}, // weird case, but you never know + {"AEF42", "BZ40:AEF41"}, } for _, expectedFalseCellInArea := range expectedFalseCellInAreaList { diff --git a/chart.go b/chart.go index 1f685053..4d0f7632 100644 --- a/chart.go +++ b/chart.go @@ -170,8 +170,8 @@ func parseFormatChartSet(formatSet string) *formatChart { // bar | bar chart // barStacked | stacked bar chart // bar3D | 3D bar chart -// bar3DColumn | 3D column bar chart -// bar3DPercentStacked | 3D 100% stacked bar chart +// bar3DColumn | 3D column bar chart +// bar3DPercentStacked | 3D 100% stacked bar chart // doughnut | doughnut chart // line | line chart // pie | pie chart diff --git a/lib_test.go b/lib_test.go index 3a4dc2c3..c668fc8d 100644 --- a/lib_test.go +++ b/lib_test.go @@ -4,12 +4,12 @@ import "testing" func TestAxisLowerOrEqualThan(t *testing.T) { trueExpectedInputList := [][2]string{ - [2]string{"A", "B"}, - [2]string{"A", "AA"}, - [2]string{"B", "AA"}, - [2]string{"BC", "ABCD"}, - [2]string{"1", "2"}, - [2]string{"2", "11"}, + {"A", "B"}, + {"A", "AA"}, + {"B", "AA"}, + {"BC", "ABCD"}, + {"1", "2"}, + {"2", "11"}, } for _, trueExpectedInput := range trueExpectedInputList { @@ -20,12 +20,12 @@ func TestAxisLowerOrEqualThan(t *testing.T) { } falseExpectedInputList := [][2]string{ - [2]string{"B", "A"}, - [2]string{"AA", "A"}, - [2]string{"AA", "B"}, - [2]string{"ABCD", "AB"}, - [2]string{"2", "1"}, - [2]string{"11", "2"}, + {"B", "A"}, + {"AA", "A"}, + {"AA", "B"}, + {"ABCD", "AB"}, + {"2", "1"}, + {"11", "2"}, } for _, falseExpectedInput := range falseExpectedInputList { @@ -38,11 +38,11 @@ func TestAxisLowerOrEqualThan(t *testing.T) { func TestGetCellColRow(t *testing.T) { cellExpectedColRowList := map[string][2]string{ - "C220": [2]string{"C", "220"}, - "aaef42": [2]string{"aaef", "42"}, - "bonjour": [2]string{"bonjour", ""}, - "59": [2]string{"", "59"}, - "": [2]string{"", ""}, + "C220": {"C", "220"}, + "aaef42": {"aaef", "42"}, + "bonjour": {"bonjour", ""}, + "59": {"", "59"}, + "": {"", ""}, } for cell, expectedColRow := range cellExpectedColRowList { diff --git a/styles.go b/styles.go index 7321c182..98fc2807 100644 --- a/styles.go +++ b/styles.go @@ -2309,12 +2309,10 @@ func (f *File) SetCellStyle(sheet, hcell, vcell string, styleID int) { // Correct the coordinate area, such correct C1:B3 to B1:C3. if vxAxis < hxAxis { - hcell, vcell = vcell, hcell vxAxis, hxAxis = hxAxis, vxAxis } if vyAxis < hyAxis { - hcell, vcell = vcell, hcell vyAxis, hyAxis = hyAxis, vyAxis }