require-error: skip calls in else-branch

Author: Antonboom

analyzer/testdata/src/require-error-skip-logic/real_examples_test.go

@@ -509,6 +509,38 @@ func TestService_DeclareFixedRoles(t *testing.T) {
 	}
 }
 
+func TestIssue62(t *testing.T) {
+	cases := []struct {
+		name           string
+		expectedError  error
+		failureDetails any
+	}{
+		{},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			failureDetails, err := operationWithResult()
+
+			if tc.expectedError != nil {
+				assert.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				if tc.failureDetails != nil {
+					assert.Error(t, err) // want "require-error: for error assertions use require"
+					assert.Equal(t, failureDetails, tc.failureDetails)
+				} else if false {
+					assert.Error(t, err)
+				} else if true {
+					assert.Error(t, err)
+				} else {
+					assert.Equal(t, failureDetails, tc.failureDetails)
+				}
+			}
+		})
+	}
+}
+
 func createTempPackageJson(t *testing.T, version string) error {
 	t.Helper()
 

internal/checkers/require_error.go

@@ -176,7 +176,20 @@ func needToSkipBasedOnContext(
 	_, blockEndWithReturn := block.List[len(block.List)-1].(*ast.ReturnStmt)
 	if !blockEndWithReturn {
 		for i := currCallIndex + 1; i < len(otherCalls); i++ {
-			if (otherCalls[i].rootIf == nil) || (otherCalls[i].rootIf != currCall.rootIf) {
+			nextCall := otherCalls[i]
+			nextCallInElseBlock := false
+
+			if pIf := currCall.parentIf; pIf != nil && pIf.Else != nil {
+				ast.Inspect(pIf.Else, func(n ast.Node) bool {
+					if n == nextCall.call {
+						nextCallInElseBlock = true
+						return false
+					}
+					return true
+				})
+			}
+
+			if !nextCallInElseBlock {
 				noCallsAfter = false
 				break
 			}