add more test cases for issue #11 and fix bugs

Author: ghostiam

processor.go

@@ -42,8 +42,10 @@ func (c *processor) process(n ast.Node) (*Result, error) {
 
 			if len(x.Rhs) > i {
 				value := x.Rhs[i]
-				if hasPointerKeyWithoutPointerGetter(c.info, s, value) {
-					c.filter.AddPos(value.Pos())
+				if se, ok := value.(*ast.SelectorExpr); ok {
+					if hasPointerKeyWithoutPointerGetter(c.info, s, se) {
+						c.filter.AddPos(se.Sel.Pos())
+					}
 				}
 			}
 		}
@@ -60,8 +62,10 @@ func (c *processor) process(n ast.Node) (*Result, error) {
 		}
 
 	case *ast.KeyValueExpr:
-		if hasPointerKeyWithoutPointerGetter(c.info, x.Key, x.Value) {
-			c.filter.AddPos(x.Value.Pos())
+		if se, ok := x.Value.(*ast.SelectorExpr); ok {
+			if hasPointerKeyWithoutPointerGetter(c.info, x.Key, se) {
+				c.filter.AddPos(se.Sel.Pos())
+			}
 		}
 
 	case *ast.CallExpr:
@@ -188,8 +192,11 @@ func (c *processor) processInner(expr ast.Expr) {
 		c.processInner(x.X)
 		c.write(".")
 
+		// Skip if the field is filtered.
+		isFiltered := c.filter.IsFiltered(x.Sel.Pos())
+
 		// If getter exists, use it.
-		if methodIsExists(c.info, x.X, "Get"+x.Sel.Name) {
+		if methodIsExists(c.info, x.X, "Get"+x.Sel.Name) && !isFiltered {
 			c.writeFrom(x.Sel.Name)
 			c.writeTo("Get" + x.Sel.Name + "()")
 			return
@@ -362,18 +369,13 @@ func getterResultHasPointer(info *types.Info, x ast.Expr, name string) (hasPoint
 	return false, false
 }
 
-func hasPointerKeyWithoutPointerGetter(info *types.Info, key ast.Expr, value ast.Expr) bool {
+func hasPointerKeyWithoutPointerGetter(info *types.Info, key ast.Expr, value *ast.SelectorExpr) bool {
 	_, isPtr := info.TypeOf(key).(*types.Pointer)
 	if !isPtr {
 		return false
 	}
 
-	se, ok := value.(*ast.SelectorExpr)
-	if !ok {
-		return false
-	}
-
-	getterHasPointer, ok := getterResultHasPointer(info, se.X, se.Sel.Name)
+	getterHasPointer, ok := getterResultHasPointer(info, value.X, value.Sel.Name)
 	if !ok {
 		return false
 	}

testdata/proto/test.pb.go

@@ -31,6 +31,7 @@ message Test {
 message Embedded {
   string s = 1;
   Embedded embedded = 2;
+  optional bool opt_bool = 3;
 }
 
 service Testing {

testdata/proto/test.proto

@@ -107,6 +107,18 @@ func testInvalid(t *proto.Test) {
 	_ = many[slicesIndexFunc(many, func(m *proto.Test) bool {
 		return strings.Contains(strings.ToLower(m.GetS()), "specific value")
 	})].GetS()
+
+	// issue #11
+	var optBoolVar *bool
+	optBoolVar = t.Embedded.OptBool // want `avoid direct access to proto field t\.Embedded\.OptBool, use t\.GetEmbedded\(\)\.OptBool instead`
+	_ = optBoolVar
+
+	type structWithPtrField struct {
+		OptBool *bool
+	}
+	_ = structWithPtrField{
+		OptBool: t.Embedded.OptBool, // want `avoid direct access to proto field t\.Embedded\.OptBool, use t\.GetEmbedded\(\)\.OptBool instead`
+	}
 }
 
 func testValid(t *proto.Test) {
@@ -195,6 +207,7 @@ func testValid(t *proto.Test) {
 	// issue #11
 	var optBoolVar *bool
 	optBoolVar = t.OptBool
+	optBoolVar = t.GetEmbedded().OptBool
 	_ = optBoolVar
 
 	type structWithPtrField struct {
@@ -203,6 +216,9 @@ func testValid(t *proto.Test) {
 	_ = structWithPtrField{
 		OptBool: t.OptBool,
 	}
+	_ = structWithPtrField{
+		OptBool: t.GetEmbedded().OptBool,
+	}
 }
 
 // stubs

testdata/test.go

@@ -108,6 +108,18 @@ func testInvalid(t *proto.Test) {
 	_ = many[slicesIndexFunc(many, func(m *proto.Test) bool {
 		return strings.Contains(strings.ToLower(m.GetS()), "specific value")
 	})].GetS()
+
+	// issue #11
+	var optBoolVar *bool
+	optBoolVar = t.GetEmbedded().OptBool // want `avoid direct access to proto field t\.Embedded\.OptBool, use t\.GetEmbedded\(\)\.OptBool instead`
+	_ = optBoolVar
+
+	type structWithPtrField struct {
+		OptBool *bool
+	}
+	_ = structWithPtrField{
+		OptBool: t.GetEmbedded().OptBool, // want `avoid direct access to proto field t\.Embedded\.OptBool, use t\.GetEmbedded\(\)\.OptBool instead`
+	}
 }
 
 func testValid(t *proto.Test) {
@@ -196,6 +208,7 @@ func testValid(t *proto.Test) {
 	// issue #11
 	var optBoolVar *bool
 	optBoolVar = t.OptBool
+	optBoolVar = t.GetEmbedded().OptBool
 	_ = optBoolVar
 
 	type structWithPtrField struct {
@@ -204,6 +217,9 @@ func testValid(t *proto.Test) {
 	_ = structWithPtrField{
 		OptBool: t.OptBool,
 	}
+	_ = structWithPtrField{
+		OptBool: t.GetEmbedded().OptBool,
+	}
 }
 
 // stubs