MatchExpressionArmBody #1726
Merged
MatchExpressionArmBody #1726
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ondrejmirtes
requested changes
Oct 6, 2022
src/Analyser/NodeScopeResolver.php
Outdated
| @@ -2633,7 +2635,8 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void { | |||
| $filteringExpr = new BinaryOp\BooleanOr($filteringExpr, $armCondExpr); | |||
| } | |||
|
|
|||
| $armNodes[] = new MatchExpressionArm($condNodes, $arm->getLine()); | |||
| $matchArmBody = new MatchExpressionArmBody($armCondScope, $arm->body); | |||
There was a problem hiding this comment.
I think the correct scope here is the one that's created below in processExprNode call - $matchScope->filterByTruthyValue($filteringExpr) but please test that :)
src/Analyser/NodeScopeResolver.php
Outdated
| @@ -2603,7 +2604,8 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void { | |||
| $hasYield = $hasYield || $armResult->hasYield(); | |||
| $throwPoints = array_merge($throwPoints, $armResult->getThrowPoints()); | |||
| $scope = $scope->mergeWith($matchScope); | |||
| $armNodes[] = new MatchExpressionArm([], $arm->getLine()); | |||
| $matchArmBody = new MatchExpressionArmBody($scope, $arm->body); | |||
There was a problem hiding this comment.
I think the right scope here is $matchScope. But the one that's correct at the beginning of the foreach, before it's rewritten with $matchScope = $armResult->getScope();.
ondrejmirtes
force-pushed
the
match-arm-body
branch
from
1306b4c
to
738ee83
Compare
ondrejmirtes
approved these changes
Oct 19, 2022
|
I fixed the issues and merged this. Consider it a gift to your newborn 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.