Merge branch 'r-0.0-9' into production

Author: krlmlr

.Rbuildignore

@@ -8,3 +8,4 @@
 ^tic\.R$
 ^\.travis\.yml$
 ^docs$
+^_pkgdown\.yml$

.gitignore

@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 inst/doc
+docs

API

@@ -2,9 +2,14 @@
 
 ## Exported functions
 
-create_style_guide(filler = create_filler, line_break = NULL, space = NULL, token = NULL, indention = NULL, use_raw_indention = FALSE)
-style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), recursive = TRUE)
+create_style_guide(initialize = initialize_attributes, line_break = NULL, space = NULL, token = NULL, indention = NULL, use_raw_indention = FALSE, reindention = tidyverse_reindention())
+regex_none()
+specify_math_token_spacing(zero = NULL, one = c("'+'", "'-'", "'*'", "'/'", "'^'"))
+specify_reindention(regex_pattern = regex_none(), indention = 0, comments_only = TRUE)
+style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), recursive = TRUE, exclude_files = NULL)
 style_file(path, ..., style = tidyverse_style, transformers = style(...))
-style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...))
+style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...), exclude_files = "R/RcppExports.R")
 style_text(text, ..., style = tidyverse_style, transformers = style(...))
-tidyverse_style(scope = "tokens", strict = TRUE, indent_by = 2, start_comments_with_one_space = FALSE)
+tidyverse_math_token_spacing()
+tidyverse_reindention()
+tidyverse_style(scope = "tokens", strict = TRUE, indent_by = 2, start_comments_with_one_space = FALSE, reindention = tidyverse_reindention(), math_token_spacing = tidyverse_math_token_spacing())

DESCRIPTION

@@ -1,46 +1,51 @@
 Package: styler
 Title: Non-invasive Pretty Printing of R code
-Version: 0.0-8
+Version: 0.0-9
 Authors@R: c(person("Kirill", "Müller", role = c("aut"), email = "[email protected]"),
   person("Lorenz", "Walthert", role = c("cre", "aut"), email = "[email protected]"))
 Description:
     Pretty-prints R code without changing the user's formatting intent.
 Imports:
-    dplyr,
     purrr,
     rlang,
     rprojroot,
     tibble,
-    tidyr,
     utf8,
-    withr
+    withr,
+    rematch2,
+    magrittr
 Suggests:
     data.tree,
+    dplyr,
     here,
     knitr,
+    mockr,
     rmarkdown,
     rstudioapi,
-    testthat,
-    pkgload
+    testthat
 Remotes:
-    r-lib/pkgload,
     krlmlr/utf8
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
-Date: 2017-08-24
+Date: 2017-10-23
 BugReports: https://github.com/krlmlr/styler/issues
 URL: https://github.com/krlmlr/styler, http://krlmlr.github.io/styler
 Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate", "pkgapi::api_roclet"))
-RoxygenNote: 6.0.1.9000
+RoxygenNote: 6.0.1
 VignetteBuilder: knitr
 Collate: 
+    'addins.R'
+    'compat-tidyr.R'
+    'dplyr.R'
+    'expr-is.R'
+    'initialize.R'
     'modify_pd.R'
     'nested.R'
     'nested_to_tree.R'
-    'parsed.R'
+    'parse.R'
     'reindent.R'
-    'token.R'
+    'token-define.R'
     'relevel.R'
     'rules-line_break.R'
     'rules-other.R'
@@ -49,9 +54,12 @@ Collate:
     'serialize.R'
     'serialized_tests.R'
     'style_guides.R'
+    'style_rmd.R'
     'styler.R'
+    'token-create.R'
     'transform.R'
     'unindent.R'
     'utils.R'
+    'vertical.R'
     'visit.R'
     'ws.R'

NAMESPACE

@@ -1,16 +1,22 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(print,vertical)
 export(create_style_guide)
+export(regex_none)
+export(specify_math_token_spacing)
+export(specify_reindention)
 export(style_dir)
 export(style_file)
 export(style_pkg)
 export(style_text)
+export(tidyverse_math_token_spacing)
+export(tidyverse_reindention)
 export(tidyverse_style)
-import(dplyr)
 import(tibble)
-import(tidyr)
+importFrom(magrittr,"%>%")
 importFrom(purrr,flatten)
 importFrom(purrr,flatten_chr)
+importFrom(purrr,flatten_int)
 importFrom(purrr,map)
 importFrom(purrr,map2)
 importFrom(purrr,map_chr)

NEWS.md

