Skip to content

fix parsing inconsistency #188

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 1 commit into from
Sep 8, 2017
Merged

Conversation

lorenzwalthert
Copy link
Collaborator

@lorenzwalthert lorenzwalthert commented Sep 7, 2017

Not to be merged yet. Intended to fix #187. Could be made more functional and flexible so a list of fix_funs and one of valid_funs could be provided to fix_p and they would be applied/used for checking. fix_pd is currently really just fixing one issue and is_valid_pd checks only for this one issue.
Maybe even outsourcing these functions into a separate parsing package, along with issues detected in #100.

@lorenzwalthert
Copy link
Collaborator Author

If this PR goes into the right direction, I can add a test, e.g. for the example introduced in #187.

@lorenzwalthert
Copy link
Collaborator Author

Just realized that this PR does not solve the parsing error in R/bind.r because there, it seems the problem is of a different nature. Need to look into that further.

@codecov
Copy link

codecov bot commented Sep 7, 2017

Codecov Report

Merging #188 into master will decrease coverage by 0.13%.
The diff coverage is 90%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #188      +/-   ##
==========================================
- Coverage   93.45%   93.31%   -0.14%     
==========================================
  Files          21       21              
  Lines         840      838       -2     
==========================================
- Hits          785      782       -3     
- Misses         55       56       +1
Impacted Files Coverage Δ
R/nested.R 98.24% <100%> (-0.04%) ⬇️
R/parse.R 89.47% <89.47%> (ø)
R/ws.R 96% <0%> (-0.16%) ⬇️
R/serialized_tests.R 100% <0%> (ø) ⬆️
R/initialize.R
R/vertical.R
R/parsed.R 93.75% <0%> (ø)

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 1678023...17d25ea. Read the comment docs.

@lorenzwalthert
Copy link
Collaborator Author

Redesigned PR completely according to the recent discussion in #187.

@lorenzwalthert lorenzwalthert merged commit 95f2af2 into r-lib:master Sep 8, 2017
@krlmlr
Copy link
Member

krlmlr commented Sep 15, 2017

Great, thanks!

@lorenzwalthert lorenzwalthert deleted the fix_parsing branch September 17, 2017 20:55
krlmlr added a commit that referenced this pull request Oct 23, 2017
- Hotfix: utf8 should not be verbose (#245).
- Allow styling of Rmd files(#233).
- Remove duplicate @family (#244).
- Fixing token insertion (#242).
- Capitalize Addin titles (#241).
- Explicit `NULL` creation to make styler compatible with R3.2.0 (#237).
- Improve vignettes (#232).
- Allow exclusion of files with `style_pkg()` and `style_dir()`.
- Correct styling with long strings (#230).
- Add tools for re-indenting tokens (#217).
- Math token spacing (#221).
- Remove outdated line and col information (#218).
- Empty input for styling does not cause an error (#227, #228).
- Tools to insert tokens + application on `if`-`else` clauses (#212).
- Improve example in documentation (#222).
- Fix spacing around in (#214).
- Maintenance: renaming functions / files, extend helper, documentation, if_else etc. (#204).
- Disallow line break after ( for function calls (#210).
- Preserve space between `!` and bang (#209).
- Simplify RStudio Addin (#208, #211).
- Indention based on square brackets (#207).
- Add vignette on introducing styler (#203).
- Indent function declaration without curly braces correctly (#202).
- Fix indention in if-else statement (#200).
- Sorting key (#196).
- Use safe sequences (#197).
- Fix space between two commas (#195).
- Keep single-line pipes on one line (#74).
- Remove tidyr and dplyr dependency (#182, #183, @jimhester).
- Fix parsing inconsistency (#188).
- Substitute create filler (#190).
- Introducing class vertical (#189).
- Adapt line break rules (#172).
- Fix `R CMD check` (#185).
- Force argument evaluation for proper error handling (#179).
- Add nonstrict version of set_space_before_comment (#174).
- Add installation instructions to README (#175).
- Addin to style highlighted region (#143).
- Improve spelling (#168).
- Add coverage badge
- Change badge from WIP to active
- Add the number of files to message (#166).
- Improve documentation (#164).
- Add informative messages while styling files (#165).
- More examples in help file (#161).
- No line breaks after pipe if comment is next token (#160).
- Fixing spacing around `!` (non-bang-bang) (#157).
- Finalize function documentation (#154).
- Review vignette (#158).
- Update bang-bang rule (#156).
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.

styler executed via console and from within R does not always yield same result
2 participants