Skip to content

Commit f3e48e6

Browse files
authored
Generated function always returns an error (#12)
1 parent 15eaf72 commit f3e48e6

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

anti/anti.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ func (anti *AntiDig) Generate(invokedType reflect.Type) error {
128128
}
129129

130130
func (anti *AntiDig) generateFunc(invokedType reflect.Type) string {
131-
anti.exprs = append(anti.exprs, anti.returnStmt(invokedType))
131+
anti.exprs = append(anti.exprs, anti.returnStmt(invokedType)+", nil")
132132

133-
returnedTypes := anti.returnedTypes(invokedType)
133+
returnedTypes := anti.returnedTypes(invokedType) + ", error"
134134
out := fmt.Sprintf("func Provide() (%s) {\n", returnedTypes)
135135

136136
for _, expr := range anti.exprs {
@@ -356,7 +356,7 @@ func (anti *AntiDig) SetErrorExpr(fntype reflect.Type) {
356356
errStmt += fmt.Sprintf("%s.%s{}, ", alias, typ.Name())
357357
}
358358
}
359-
errStmt = strings.TrimRight(errStmt, ", ")
359+
errStmt += "err"
360360
errExpr = []string{"if err != nil {", errStmt, "}"}
361361
}
362362

anti/overwrite/testcases/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"github.com/3timeslazy/anti-dig/anti/overwrite/testcases/consumer"
55
)
66

7-
func Provide() consumer.Consumer {
7+
func Provide() (consumer.Consumer, error) {
88
consumerParam := consumer.ConsumerParam{}
99
consumer := consumer.NewConsumer(consumerParam)
10-
return consumer
10+
return consumer, nil
1111
}

anti/testcases/dig_group/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
server "github.com/3timeslazy/anti-dig/anti/testcases/dig_group/server"
66
)
77

8-
func Provide() server.Server {
8+
func Provide() (server.Server, error) {
99
var2_0 := handlers.NewListV1()
1010
var3_handlersV1_0 := var2_0.Handlers
1111
var4_0 := handlers.NewV1()
@@ -26,5 +26,5 @@ func Provide() server.Server {
2626
HandlersV2: var8_handlersV2,
2727
}
2828
var1 := server.New(var9_0)
29-
return var1
29+
return var1, nil
3030
}

anti/testcases/dig_in/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
server "github.com/3timeslazy/anti-dig/anti/testcases/dig_in/server"
55
)
66

7-
func Provide() server.RunParams {
7+
func Provide() (server.RunParams, error) {
88
var1 := server.NewConfig()
99
var2_0 := server.RunParams{
1010
Config: var1,
1111
}
12-
return var2_0
12+
return var2_0, nil
1313
}

anti/testcases/dig_name/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
handlers "github.com/3timeslazy/anti-dig/anti/testcases/dig_name/handlers"
55
)
66

7-
func Provide() handlers.Server {
7+
func Provide() (handlers.Server, error) {
88
var2_handlerV1 := handlers.New()
99
var3_handlerV2 := handlers.New()
1010
var4_handlerV3 := handlers.NewV3()
@@ -14,5 +14,5 @@ func Provide() handlers.Server {
1414
H3: var4_handlerV3,
1515
}
1616
var1 := handlers.NewServer(var5_0)
17-
return var1
17+
return var1, nil
1818
}

anti/testcases/dig_name_2/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
server "github.com/3timeslazy/anti-dig/anti/testcases/dig_name_2/server"
55
)
66

7-
func Provide() server.Server {
7+
func Provide() (server.Server, error) {
88
var3_0 := server.NewV1()
99
var2_v1 := var3_0.Handler
1010
var5_0 := server.NewV2()
@@ -14,5 +14,5 @@ func Provide() server.Server {
1414
V2: var4_v2,
1515
}
1616
var1 := server.NewServer(var6_0)
17-
return var1
17+
return var1, nil
1818
}

anti/testcases/dig_out/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
observability "github.com/3timeslazy/anti-dig/anti/testcases/dig_out/observability"
66
)
77

8-
func Provide() metrics.Metrics {
8+
func Provide() (metrics.Metrics, error) {
99
var2_0 := observability.New()
1010
var1 := var2_0.Metrics
1111
var3 := var2_0.Profiler
12-
return var1
12+
return var1, nil
1313
}

anti/testcases/provide_many/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
db "github.com/3timeslazy/anti-dig/anti/testcases/provide_many/db"
66
)
77

8-
func Provide() db.DB {
8+
func Provide() (db.DB, error) {
99
var2 := config.New()
1010
var1 := db.New(var2)
11-
return var1
11+
return var1, nil
1212
}

anti/testcases/provide_one/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
config "github.com/3timeslazy/anti-dig/anti/testcases/provide_one/config"
55
)
66

7-
func Provide() config.Config {
7+
func Provide() (config.Config, error) {
88
var1 := config.New()
9-
return var1
9+
return var1, nil
1010
}

anti/testcases/same_pkg_name/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
server "github.com/3timeslazy/anti-dig/anti/testcases/same_pkg_name/http/server"
66
)
77

8-
func Provide() (server.Server, grpcserver.Server) {
8+
func Provide() (server.Server, grpcserver.Server, error) {
99
var1 := server.New()
1010
var2 := grpcserver.New()
11-
return var1, var2
11+
return var1, var2, nil
1212
}

0 commit comments

Comments
 (0)