@@ -1,3 +1,57 @@
+## styler 0.0-9 (2017-10-23)
+
+- 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).
+
+
 ## styler 0.0-8 (2017-08-24)
 
 - Vignette on customizing styler (#145).

R/addins.R

@@ -0,0 +1,27 @@
+#' Style the active file
+#'
+#' Helper function for RStudio Addin.
+style_active_file <- function() {
+  context <- get_rstudio_context()
+  style_file(context$path, style = tidyverse_style)
+}
+
+
+#' Style the highlighted region
+#'
+#' Helper function for RStudio Addin. This function is complicated because of
+#' one thing: You can highlight also just parts of lines.
+#' @importFrom rlang seq2
+style_active_region <- function() {
+  context <- get_rstudio_context()
+  text <- context$selection[[1]]$text
+  if (all(nchar(text) == 0)) stop("No code selected")
+  out <- style_text(text)
+  rstudioapi::modifyRange(
+    context$selection[[1]]$range, paste0(out, collapse = "\n"), id = context$id
+  )
+}
+
+get_rstudio_context <- function() {
+  rstudioapi::getActiveDocumentContext()
+}

R/compat-tidyr.R

@@ -0,0 +1,10 @@
+nest_ <- function(data, key_col, nest_cols = character()) {
+  key_column <- setdiff(names(data), nest_cols)
+  key_data <- data[[key_column]]
+  key_levels <- unique(key_data)
+  key_factor <- factor(key_data, levels = key_levels)
+  res <- list()
+  res[[key_column]] <- key_levels
+  res[[key_col]] <- split(data[, nest_cols], key_factor)
+  as_tibble(res)
+}

R/dplyr.R

@@ -0,0 +1,110 @@
+lag <- function(x, n = 1L, default = NA, ...) {
+  if (n == 0) {
+    return(x)
+  }
+  xlen <- length(x)
+  n <- pmin(n, xlen)
+  out <- c(rep(default, n), x[seq_len(xlen - n)])
+  attributes(out) <- attributes(x)
+  out
+}
+
+lead <- function(x, n = 1L, default = NA, ...) {
+  if (n == 0) {
+    return(x)
+  }
+  xlen <- length(x)
+  n <- pmin(n, xlen)
+  out <- c(x[-seq_len(n)], rep(default, n))
+  attributes(out) <- attributes(x)
+  out
+}
+
+arrange <- function(.data, ...) {
+  stopifnot(is.data.frame(.data))
+  ord <- eval(substitute(order(...)), .data, parent.frame())
+  if (length(ord) != nrow(.data)) {
+    stop("Length of ordering vectors don't match data frame size",
+      call. = FALSE)
+  }
+  .data[ord, , drop = FALSE]
+}
+
+if_else <- function(condition, true, false, missing = NULL) {
+  stopifnot(length(condition) == length(true))
+  stopifnot(length(condition) == length(false))
+  if (!is.null(missing)) stop("missing arg not yet implemented")
+  ifelse(condition, true, false)
+}
+
+bind_rows <- function(x, y = NULL, ...) {
+  if (is.null(x) && is.null(y)) {
+    return(tibble())
+  }
+  if (is.null(x)) {
+    if (inherits(y, "data.frame")) {
+      return(y)
+    }
+    return(do.call(rbind.data.frame, x))
+  }
+  if (is.null(y)) {
+    if (inherits(x, "data.frame")) {
+      return(x)
+    }
+    return(do.call(rbind.data.frame, x))
+  }
+  if (NCOL(x) != NCOL(y)) {
+    for (nme in setdiff(names(x), names(y))) {
+      y[[nme]] <- NA
+    }
+  }
+  bind_rows(rbind.data.frame(x, y), ...)
+}
+
+filter <- function(.data, ...) {
+  subset(.data, ...)
+}
+
+left_join <- function(x, y, by, ...) {
+  if (rlang::is_named(by)) {
+    by_x <- names(by)
+    by_y <- unname(by)
+  } else {
+    by_x <- by_y <- by
+  }
+  res <- as_tibble(merge(x, y, by.x = by_x, by.y = by_y, all.x = TRUE, ...))
+  res <- arrange(res, line1, col1, line2, col2, parent)
+
+  # dplyr::left_join set unknown list columns to NULL, merge sets them
+  # to NA
+  if (exists("child", res) && any(is.na(res$child))) {
+    res$child[is.na(res$child)] <- list(NULL)
+  }
+  res
+}
+
+nth <- function (x, n, order_by = NULL, default = x[NA_real_]) {
+  stopifnot(length(n) == 1, is.numeric(n))
+  n <- trunc(n)
+  if (n == 0 || n > length(x) || n < -length(x)) {
+    return(default)
+  }
+  if (n < 0) {
+    n <- length(x) + n + 1
+  }
+  if (is.null(order_by)) {
+    x[[n]]
+  }
+  else {
+    x[[order(order_by)[[n]]]]
+  }
+}
+
+
+last <- function (x, order_by = NULL, default = x[NA_real_]) {
+  nth(x, -1L, order_by = order_by, default = default)
+}
+
+slice <- function(.data, ...) {
+  .data[c(...), , drop = FALSE]
+}

R/expr-is.R

@@ -0,0 +1,24 @@
+#' Check whether a parse table corresponds to a a certain expression
+#'
+#' @param pd A parse table.
+#' @name pd_is
+NULL
+
+#' @describeIn pd_is Checks whether `pd` contains an expression wrapped in
+#'   curly brackets.
+is_curly_expr <- function(pd) {
+  if (is.null(pd)) return(FALSE)
+  pd$token[1] == "'{'"
+}
+
+is_subset_expr <- function(pd) {
+  if (is.null(pd) || nrow(pd) == 1) return(FALSE)
+  pd$token[2] == "'['"
+}
+
+#' @describeIn pd_is Checks whether `pd` is a function call.
+is_function_call <- function(pd) {
+  if (is.null(pd)) return(FALSE)
+  if (is.na(pd$token_before[2])) return(FALSE)
+  pd$token_before[2] == "SYMBOL_FUNCTION_CALL"
+}