Merge branch 'r-0.0-7' into production

Author: krlmlr

.gitattributes

@@ -0,0 +1 @@
+tests/testthat/**/*_tree linguist-generated=true

API

@@ -4,7 +4,7 @@
 
 get_transformers(flat = FALSE, ...)
 get_transformers_flat(strict = TRUE, start_comments_with_one_space = FALSE)
-get_transformers_nested(strict = TRUE, indent_by = 2, start_comments_with_one_space = FALSE)
+get_transformers_nested(scope = "tokens", strict = TRUE, indent_by = 2, start_comments_with_one_space = FALSE)
 style_dir(path = ".", flat = FALSE, recursive = TRUE, transformers = get_transformers(flat = flat))
 style_file(path, flat = FALSE, transformers = get_transformers(flat = flat))
 style_pkg(pkg = ".", flat = FALSE, transformers = get_transformers(flat = flat))

DESCRIPTION

@@ -1,13 +1,12 @@
 Package: styler
 Title: Non-invasive Pretty Printing of R code
-Version: 0.0-6
+Version: 0.0-7
 Authors@R: person("Kirill", "Müller", role = c("aut", "cre"), email = "[email protected]")
 Description:
     Pretty-prints R code without changing the user's formatting intent.
 Imports:
     dplyr,
     magrittr,
-    pkgload,
     purrr,
     readr,
     rprojroot,
@@ -29,9 +28,28 @@ Remotes:
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
-Date: 2017-07-10
+Date: 2017-07-27
 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", "pkgapi::api_roclet"))
 RoxygenNote: 6.0.1.9000
 VignetteBuilder: knitr
+Collate: 
+    'get_transformers.R'
+    'modify_pd.R'
+    'nested.R'
+    'nested_to_tree.R'
+    'parsed.R'
+    'relevel.R'
+    'rules-line_break.R'
+    'rules-other.R'
+    'rules-replacement.R'
+    'rules-spacing.R'
+    'serialize.R'
+    'serialized_tests.R'
+    'styler.R'
+    'transform.R'
+    'unindent.R'
+    'utils.R'
+    'visit.R'
+    'ws.R'

NAMESPACE

@@ -10,9 +10,11 @@ export(style_text)
 import(dplyr)
 import(tibble)
 import(tidyr)
+importFrom(purrr,flatten)
 importFrom(purrr,flatten_chr)
 importFrom(purrr,map)
 importFrom(purrr,map2)
+importFrom(purrr,map_chr)
 importFrom(purrr,map_lgl)
 importFrom(purrr,partial)
 importFrom(purrr,pmap)

NEWS.md

@@ -1,3 +1,15 @@
+## styler 0.0-7 (2017-07-27)
+
+- curly braces don't move a line up if previous token is comment.
+- wrap parse + transform + serialize in new function.
+- Speedup of nested styler functions by ~ 4x.
+- Use multi line instead of line1 / line2 for indention and unindention.
+- Indent multiple.
+- add tidyverse rules (indention not yet working properly).
+- Refactoring and add token before and afterwards to parse table.
+- Implement post visitor instead of complicated move_up child.
+
+
 ## styler 0.0-6 (2017-07-10)
 
 * Tidy up README (#43).

R/get_transformers.R

@@ -14,6 +14,7 @@ get_transformers <- function(flat = FALSE, ...) {
     get_transformers_nested(...)
   }
 }
+
 #' Get the transformer functions for flat styling
 #'
 #' @param strict A logical value indicating whether a set of strict
