Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure generated code is always go-formatted

Browse source
This commit is contained in:
andig 2020-10-01 11:05:06 +02:00
parent 2bb983c547
commit 8a5bd8e119
7 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
charger/evsewifi_decorators.go
View file

@ -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

14
charger/wallbe_decorators.go
View file

@ -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

11
cmd/tools/decorate.go
View file

@ -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)
}

6
meter/meter_decorators.go
View file

@ -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

2
meter/modbus_decorators.go
View file

@ -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
}{

2
meter/sma_decorators.go
View file

@ -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
}{

2
meter/tesla_decorators.go
View file

@ -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
}{