motion: more improvements

Author: fatih

astcontext/funcs.go

@@ -206,12 +206,16 @@ func (p *Parser) Funcs() Funcs {
 		switch x := n.(type) {
 		case *ast.FuncDecl:
 			fn := &Func{
-				Lbrace:  ToPosition(p.fset.Position(x.Body.Lbrace)),
-				Rbrace:  ToPosition(p.fset.Position(x.Body.Rbrace)),
 				FuncPos: ToPosition(p.fset.Position(x.Type.Func)),
 				node:    x,
 			}
 
+			// can be nil for forward declarations
+			if x.Body != nil {
+				fn.Lbrace = ToPosition(p.fset.Position(x.Body.Lbrace))
+				fn.Rbrace = ToPosition(p.fset.Position(x.Body.Rbrace))
+			}
+
 			if x.Doc != nil {
 				fn.Doc = ToPosition(p.fset.Position(x.Doc.Pos()))
 			}

astcontext/query.go

@@ -20,8 +20,8 @@ type Decl struct {
 type Result struct {
 	Mode string `json:"mode" vim:"mode"`
 
-	Decls []Decl `json:"decls" vim:"decls"`
-	Func  *Func  `json:"func" vim:"fn"`
+	Decls []Decl `json:"decls,omitempty" vim:"decls,omitempty"`
+	Func  *Func  `json:"func,omitempty" vim:"fn,omitempty"`
 }
 
 // Query specifies a single query to the parser

vim/vim.go

@@ -84,23 +84,25 @@ func marshal(buf *bytes.Buffer, v reflect.Value) error {
 				continue
 			}
 
-			fv := v.Field(i)
-			if !fv.IsValid() || isEmptyValue(fv) {
-				continue
-			}
-
 			tag := sf.Tag.Get("vim")
 			if tag == "-" {
 				continue
 			}
-			name, _ := parseTag(tag)
+
+			name, options := parseTag(tag)
 			if !isValidTag(name) {
 				name = ""
 			}
+
 			if name == "" {
 				name = sf.Name
 			}
 
+			fv := v.Field(i)
+			if !fv.IsValid() || options == "omitempty" && isEmptyValue(fv) {
+				continue
+			}
+
 			buf.WriteString(sep)
 			sep = ", "