Skip to content

Sorting key #196

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 3 commits into from
Sep 17, 2017
Merged

Sorting key #196

merged 3 commits into from
Sep 17, 2017

Conversation

lorenzwalthert
Copy link
Collaborator

Create new attributes pos_id that gives the number of the token (as long as no tokens are inserted). Simply using the column id for sorting did not work. Closes #112.

@lorenzwalthert lorenzwalthert force-pushed the sorting_key branch 5 times, most recently from 665e0cf to ed2c421 Compare September 16, 2017 23:31
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, just a minor nit.

R/nested.R Outdated
tokenize <- function(text) {
# avoid https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=16041
parse(text = text, keep.source = TRUE)
parsed <- parse(text = text, keep.source = TRUE)
parse_data <- as_tibble(utils::getParseData(parsed, includeText = NA)) %>%
enhance_mapping_special()
parse_data$pos_id <- seq2(1, nrow(parse_data))
Copy link
Member

Choose a reason for hiding this comment

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

Using 1L instead of 1 might just keep the data in the integer domain. I see that we later use numeric sometimes (+0.3 and +0.6), but this doesn't need to be the default.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ok, thanks. I think seq2() creates intervals of integers anyways,

class(rlang::seq2(1, 3))
#> [1] "integer"

but we can be a bit more explicit if you like.

@krlmlr
Copy link
Member

krlmlr commented Sep 17, 2017

This property of seq2() is good to know.

@lorenzwalthert lorenzwalthert merged commit b15a581 into r-lib:master Sep 17, 2017
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).
@lorenzwalthert lorenzwalthert deleted the sorting_key branch November 21, 2017 09:12
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.

2 participants