Fix indention #142
Merged
Fix indention #142
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
…n, not just for the first one.
krlmlr
approved these changes
Aug 21, 2017
R/modify_pd.R
Outdated
| before_first_break <- which(pd$lag_newlines > 0)[1] - 1 | ||
| if (is.na(before_first_break)) return(FALSE) | ||
| !any(pd$multi_line[opening:before_first_break]) | ||
| !any(pd$multi_line[potential_trigger:before_first_break]) |
R/modify_pd.R
Outdated
| needs_indention <- needs_indention(pd, potential_triggers) | ||
| trigger <- potential_triggers[needs_indention][1] | ||
| if (is.na(trigger)) return(numeric(0)) | ||
| start <- trigger + 1 | ||
| stop <- npd - ifelse(indent_last, 0, 1) | ||
| which(between(seq_len(npd), start, stop)) |
lorenzwalthert
force-pushed
the
fix_indention
branch
from
5782cf4 to
42c214d
Compare
Codecov Report
@@ Coverage Diff @@
## master #142 +/- ##
==========================================
+ Coverage 87.44% 87.48% +0.03%
==========================================
Files 19 19
Lines 741 743 +2
==========================================
+ Hits 648 650 +2
Misses 93 93
Continue to review full report at Codecov.
|
krlmlr
added a commit
that referenced
this pull request
Aug 24, 2017
- Vignette on customizing styler (#145). - No line break after `switch()` and friends (#152). - Remove flat relicts completely (#151). - Don't reindent function calls and break line correctly for multi-line calls (#149). - Set space between "=" and "," (#150). - Make R CMD Check perfect (#148). - Adding tests for exception handling with invalid parse data (#139). - Fix indention by checking for all potential triggers (#142). - Fix un-indention (#135). - Support wide characters (#130). - No spaces around :, :: and :::. - Redesigning the API (#123). - Solve eq_sub indention in general (#125). - Minor refactorings. - Re-indent token-dependent (#119). - Supporting more indention patterns. - Allow raw indention. - Definitively fixing eol issue with comments. - Infrastructure. - Flattening out the parse table. - New rule: no space after ! -> !!! for tidyeval. - Fix spacing around '{'. - Don't drop tokens! Fixes #101. - EOL spaces in empty comments (and in general) (#98). - mal-indention in conditional statement due to wrong specification of indent_without_paren) (#95). - Complicated indentions based on arithmetic and special operators (#96). - indention interaction on with assignment operator and other operators (#97).
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.
Closes #141