From 8a5bd8e1193e21ecb5609a49fd3609e1b384b428 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Thu, 1 Oct 2020 11:05:06 +0200
Subject: [PATCH] Make sure generated code is always go-formatted

---
 charger/evsewifi_decorators.go | 14 +++++++-------
 charger/wallbe_decorators.go   | 14 +++++++-------
 cmd/tools/decorate.go          | 11 +++++++++--
 meter/meter_decorators.go      |  6 +++---
 meter/modbus_decorators.go     |  2 +-
 meter/sma_decorators.go        |  2 +-
 meter/tesla_decorators.go      |  2 +-
 7 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/charger/evsewifi_decorators.go b/charger/evsewifi_decorators.go
index 78a7a26c3..54088c3d8 100644
--- a/charger/evsewifi_decorators.go
+++ b/charger/evsewifi_decorators.go
@@ -12,7 +12,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		return base
 
 	case meter != nil && meterCurrent == nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 		}{
@@ -23,7 +23,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		}
 
 	case meter == nil && meterCurrent == nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.MeterEnergy
 		}{
@@ -34,7 +34,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		}
 
 	case meter != nil && meterCurrent == nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 			api.MeterEnergy
@@ -49,7 +49,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		}
 
 	case meter == nil && meterCurrent != nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.MeterCurrent
 		}{
@@ -60,7 +60,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		}
 
 	case meter != nil && meterCurrent != nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 			api.MeterCurrent
@@ -75,7 +75,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		}
 
 	case meter == nil && meterCurrent != nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.MeterCurrent
 			api.MeterEnergy
@@ -90,7 +90,7 @@ func decorateEVSE(base api.Charger, meter func() (float64, error), meterEnergy f
 		}
 
 	case meter != nil && meterCurrent != nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 			api.MeterCurrent
diff --git a/charger/wallbe_decorators.go b/charger/wallbe_decorators.go
index 3d06cecb1..c39f82878 100644
--- a/charger/wallbe_decorators.go
+++ b/charger/wallbe_decorators.go
@@ -12,7 +12,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		return base
 
 	case meter != nil && meterCurrent == nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 		}{
@@ -23,7 +23,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		}
 
 	case meter == nil && meterCurrent == nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.MeterEnergy
 		}{
@@ -34,7 +34,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		}
 
 	case meter != nil && meterCurrent == nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 			api.MeterEnergy
@@ -49,7 +49,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		}
 
 	case meter == nil && meterCurrent != nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.MeterCurrent
 		}{
@@ -60,7 +60,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		}
 
 	case meter != nil && meterCurrent != nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 			api.MeterCurrent
@@ -75,7 +75,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		}
 
 	case meter == nil && meterCurrent != nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.MeterCurrent
 			api.MeterEnergy
@@ -90,7 +90,7 @@ func decorateWallbe(base api.Charger, meter func() (float64, error), meterEnergy
 		}
 
 	case meter != nil && meterCurrent != nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Charger
 			api.Meter
 			api.MeterCurrent
diff --git a/cmd/tools/decorate.go b/cmd/tools/decorate.go
index 680e1bc34..8c78a9eba 100644
--- a/cmd/tools/decorate.go
+++ b/cmd/tools/decorate.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"go/format"
 	"io"
 	"os"
 	"strings"
@@ -30,7 +31,7 @@ import (
 	{{- range $typ, $def := .Types}}
 		{{- if gt $idx 0}} &&{{else}}{{$idx = 1}}{{end}} {{$def.VarName}} {{if contains $combo $typ}}!={{else}}=={{end}} nil
 	{{- end}}:
-		return &struct{
+		return &struct {
 			{{.BaseType}}
 {{- range $typ, $def := .Types}}
 	{{- if contains $combo $typ}}
@@ -220,7 +221,13 @@ func main() {
 		out = dst
 	}
 
-	if _, err := out.Write([]byte(generated)); err != nil {
+	formatted, err := format.Source([]byte(generated))
+	if err != nil {
+		println(err)
+		os.Exit(2)
+	}
+
+	if _, err := out.Write(formatted); err != nil {
 		println(err)
 		os.Exit(2)
 	}
diff --git a/meter/meter_decorators.go b/meter/meter_decorators.go
index 0a36919a6..389a1e87a 100644
--- a/meter/meter_decorators.go
+++ b/meter/meter_decorators.go
@@ -12,7 +12,7 @@ func decorateMeter(base api.Meter, meterEnergy func() (float64, error), meterCur
 		return base
 
 	case meterCurrent == nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Meter
 			api.MeterEnergy
 		}{
@@ -23,7 +23,7 @@ func decorateMeter(base api.Meter, meterEnergy func() (float64, error), meterCur
 		}
 
 	case meterCurrent != nil && meterEnergy == nil:
-		return &struct{
+		return &struct {
 			api.Meter
 			api.MeterCurrent
 		}{
@@ -34,7 +34,7 @@ func decorateMeter(base api.Meter, meterEnergy func() (float64, error), meterCur
 		}
 
 	case meterCurrent != nil && meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Meter
 			api.MeterCurrent
 			api.MeterEnergy
diff --git a/meter/modbus_decorators.go b/meter/modbus_decorators.go
index 946af3edc..a4d17e153 100644
--- a/meter/modbus_decorators.go
+++ b/meter/modbus_decorators.go
@@ -12,7 +12,7 @@ func decorateModbus(base api.Meter, meterEnergy func() (float64, error)) api.Met
 		return base
 
 	case meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Meter
 			api.MeterEnergy
 		}{
diff --git a/meter/sma_decorators.go b/meter/sma_decorators.go
index c320c1894..3fd077d4e 100644
--- a/meter/sma_decorators.go
+++ b/meter/sma_decorators.go
@@ -12,7 +12,7 @@ func decorateSMA(base api.Meter, meterEnergy func() (float64, error)) api.Meter
 		return base
 
 	case meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Meter
 			api.MeterEnergy
 		}{
diff --git a/meter/tesla_decorators.go b/meter/tesla_decorators.go
index 8e15221b9..7a899a4b9 100644
--- a/meter/tesla_decorators.go
+++ b/meter/tesla_decorators.go
@@ -12,7 +12,7 @@ func decorateTesla(base api.Meter, meterEnergy func() (float64, error)) api.Mete
 		return base
 
 	case meterEnergy != nil:
-		return &struct{
+		return &struct {
 			api.Meter
 			api.MeterEnergy
 		}{