Merge pull request #630 from lorenzwalthert/issue-549

lorenzwalthert · web-flow · commit 58f852da74a6 · 2020-04-11T13:42:16.000+02:00
- No blank lines in function headers (#549).
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,23 +1,20 @@
 # All available hooks: https://pre-commit.com/hooks.html
+# R specific hooks: https://github.com/lorenzwalthert/precommit
 repos:
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.0.0.9027
+    rev: v0.0.0.9038
     hooks:
-    # -   id: lintr
-    # -   id: style-files Does style *-in.R files in tests otherwise!
     -   id: parsable-R
     -   id: no-browser-statement
+    # -   id: lintr
     -   id: readme-rmd-rendered
-    #  R package development
-    -   id: roxygenize
-    -   id: use-tidy-description
-    -   id: deps-in-desc
+    -   id: spell-check
+    -   id: style-files
+        args: [--style_pkg=styler, --style_fun=tidyverse_style]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v2.5.0
     hooks:
     -   id: check-added-large-files
         args: ['--maxkb=200']
--   repo: https://github.com/lorenzwalthert/precommit-markdown-link-check
-    rev: v0.0.0.9002  # Use the sha / tag you want to point at
-    hooks:
-    -   id: markdown-link-check
+    -   id: end-of-file-fixer
+        exclude: '\.Rd'
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## Major changes
 
+- blank lines in function calls and headers are now removed (#629, #630).
 
 ## Minor chnages and fixes
 
@@ -10,7 +11,6 @@
 - typos in documentation (#618, #614).
 
 
-
 # styler 1.3.2
 
 Release upon request by the CRAN team.
@@ -435,4 +435,3 @@ specify_reindention(
 )
 initialize_default_attributes(pd_flat)
 ```
-
diff --git a/R/rules-line-break.R b/R/rules-line-break.R
@@ -170,9 +170,10 @@ remove_line_break_before_round_closing_after_curly <- function(pd) {
   pd
 }
 
-remove_line_break_before_round_closing_fun_dec <- function(pd) {
+remove_line_breaks_in_fun_dec <- function(pd) {
   if (is_function_dec(pd)) {
     round_after <- pd$token == "')'" & pd$token_before != "COMMENT"
+    pd$lag_newlines[pd$lag_newlines > 1L] <- 1L
     pd$lag_newlines[round_after] <- 0L
   }
   pd
diff --git a/R/style-guides.R b/R/style-guides.R
@@ -117,8 +117,8 @@ tidyverse_style <- function(scope = "tokens",
       set_line_break_before_curly_opening,
       remove_line_break_before_round_closing_after_curly =
         if (strict) remove_line_break_before_round_closing_after_curly,
-      remove_line_break_before_round_closing_fun_dec =
-        if (strict) remove_line_break_before_round_closing_fun_dec,
+      remove_line_breaks_in_fun_dec =
+        if (strict) remove_line_breaks_in_fun_dec,
       style_line_break_around_curly = partial(
         style_line_break_around_curly,
         strict
diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -1,80 +1,84 @@
-yihui
-xfun
-Visit'em
-unnest
-unlinkunindention
-unindent
-unindent
-unexplainable
-uncached
-Tidyverse
-tidyverse
-tidyeval
-tibbles
-tibble
-testthat
-stylerignore
-stylerignored
-StackOverflow
-Rprofile
-rprofile
-rplumber
-Roxygen
-roxygen
-Rnw
-rnw
-Rmd
-rmd
-RMarkdown
-rlang
-reprex
-reindention
-reindented
-rebased
-README
-readme
-rds
-precommit
-pre
-pos
-pkgdown
-parsable
-NUM
-macOS
-lorenzwalthert
-lifecycle
-LF
-levelName
-knitr
-ixmypi
-invasiveness
-innode
-infinitively
-https
-forcond
-filetype
-expr EQ
-EOLs
-EOL
-EOF
-emacs
-DSLs
-dontshowdontrun
-donttest
-dont
-dir
-dec
-cran
-CONST
-config
-codecov
-CMD
-cancelling
-
 Addin
 Addins
 AppVeyor
 apriori
 arg
 AST
 benchmarking
+cancelling
+chnages
+CMD
+codecov
+config
+CONST
+cran
+dec
+dir
+dont
+dontshowdontrun
+donttest
+DSLs
+emacs
+EOF
+EOL
+EOLs
+expr
+expr EQ
+filetype
+forcond
+funct
+https
+infinitively
+innode
+invasiveness
+ixmypi
+knitr
+levelName
+LF
+lifecycle
+lorenzwalthert
+macOS
+NUM
+parsable
+pgkdown
+pkgdown
+pos
+pre
+precommit
+rds
+readme
+README
+rebased
+reindented
+reindention
+reprex
+rlang
+RMarkdown
+rmd
+Rmd
+rnw
+Rnw
+roxygen
+Roxygen
+rplumber
+rprofile
+Rprofile
+StackOverflow
+styler
+stylerignore
+stylerignored
+stylers
+testthat
+tibble
+tibbles
+tidyeval
+tidyverse
+Tidyverse
+uncached
+unexplainable
+unindent
+unlinkunindention
+unnest
+Visit'em
+xfun
+yihui
diff --git a/tests/testthat/fun_dec/line_break_fun_dec-in.R b/tests/testthat/fun_dec/line_break_fun_dec-in.R
@@ -1,6 +1,5 @@
 a <- function(x, #
-              y
-              ) {
+              y) {
   x - 1
 }
 
@@ -13,6 +12,24 @@ a <- function(x, #
 
 a <- function(x, #
               y #
-            ) {
+) {
   y
 }
+
+
+a <- function(x,
+              y) {
+  x - 1
+}
+
+a <- function(x,
+              #
+              y) {
+  x - 1
+}
+
+a <- function(x,
+
+              y) {
+  x - 1
+}
diff --git a/tests/testthat/fun_dec/line_break_fun_dec-in_tree b/tests/testthat/fun_dec/line_break_fun_dec-in_tree
diff --git a/tests/testthat/fun_dec/line_break_fun_dec-out.R b/tests/testthat/fun_dec/line_break_fun_dec-out.R
@@ -15,3 +15,20 @@ a <- function(x, #
 ) {
   y
 }
+
+
+a <- function(x,
+              y) {
+  x - 1
+}
+
+a <- function(x,
+              #
+              y) {
+  x - 1
+}
+
+a <- function(x,
+              y) {
+  x - 1
+}

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,10 @@ remove_line_break_before_round_closing_after_curly <- function(pd) {`
`170`	`170`	`pd`
`171`	`171`	`}`
`172`	`172`
`173`		`-remove_line_break_before_round_closing_fun_dec <- function(pd) {`
	`173`	`+remove_line_breaks_in_fun_dec <- function(pd) {`
`174`	`174`	`if (is_function_dec(pd)) {`
`175`	`175`	`round_after <- pd$token == "')'" & pd$token_before != "COMMENT"`
	`176`	`+ pd$lag_newlines[pd$lag_newlines > 1L] <- 1L`
`176`	`177`	`pd$lag_newlines[round_after] <- 0L`
`177`	`178`	`}`
`178`	`179`	`pd`