Allow scalar logic in anonymous functions within subsetting calls #3004
Conversation
This file contains hidden or 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
Signed-off-by: Emmanuel Ferdman <[email protected]>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3004 +/- ##
=======================================
Coverage 99.23% 99.23%
=======================================
Files 128 128
Lines 7281 7282 +1
=======================================
+ Hits 7225 7226 +1
Misses 56 56 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
| and not(preceding-sibling::expr[last()]/SYMBOL_FUNCTION_CALL[not(text() = 'subset' or text() = 'filter')]) | ||
| and not(preceding-sibling::OP-LEFT-BRACKET) | ||
| and not(preceding-sibling::*[not(self::COMMENT)][2][self::SYMBOL_SUB and text() = 'circular']) | ||
| and not(ancestor::expr[FUNCTION or OP-LAMBDA]) |
Collaborator
There was a problem hiding this comment.
this may not be complicated enough:
subset(x,
sapply(col, function(x) {
if (A | B) {
do_ab(x)
} else {
do_other(x)
})
)
Contributor
Author
There was a problem hiding this comment.
Good catch. I added [not(descendant-or-self::expr[FUNCTION or OP-LAMBDA])] to the exclusion so that if (A | B) inside a function definition still gets linted, while things like if (any(x | y)) stay excluded. Added tests for your exact example and a few variations (lambda syntax, while loops, nested aggregators). Let me know if you spot anything else.
Signed-off-by: Emmanuel Ferdman <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
PR Summary
Using
&&or||inside an anonymous function passed tovapply(),sapply(), or similar withinfilter()/subset()is correct because each iteration processes a single element. The linter was incorrectly flagging these as needing&/|. This adds an XPath exclusion forFUNCTIONandOP-LAMBDAancestors, matching the pattern already used inlibrary_call_linter.Closes #2935