Merge pull request #174 from lorenzwalthert/issue-173

- style should fail if styling any file fails (#174).

Author: lorenzwalthert

.pre-commit-config.yaml

@@ -34,7 +34,6 @@ repos:
           .*\.sh|
           .*\.RData
           )$
-    -   id: lintr
     -   id: readme-rmd-rendered
     -   id: parsable-R
     -   id: no-browser-statement

NEWS.md

@@ -7,6 +7,7 @@ Initial CRAN release. See https://lorenzwalthert.github.io/precommit/.
 - Roxygen hook cache only includes files that are part of the index and 
   will hence be able to use the cache in cases it was previously invalidated 
   without need (#171).
+- styler hook should fail if styling any file fails (#174).
 
 
 # precommit v0.0.0.9048

inst/WORDLIST

@@ -11,6 +11,7 @@ cmd
 CMD
 codemeta
 conda
+conditionMessage
 config
 cp
 cran
@@ -26,6 +27,7 @@ docType
 emph
 env
 EOF
+eval
 exlucded
 fs
 getOption
@@ -114,6 +116,7 @@ Sys
 testthat
 tidyverse
 travis
+tryCatch
 ubuntu
 Uninstallation
 Upvote

inst/bin/style-files

@@ -20,8 +20,14 @@ if (packageVersion("styler") < "1.3.2") {
     "`install.packages('styler')`. This will get you big speed-ups."
   )
 } else {
-  styler::style_file(
-    arguments$files, 
-    style = eval(parse(text = paste(arguments$style_pkg, "::", arguments$style_fun)))
+  style <- eval(parse(text = paste(arguments$style_pkg, "::", arguments$style_fun)))
+  tryCatch(
+    {
+      styler::style_file(
+        arguments$files, 
+        style = style
+      )
+    }, 
+    warning = function(w) stop(conditionMessage(w), call. = FALSE)
   )
 }

tests/testthat/in/style-files-fail.R renamed to tests/testthat/in/style-files-fail-changed.R

@@ -0,0 +1 @@
+1+ )

tests/testthat/in/style-files-fail-parse.R

@@ -4,7 +4,9 @@
 # success
 run_test("style-files", suffix = "-success.R")
 # fail
-run_test("style-files", suffix = "-fail.R", error_msg = NA)
+run_test("style-files", suffix = "-fail-changed.R", error_msg = NA)
+
+run_test("style-files", suffix = "-fail-parse.R", error_msg = "unexpected")
 
 # success with cmd args
 run_test("style-files",