From 45ead9b6b09f10e1f0aad53deb1ac9ab686f31a0 Mon Sep 17 00:00:00 2001 From: songzhibin97 <718428482@qq.com> Date: Thu, 27 Oct 2022 16:10:08 +0800 Subject: [PATCH 1/2] Update model.go --- mockgen/model/model.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mockgen/model/model.go b/mockgen/model/model.go index 94d7f4ba..ece5dae3 100644 --- a/mockgen/model/model.go +++ b/mockgen/model/model.go @@ -412,10 +412,17 @@ func typeFromType(t reflect.Type) (Type, error) { return PredeclaredType("byte"), nil } + tp := t.Name() + if l, r := strings.Index(tp, "["), strings.Index(tp, "]"); l != -1 && r != -1 { + content := tp[l+1 : r] + sp := strings.Split(content, "/") + tp = tp[:l+1] + sp[len(sp)-1] + tp[r:] + } + if imp := t.PkgPath(); imp != "" { return &NamedType{ Package: impPath(imp), - Type: t.Name(), + Type: tp, }, nil } From bebce62b50491181ffaefada2bb3dd3e444684d4 Mon Sep 17 00:00:00 2001 From: songzhibin97 <718428482@qq.com> Date: Fri, 28 Oct 2022 08:50:52 +0800 Subject: [PATCH 2/2] Update model.go --- mockgen/model/model.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mockgen/model/model.go b/mockgen/model/model.go index ece5dae3..0fa4a2c8 100644 --- a/mockgen/model/model.go +++ b/mockgen/model/model.go @@ -412,14 +412,13 @@ func typeFromType(t reflect.Type) (Type, error) { return PredeclaredType("byte"), nil } - tp := t.Name() - if l, r := strings.Index(tp, "["), strings.Index(tp, "]"); l != -1 && r != -1 { - content := tp[l+1 : r] - sp := strings.Split(content, "/") - tp = tp[:l+1] + sp[len(sp)-1] + tp[r:] - } - if imp := t.PkgPath(); imp != "" { + tp := t.Name() + if l, r := strings.Index(tp, "["), strings.Index(tp, "]"); l != -1 && r != -1 { + content := tp[l+1 : r] + sp := strings.Split(content, "/") + tp = tp[:l+1] + sp[len(sp)-1] + tp[r:] + } return &NamedType{ Package: impPath(imp), Type: tp,