since styler does not correctly unindent for }) (see r-lib/styler#485), we simply don't permit this

Author: lorenzwalthert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: styler.mlr
 Title: Third-party Style Guide For 'mlr'
-Version: 0.0.4
+Version: 0.0.4.9000
 Authors@R: 
     person(given = "Lorenz",
            family = "Walthert",

R/core.R

@@ -115,12 +115,12 @@ mlr_style = function(scope = "tokens",
       # remove_line_breaks_in_fun_dec =
       #   if (strict) remove_line_breaks_in_fun_dec,
       # set_line_break_around_curly_curly = styler:::set_line_break_around_curly_curly,
-      # set_line_break_before_closing_call = if (strict) {
-      #   partial(
-      #     styler:::set_line_break_before_closing_call,
-      #     except_token_before = "COMMENT"
-      #   )
-      # },
+      set_line_break_before_closing_call = if (strict) {
+        partial(
+          set_line_break_before_closing_call,
+          except_token_before = "COMMENT"
+        )
+      },
       # set_line_break_after_opening_if_call_is_multi_line = if (strict) {
       #   partial(
       #     styler:::set_line_break_after_opening_if_call_is_multi_line,

R/rules-line-break.R

@@ -54,3 +54,25 @@ style_line_break_around_curly = function(strict, pd) {
   }
   pd
 }
+
+#' Like [styler:::set_line_break_before_closing_call()] but only adding a line
+#' break if multi-line function call **and** the token before the closing brace
+#' is a curly brace (otherwise indention does not work nicely).
+#' @keywords internal
+set_line_break_before_closing_call = function(pd, except_token_before) {
+  if (!styler:::is_function_call(pd) && !styler:::is_subset_expr(pd)) {
+    return(pd)
+  }
+
+  npd = nrow(pd)
+  is_multi_line = any(pd$lag_newlines[rlang::seq2(3L, npd - 1L)] > 0)
+  if (!is_multi_line) {
+    exception = which(pd$token_before %in% except_token_before)
+    pd$lag_newlines[setdiff(npd, exception)] = 0L
+    return(pd)
+  } else if (pd$token_before[npd] == "'}'") {
+    pd$lag_newlines[npd] = 1L
+  }
+
+  pd
+}

man/set_line_break_before_closing_call.Rd

@@ -1,7 +1,8 @@
 list(
   x = list(
     f <- function() {
-    })
+    }
+  )
 )
 
 

tests/testthat/core/braces-out.R

@@ -2,8 +2,7 @@ call(x,
   y = 2)
 
 
-call(x = 33, "fjk"
-)
+call(x = 33, "fjk")
 
 
 call(