Improve accuracy of messages

vimeo · Oct 7, 2020 · c8d4baf · c8d4baf
1 parent c2108e8
commit c8d4baf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/AndAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/AndAnalyzer.php
@@ -134,7 +134,8 @@ function ($c) use ($reconciled_expression_clauses): bool {
                 $statements_analyzer,
                 [],
                 $context->inside_loop,
-                new CodeLocation($statements_analyzer->getSource(), $stmt->left)
+                new CodeLocation($statements_analyzer->getSource(), $stmt->left),
+                $context->inside_negation
             );
 
             $right_context->vars_in_scope = $right_vars_in_scope;

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/OrAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/OrAnalyzer.php
@@ -189,7 +189,7 @@ function ($c) use ($reconciled_expression_clauses): bool {
                 [],
                 $left_context->inside_loop,
                 new CodeLocation($statements_analyzer->getSource(), $stmt->left),
-                true
+                !$context->inside_negation
             );
             $right_context->vars_in_scope = $right_vars_in_scope;
         }
@@ -270,7 +270,8 @@ function ($c) {
                 $statements_analyzer,
                 [],
                 $left_context->inside_loop,
-                new CodeLocation($statements_analyzer->getSource(), $stmt->right)
+                new CodeLocation($statements_analyzer->getSource(), $stmt->right),
+                $context->inside_negation
             );
         }