fix --dig-manually skip (#554) (#568)

ktr0731 · Jul 22, 2022 · 9f3b1d2 · 9f3b1d2
1 parent 5d686a5
commit 9f3b1d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/fill/proto/interactive_filler.go b/fill/proto/interactive_filler.go
@@ -106,6 +106,9 @@ func (r *resolver) resolve() (*dynamic.Message, error) {
 		}
 
 		err := r.resolveField(f)
+		if errors.Is(err, prompt.ErrSkip) {
+			continue
+		}
 		if errors.Is(err, prompt.ErrAbort) {
 			return r.msg, nil
 		}
@@ -138,7 +141,7 @@ func (r *resolver) resolveField(f *desc.FieldDescriptor) error {
 		switch t := f.GetType(); t {
 		case descriptorpb.FieldDescriptorProto_TYPE_MESSAGE:
 			if r.skipMessage(f) {
-				return nil, prompt.ErrAbort
+				return nil, prompt.ErrSkip
 			}
 
 			msgr := newResolver(

diff --git a/prompt/prompt.go b/prompt/prompt.go
@@ -38,6 +38,7 @@ var (
 )
 
 var (
+	ErrSkip  = errors.New("skip")
 	ErrAbort = errors.New("abort")
 )