Improve IsGomegaVar() and IsGomegaType()

Don't check non ast.Ident expressions for been Gomega variables.

Make more accurate check for the Gomega types (struct or interface).
check the alias value instead of the alias.

Author: nunnatsa

internal/gomegainfo/gomegainfo.go

@@ -86,30 +86,35 @@ func IsAssertionFunc(name string) bool {
 }
 
 func IsGomegaVar(x ast.Expr, pass *analysis.Pass) bool {
-	if tx, ok := pass.TypesInfo.Types[x]; ok {
-		return IsGomegaType(tx.Type)
+	if _, isIdent := x.(*ast.Ident); !isIdent {
+		return false
 	}
 
-	return false
+	tx, ok := pass.TypesInfo.Types[x]
+	if !ok {
+		return false
+	}
+
+	return IsGomegaType(tx.Type)
 }
 
+const (
+	gomegaStructType = "github.com/onsi/gomega/internal.Gomega"
+	gomegaInterface  = "github.com/onsi/gomega/types.Gomega"
+)
+
 func IsGomegaType(t gotypes.Type) bool {
-	var typeStr string
 	switch ttx := t.(type) {
 	case *gotypes.Pointer:
-		tp := ttx.Elem()
-		typeStr = tp.String()
+		return IsGomegaType(ttx.Elem())
 
 	case *gotypes.Named:
-		typeStr = ttx.String()
+		name := ttx.String()
+		return strings.HasSuffix(name, gomegaStructType) || strings.HasSuffix(name, gomegaInterface)
 
 	case *gotypes.Alias:
-		typeStr = ttx.String()
-
-	default:
-		return false
+		return IsGomegaType(ttx.Rhs())
 	}
 
-	return strings.Contains(typeStr, "github.com/onsi/gomega") &&
-		(strings.HasSuffix(typeStr, "Gomega") || strings.HasSuffix(typeStr, "WithT"))
+	return false
 }