Minor style change - Reduced newlines for struct initialization

go-analyze · Feb 11, 2024 · 79d3553 · 79d3553
1 parent 28bb889
commit 79d3553
Show file tree

Hide file tree

Showing 17 changed files with 129 additions and 544 deletions.
diff --git a/echarts_test.go b/echarts_test.go
@@ -81,12 +81,7 @@ func TestEChartStyle(t *testing.T) {
 	es := EChartStyle{
 		Color: "#999",
 	}
-	color := drawing.Color{
-		R: 153,
-		G: 153,
-		B: 153,
-		A: 255,
-	}
+	color := drawing.Color{R: 153, G: 153, B: 153, A: 255}
 	assert.Equal(t, Style{
 		FillColor:   color,
 		FontColor:   color,

diff --git a/examples/area_line_chart/main.go b/examples/area_line_chart/main.go
@@ -1,26 +1,20 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-  "github.com/go-analyze/charts"
+	"github.com/go-analyze/charts"
 )
 
 func writeFile(buf []byte) error {
 	tmpPath := "./tmp"
-	err := os.MkdirAll(tmpPath, 0700)
-	if err != nil {
+	if err := os.MkdirAll(tmpPath, 0700); err != nil {
 		return err
 	}
 
 	file := filepath.Join(tmpPath, "area-line-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
-	if err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(file, buf, 0600)
 }
 
 func main() {
@@ -63,12 +57,9 @@ func main() {
 		panic(err)
 	}
 
-	buf, err := p.Bytes()
-	if err != nil {
+	if buf, err := p.Bytes(); err != nil {
 		panic(err)
-	}
-	err = writeFile(buf)
-	if err != nil {
+	} else if err = writeFile(buf); err != nil {
 		panic(err)
 	}
 }
diff --git a/examples/bar_chart/main.go b/examples/bar_chart/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -10,17 +9,12 @@ import (
 
 func writeFile(buf []byte) error {
 	tmpPath := "./tmp"
-	err := os.MkdirAll(tmpPath, 0700)
-	if err != nil {
+	if err := os.MkdirAll(tmpPath, 0700); err != nil {
 		return err
 	}
 
 	file := filepath.Join(tmpPath, "bar-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
-	if err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(file, buf, 0600)
 }
 
 func main() {
@@ -92,12 +86,9 @@ func main() {
 		panic(err)
 	}
 
-	buf, err := p.Bytes()
-	if err != nil {
+	if buf, err := p.Bytes(); err != nil {
 		panic(err)
-	}
-	err = writeFile(buf)
-	if err != nil {
+	} else if err = writeFile(buf); err != nil {
 		panic(err)
 	}
 }
diff --git a/examples/chinese/main.go b/examples/chinese/main.go
@@ -14,10 +14,7 @@ func writeFile(buf []byte) error {
 	}
 
 	file := filepath.Join(tmpPath, "chinese-line-chart.png")
-	if err := os.WriteFile(file, buf, 0600); err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(file, buf, 0600)
 }
 
 func main() {

diff --git a/examples/funnel_chart/main.go b/examples/funnel_chart/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -10,17 +9,12 @@ import (
 
 func writeFile(buf []byte) error {
 	tmpPath := "./tmp"
-	err := os.MkdirAll(tmpPath, 0700)
-	if err != nil {
+	if err := os.MkdirAll(tmpPath, 0700); err != nil {
 		return err
 	}
 
 	file := filepath.Join(tmpPath, "funnel-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
-	if err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(file, buf, 0600)
 }
 
 func main() {
@@ -50,12 +44,9 @@ func main() {
 		panic(err)
 	}
 
-	buf, err := p.Bytes()
-	if err != nil {
+	if buf, err := p.Bytes(); err != nil {
 		panic(err)
-	}
-	err = writeFile(buf)
-	if err != nil {
+	} else if err = writeFile(buf); err != nil {
 		panic(err)
 	}
 }
diff --git a/examples/line_chart/main.go b/examples/line_chart/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -11,17 +10,12 @@ import (
 
 func writeFile(buf []byte) error {
 	tmpPath := "./tmp"
-	err := os.MkdirAll(tmpPath, 0700)
-	if err != nil {
+	if err := os.MkdirAll(tmpPath, 0700); err != nil {
 		return err
 	}
 
 	file := filepath.Join(tmpPath, "line-chart.png")
-	err = ioutil.WriteFile(file, buf, 0600)
-	if err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(file, buf, 0600)
 }
 
 func main() {
@@ -109,12 +103,9 @@ func main() {
 		panic(err)
 	}
 
-	buf, err := p.Bytes()
-	if err != nil {
+	if buf, err := p.Bytes(); err != nil {
 		panic(err)
-	}
-	err = writeFile(buf)
-	if err != nil {
+	} else if err = writeFile(buf); err != nil {
 		panic(err)
 	}
 }
diff --git a/examples/table/main.go b/examples/table/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -14,17 +13,12 @@ import (
 
 func writeFile(buf []byte, filename string) error {
 	tmpPath := "./tmp"
-	err := os.MkdirAll(tmpPath, 0700)
-	if err != nil {
+	if err := os.MkdirAll(tmpPath, 0700); err != nil {
 		return err
 	}
 
 	file := filepath.Join(tmpPath, filename)
-	err = ioutil.WriteFile(file, buf, 0600)
-	if err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(file, buf, 0600)
 }
 
 func main() {
@@ -86,12 +80,7 @@ func main() {
 		panic(err)
 	}
 
-	bgColor := charts.Color{
-		R: 16,
-		G: 22,
-		B: 30,
-		A: 255,
-	}
+	bgColor := charts.Color{R: 16, G: 22, B: 30, A: 255}
 	p, err = charts.TableOptionRender(charts.TableChartOption{
 		Header: []string{
 			"Name",
@@ -148,19 +137,9 @@ func main() {
 				},
 			}
 			if value > 0 {
-				style.FillColor = charts.Color{
-					R: 179,
-					G: 53,
-					B: 20,
-					A: 255,
-				}
+				style.FillColor = charts.Color{R: 179, G: 53, B: 20, A: 255}
 			} else if value < 0 {
-				style.FillColor = charts.Color{
-					R: 33,
-					G: 124,
-					B: 50,
-					A: 255,
-				}
+				style.FillColor = charts.Color{R: 33, G: 124, B: 50, A: 255}
 			}
 			return &style
 		},
@@ -169,12 +148,9 @@ func main() {
 		panic(err)
 	}
 
-	buf, err = p.Bytes()
-	if err != nil {
+	if buf, err = p.Bytes(); err != nil {
 		panic(err)
-	}
-	err = writeFile(buf, "table-color.png")
-	if err != nil {
+	} else if err = writeFile(buf, "table-color.png"); err != nil {
 		panic(err)
 	}
 }
diff --git a/legend_test.go b/legend_test.go
@@ -18,11 +18,7 @@ func TestNewLegend(t *testing.T) {
 		{
 			render: func(p *Painter) ([]byte, error) {
 				_, err := NewLegendPainter(p, LegendOption{
-					Data: []string{
-						"One",
-						"Two",
-						"Three",
-					},
+					Data: []string{"One", "Two", "Three"},
 				}).Render()
 				if err != nil {
 					return nil, err
@@ -34,11 +30,7 @@ func TestNewLegend(t *testing.T) {
 		{
 			render: func(p *Painter) ([]byte, error) {
 				_, err := NewLegendPainter(p, LegendOption{
-					Data: []string{
-						"One",
-						"Two",
-						"Three",
-					},
+					Data: []string{"One", "Two", "Three"},
 					Left: PositionLeft,
 				}).Render()
 				if err != nil {
@@ -51,11 +43,7 @@ func TestNewLegend(t *testing.T) {
 		{
 			render: func(p *Painter) ([]byte, error) {
 				_, err := NewLegendPainter(p, LegendOption{
-					Data: []string{
-						"One",
-						"Two",
-						"Three",
-					},
+					Data:   []string{"One", "Two", "Three"},
 					Orient: OrientVertical,
 					Icon:   IconRect,
 					Left:   "10%",

diff --git a/mark_line_test.go b/mark_line_test.go
@@ -18,11 +18,7 @@ func TestMarkLine(t *testing.T) {
 		{
 			render: func(p *Painter) ([]byte, error) {
 				markLine := NewMarkLinePainter(p)
-				series := NewSeriesFromValues([]float64{
-					1,
-					2,
-					3,
-				})
+				series := NewSeriesFromValues([]float64{1, 2, 3})
 				series.MarkLine = NewMarkLine(
 					SeriesMarkDataTypeMax,
 					SeriesMarkDataTypeAverage,

diff --git a/mark_point_test.go b/mark_point_test.go
@@ -17,29 +17,16 @@ func TestMarkPoint(t *testing.T) {
 	}{
 		{
 			render: func(p *Painter) ([]byte, error) {
-				series := NewSeriesFromValues([]float64{
-					1,
-					2,
-					3,
-				})
+				series := NewSeriesFromValues([]float64{1, 2, 3})
 				series.MarkPoint = NewMarkPoint(SeriesMarkDataTypeMax)
 				markPoint := NewMarkPointPainter(p)
 				markPoint.Add(markPointRenderOption{
 					FillColor: drawing.ColorBlack,
 					Series:    series,
 					Points: []Point{
-						{
-							X: 10,
-							Y: 10,
-						},
-						{
-							X: 30,
-							Y: 30,
-						},
-						{
-							X: 50,
-							Y: 50,
-						},
+						{X: 10, Y: 10},
+						{X: 30, Y: 30},
+						{X: 50, Y: 50},
 					},
 				})
 				if _, err := markPoint.Render(); err != nil {