avoid checking for hard-coded dot #262
Merged
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
krlmlr
approved these changes
Oct 26, 2017
R/rules-other.R
Outdated
| pd <- bind_rows(pd, new_pd) | ||
| is_pipe <- pd$token == "SPECIAL-PIPE" | ||
| if (any(is_pipe, na.rm = TRUE)) { | ||
| pd <- reduce(which(is_pipe), add_brackets_in_pipe_one, .init = pd) |
There was a problem hiding this comment.
Would the reduce() call also work if which(is_pipe) has length zero?
There was a problem hiding this comment.
Yes, thanks.
R/utils.R
Outdated
| #' @param pos The position of the token to start the search from. | ||
| #' @importFrom rlang seq2 | ||
| next_non_comment <- function(pd, pos) { | ||
| if (pos >= nrow(pd)) return(integer(0)) |
There was a problem hiding this comment.
Yes, in the current use context it seems, so I can remove it. Just wanted to add safety.
krlmlr
added a commit
that referenced
this pull request
Nov 27, 2017
- Adapt documentation (#290). - Add roundtrip (#287). - Fix AppVeyor builds. - Fix token insertion / comment interaction (#279). - Clarify labelling strategy (#285). - Fixing and extending Rstudioaddins (#283). - Fix eq assign parsing (#276). - style_files -> vectorized style_file (#273). - Refactoring (#270). - Fix CI (#275). - Fix covr (#274). - Renaming files (#271). - Handle styling of an unsaved active file (#243). - Test R 3.1 and R 3.2 (#249). - Allow empty {} without line break (#261). - Wrap expr in expr before enclosing with curly braces (#263). - Avoid checking for hard-coded dot (#262). - Account for dependency renaming (utf8 changed to enc) (#264). - Indention of function declaration and closing braces (#260). - Only remove line break before closing with strict option (#252).
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.
Can do without checking for "." as suggested in #81 by @krlmlr, but does not necessarily make things simpler, mainly because we used to check at a different nest, that is, we checked in the nest where
token_beforeis "SPECIAL-PIPE", so we did not use thereduceapproach since these nests only had one row. Closes #81.