@@ -36,7 +37,6 @@ get_transformers_flat <- function(strict = TRUE,
     if (strict) set_space_around_op else add_space_around_op,
     if (strict) set_space_after_comma else add_space_after_comma,
     remove_space_before_comma,
-    remove_space_after_unary_pm,
     remove_space_after_opening_paren,
     partial(start_comments_with_space,
             force_one = start_comments_with_one_space),
@@ -47,23 +47,90 @@ get_transformers_flat <- function(strict = TRUE,
 #'
 #' Similar to [get_transformers_flat()], but additionally, returns some
 #'   functions needed due the fact that styling is done in a nested way.
+#' @param scope The extent of manipulation. Can range from "none" (least
+#'   invasive) to "token" (most invasive). See 'Details'. This argument is a
+#'   vector of length one.
 #' @param indent_by How many spaces of indention should be inserted after
 #'   operators such as '('.
 #' @inheritParams get_transformers_flat
+#' @details The following options for `scope` are available.
+#'
+#' * "none": Performs no transformation at all.
+#' * "spaces": Manipulates spacing between token on the same line.
+#' * "line_breaks": In addition to "spaces", this option also manipulates
+#'   line breaks.
+#' * "tokens": In addition to "line_breaks", this option also manipulates
+#'   tokens.
+#'
+#' As it becomes clear from this description, more invasive operations can only
+#' be performed if all less invasive operations are performed too.
 #' @family obtain transformers
 #' @importFrom purrr partial
 #' @export
-get_transformers_nested <- function(strict = TRUE,
-                                    indent_by = 2,
-                                    start_comments_with_one_space = FALSE) {
-  c(create_filler,
-    partial(indent_round, indent_by = indent_by),
-    partial(indent_curly, indent_by = indent_by),
-    partial(indent_op, indent_by = indent_by),
-    strip_eol_spaces,
-    get_transformers_flat(strict, start_comments_with_one_space),
-    remove_space_after_unary_pm_nested,
-    set_space_before_comments,
-    set_space_between_levels
+get_transformers_nested <- function(
+  scope = "tokens",
+  strict = TRUE,
+  indent_by = 2,
+  start_comments_with_one_space = FALSE) {
+
+  lvls_scope <- c("none", "spaces", "line_breaks", "tokens")
+
+  scope <- character_to_ordered(scope, lvls_scope)
+
+  space_manipulators <- if (scope >= lvls_scope[2])
+    c(
+      partial(indent_round, indent_by = indent_by),
+      partial(indent_curly, indent_by = indent_by),
+      partial(indent_op, indent_by = indent_by),
+      partial(indent_without_paren, indent_by = indent_by),
+      partial(indent_assign, indent_by = indent_by),
+      get_transformers_flat(strict, start_comments_with_one_space),
+      remove_space_after_unary_pm_nested,
+      set_space_before_comments,
+      set_space_between_levels
+    )
+
+  line_break_manipulators <- if (scope >= lvls_scope[3])
+    c(
+      remove_line_break_before_curly_opening,
+      remove_line_break_before_round_closing,
+      add_line_break_afer_curly_opening,
+      add_line_break_before_curly_closing,
+      add_line_break_after_pipe
+    )
+
+  token_manipulators <- if (scope >= lvls_scope[4])
+    c(
+      force_assignment_op,
+      resolve_semicolon,
+      add_brackets_in_pipe
     )
+
+
+  list(
+    filler     = create_filler,
+    line_break = line_break_manipulators,
+    space      = space_manipulators,
+    token      = token_manipulators,
+    eol        = strip_eol_spaces,
+    NULL
+  )
 }
+
+
+#' Convert a character vector to an ordered factor
+#'
+#' Convert a vector to an ordered factor but stop if any of the values in
+#'   `x` does not match the predefined levels in `levels.`
+#' @param x A character vector.
+#' @param levels A vector with levels.
+#' @param name The name of the character vector to be dispayed if the
+#'   construction of the factor fails.
+character_to_ordered <- function(x, levels, name = substitute(x)) {
+  if (!all((x %in% levels))) {
+    stop("all values in ", name, " must be one of the following: ",
+         paste(levels, collapse = ", "))
+  }
+  factor(x, levels = levels, ordered = TRUE)
+}
+