Merge branch 'r-0.0-8' into production

Author: krlmlr

.Rbuildignore

@@ -7,3 +7,4 @@
 ^appveyor\.yml$
 ^tic\.R$
 ^\.travis\.yml$
+^docs$

API

@@ -2,10 +2,9 @@
 
 ## Exported functions
 
-get_transformers(flat = FALSE, ...)
-get_transformers_flat(strict = TRUE, 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))
-style_text(text, flat = FALSE, transformers = get_transformers(flat = flat))
+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)
+style_file(path, ..., style = tidyverse_style, transformers = style(...))
+style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...))
+style_text(text, ..., style = tidyverse_style, transformers = style(...))
+tidyverse_style(scope = "tokens", strict = TRUE, indent_by = 2, start_comments_with_one_space = FALSE)

DESCRIPTION

@@ -1,14 +1,14 @@
 Package: styler
 Title: Non-invasive Pretty Printing of R code
-Version: 0.0-7
-Authors@R: person("Kirill", "Müller", role = c("aut", "cre"), email = "[email protected]")
+Version: 0.0-8
+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,
-    magrittr,
     purrr,
-    readr,
+    rlang,
     rprojroot,
     tibble,
     tidyr,
@@ -28,25 +28,27 @@ Remotes:
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
-Date: 2017-07-27
+Date: 2017-08-24
 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"))
+Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate", "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'
+    'reindent.R'
+    'token.R'
     'relevel.R'
     'rules-line_break.R'
     'rules-other.R'
     'rules-replacement.R'
     'rules-spacing.R'
     'serialize.R'
     'serialized_tests.R'
+    'style_guides.R'
     'styler.R'
     'transform.R'
     'unindent.R'

NAMESPACE

@@ -1,12 +1,11 @@
 # Generated by roxygen2: do not edit by hand
 
-export(get_transformers)
-export(get_transformers_flat)
-export(get_transformers_nested)
+export(create_style_guide)
 export(style_dir)
 export(style_file)
 export(style_pkg)
 export(style_text)
+export(tidyverse_style)
 import(dplyr)
 import(tibble)
 import(tidyr)
@@ -21,4 +20,6 @@ importFrom(purrr,pmap)
 importFrom(purrr,pwalk)
 importFrom(purrr,reduce)
 importFrom(purrr,when)
+importFrom(rlang,seq2)
+importFrom(utils,tail)
 importFrom(utils,write.table)

NEWS.md

@@ -1,3 +1,33 @@
+## styler 0.0-8 (2017-08-24)
+
+- 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).
+
 ## styler 0.0-7 (2017-07-27)
 
 - curly braces don't move a line up if previous token is comment.