Skip to content

Fix unindention #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2017
Merged

Conversation

lorenzwalthert
Copy link
Collaborator

This fixes #131. The problem is that it is not really really fixing it because of the interaction with the rule update_indention_ref_fun_call() (the first argument of switch in the example is right after (). update_indention_ref_fun_call is implemented currently but should not really be part of style_tidyverse(). Hence, we have to drop the rule and adapt the tests first. I opened #134 for that.

@lorenzwalthert lorenzwalthert requested a review from krlmlr August 18, 2017 21:12
@codecov
Copy link

codecov bot commented Aug 18, 2017

Codecov Report

Merging #135 into master will increase coverage by 2.42%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #135      +/-   ##
==========================================
+ Coverage   85.02%   87.44%   +2.42%     
==========================================
  Files          19       19              
  Lines         741      741              
==========================================
+ Hits          630      648      +18     
+ Misses        111       93      -18
Impacted Files Coverage Δ
R/unindent.R 96.15% <100%> (ø) ⬆️
R/transform.R 97.43% <0%> (+12.82%) ⬆️
R/ws.R 83.33% <0%> (+72.22%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46a7e3f...bf8efe5. Read the comment docs.

Copy link
Member

@krlmlr krlmlr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, the three PRs look great. I'll try on tikzDevice again after these PRs and #134 are merged.

x
},{
xx
} )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to add a FIXME with a reference here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FIXME to leave a line blank after }you mean?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

@lorenzwalthert lorenzwalthert merged commit c58ea29 into r-lib:master Aug 20, 2017
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).
@lorenzwalthert lorenzwalthert deleted the fix_unindention branch September 17, 2017 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tikzDevice glitch
2 participants