Merge pull request #20 from rliebz/only-binary-operators

Fix handling of miscellaneous operators

Author: uudashr

gocognit.go

@@ -272,7 +272,7 @@ func (v *complexityVisitor) visitBranchStmt(n *ast.BranchStmt) ast.Visitor {
 }
 
 func (v *complexityVisitor) visitBinaryExpr(n *ast.BinaryExpr) ast.Visitor {
-	if (n.Op == token.LAND || n.Op == token.LOR) && !v.isCalculated(n) {
+	if isBinaryLogicalOp(n.Op) && !v.isCalculated(n) {
 		ops := v.collectBinaryOps(n)
 
 		var lastOp token.Token
@@ -299,15 +299,10 @@ func (v *complexityVisitor) visitCallExpr(n *ast.CallExpr) ast.Visitor {
 
 func (v *complexityVisitor) collectBinaryOps(exp ast.Expr) []token.Token {
 	v.markCalculated(exp)
-	switch exp := exp.(type) {
-	case *ast.BinaryExpr:
+	if exp, ok := exp.(*ast.BinaryExpr); ok {
 		return mergeBinaryOps(v.collectBinaryOps(exp.X), exp.Op, v.collectBinaryOps(exp.Y))
-	case *ast.ParenExpr:
-		// interest only on what inside paranthese
-		return v.collectBinaryOps(exp.X)
-	default:
-		return []token.Token{}
 	}
+	return nil
 }
 
 func (v *complexityVisitor) incIfComplexity(n *ast.IfStmt) {
@@ -320,16 +315,18 @@ func (v *complexityVisitor) incIfComplexity(n *ast.IfStmt) {
 
 func mergeBinaryOps(x []token.Token, op token.Token, y []token.Token) []token.Token {
 	var out []token.Token
-	if len(x) != 0 {
-		out = append(out, x...)
-	}
-	out = append(out, op)
-	if len(y) != 0 {
-		out = append(out, y...)
+	out = append(out, x...)
+	if isBinaryLogicalOp(op) {
+		out = append(out, op)
 	}
+	out = append(out, y...)
 	return out
 }
 
+func isBinaryLogicalOp(op token.Token) bool {
+	return op == token.LAND || op == token.LOR
+}
+
 const Doc = `Find complex function using cognitive complexity calculation.
 
 The gocognit analysis reports functions or methods which the complexity is over 

testdata/src/a/a.go

@@ -59,6 +59,14 @@ func SimpleLogicalSeq2(a, b, c, d bool) string { // want "cognitive complexity 2
 	return "not ok"
 } // total complexity = 2
 
+func SimpleLogicalSeq3(a, b, c interface{}) string { // want "cognitive complexity 2 of func SimpleLogicalSeq3 is high \\(> 0\\)"
+	if a == nil || b != nil || c != nil { // +1 for `if`, +1 for `||` sequence
+		return "ok"
+	}
+
+	return "not ok"
+} // total complexity = 2
+
 func ComplexLogicalSeq1(a, b, c, d, e, f bool) string { // want "cognitive complexity 4 of func ComplexLogicalSeq1 is high \\(> 0\\)"
 	if a && b && c || d || e && f { // +1 for `if`, +3 for changing sequence of `&&` `||` `&&`
 		return "ok"
@@ -68,13 +76,48 @@ func ComplexLogicalSeq1(a, b, c, d, e, f bool) string { // want "cognitive compl
 } // total complexity = 4
 
 func ComplexLogicalSeq2(a, b, c, d, e, f bool) string { // want "cognitive complexity 3 of func ComplexLogicalSeq2 is high \\(> 0\\)"
-	if a && !(b && c) { // +1 for `if`, +2 for having sequence of `&&` `&&` chain
+	if a && !(b && c) { // +1 for `if`, +1 for each `&&` chain
+		return "ok"
+	}
+
+	return "not ok"
+} // total complexity = 3
+
+func ComplexLogicalSeq3(a, b, c, d, e, f bool) string { // want "cognitive complexity 3 of func ComplexLogicalSeq3 is high \\(> 0\\)"
+	if a && (b && c) { // +1 for `if`, +1 for each `&&` chain
 		return "ok"
 	}
 
 	return "not ok"
 } // total complexity = 3
 
+func ComplexLogicalSeq4(a, b, c, d, e, f bool) bool { // want "cognitive complexity 3 of func ComplexLogicalSeq4 is high \\(> 0\\)"
+	return a && b && c || d || e && f // +3 for changing sequence of `&&` `||` `&&`
+} // total complexity = 3
+
+func ComplexLogicalSeq5(a, b, c, d, e, f bool) bool { // want "cognitive complexity 3 of func ComplexLogicalSeq5 is high \\(> 0\\)"
+	return a && b && (c && d || e || f) // +1 for `&&` sequence, +2 for `&&` `||` sequence in parentheses
+} // total complexity = 3
+
+func ExprFunc(a, b, c any) bool { // want "cognitive complexity 2 of func ExprFunc is high \\(> 0\\)"
+	if a != nil || b != nil || c != nil { // +1 for `if`, +1 for `||` chain
+		return false
+	}
+
+	return true
+} // total complexity = 2
+
+func VarFunc(a, b, c any) bool { // want "cognitive complexity 2 of func VarFunc is high \\(> 0\\)"
+	na := a != nil
+	nb := b != nil
+	nc := c != nil
+	if na || nb || nc { // +1 for `if`, +1 for `||` chain
+		return false
+	}
+
+	return true
+} // total complexity = 2
+
 func GetWords(number int) string { // want "cognitive complexity 1 of func GetWords is high \\(> 0\\)"
 	switch number { // +1
 	case 1: