Fix #4568: refine sameLine implicit object tagging #4598
Merged
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.
@GeoffreyBooth this fixes #4568 but still preserves @xixixao's fix for #4533
Refines #4534 by stopping the traversal up the
stack
(looking for implicit objects to tag as no longer beingsameLine
) once we see something non-implicit (eg anEXPRESSION_START
)This fixes @jo-soft's reported regression in #4568 (simplified):
Basically what was happening post-#4534 was that when it hit the
OUTDENT
after123
, it was tagging thebar: ...
implicit object as no longer beingsameLine
. The correct (and pre-#4534) behavior is that it should treat theOUTDENT
as being contained to within the literal{...}
(represented by the literal{
being at the top of thestack
). So we should stop traversing the stack tagging implicit objects assameLine: no
once we hit that literal{
. But for cases like #4533, we can still preserve this approach of traversing the stack taggingsameLine: no
as long as we're only traversing through implicit objects/calls