apacheGH-46592: [CI][Dev][R] Add Air to pre-commit (apache#47423)

### Rationale for this change

It's faster than styler

### What changes are included in this PR?

Adding it

### Are these changes tested?

Yep

### Are there any user-facing changes?

Nah

* GitHub Issue: apache#46592

Authored-by: Nic Crane <[email protected]>
Signed-off-by: Nic Crane <[email protected]>

Author: thisisnic

.github/workflows/dev.yml

@@ -60,10 +60,10 @@ jobs:
       - name: Cache pre-commit
         uses: actions/cache@v4
         with:
-          path: |
-            ~/.cache/pre-commit
-            ~/.local/share/renv/cache
+          path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Install Air
+        uses: posit-dev/setup-air@63e80dedb6d275c94a3841e15e5ff8691e1ab237 # v1.0.0
       - name: Run pre-commit
         run: |
           pre-commit run --all-files --color=always --show-diff-on-failure

.pre-commit-config.yaml

@@ -205,17 +205,13 @@ repos:
           ^r/.*\.(R|Rmd)$
   - repo: local
     hooks:
-      - id: styler
+      - id: air-format
         alias: r
-        name: R Format
-        language: r
-        additional_dependencies:
-          - roxygen2
-          - styler
-        entry: |
-          Rscript -e "styler::style_file(commandArgs(TRUE)[1])"
+        name: R Format (Air)
+        language: system
+        entry: air format r --check
         files: >-
-          ^r/.*\.(R|Rmd)$
+            ^r/.*\.R$
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v14.0.6
     hooks:

docs/source/developers/guide/step_by_step/styling.rst

@@ -35,11 +35,15 @@ linters and styling of the code.
 
    .. tab-item:: R package
 
-      For the R package you can use ``{lintr}`` or ``{styler}``
+      For the R package you can use
+      `air <https://posit-dev.github.io/air/>`_ to format the code,
+      and
+
+      ``{lintr}``
       to check if the code follows the
       `tidyverse style <https://style.tidyverse.org/>`_.
 
-      The instructions on how to use either of these two packages
+      The instructions on how to use `air` and ``{lintr}``
       can be found in the
       `Styling and Linting section of the Common developer workflow tasks <https://arrow.apache.org/docs/r/articles/developers/workflow.html#styling-and-linting>`_.
 

r/DESCRIPTION

@@ -44,7 +44,7 @@ Imports:
     utils,
     vctrs
 Roxygen: list(markdown = TRUE, r6 = FALSE, load = "source")
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.3
 Config/testthat/edition: 3
 Config/build/bootstrap: TRUE
 Suggests:

r/Makefile

@@ -20,10 +20,10 @@ ARROW_R_DEV="TRUE"
 ARROW_LARGE_MEMORY_TESTS=$(ARROW_R_DEV)
 
 style:
-	pre-commit run --show-diff-on-failure --color=always styler
+	pre-commit run --show-diff-on-failure --color=always r
 
 style-all:
-	pre-commit run --show-diff-on-failure --color=always --all-files styler
+	pre-commit run --show-diff-on-failure --color=always --all-files r
 
 doc: style
 	R -s -f data-raw/docgen.R

r/R/array-data.R

@@ -41,7 +41,8 @@
 #' @rdname ArrayData
 #' @name ArrayData
 #' @include type.R
-ArrayData <- R6Class("ArrayData",
+ArrayData <- R6Class(
+  "ArrayData",
   inherit = ArrowObject,
   active = list(
     type = function() ArrayData__get_type(self),

r/R/array.R

@@ -105,7 +105,8 @@
 #' na_array2 == na_array # element-wise comparison
 #' na_array2$Equals(na_array) # overall comparison
 #' @export
-Array <- R6Class("Array",
+Array <- R6Class(
+  "Array",
   inherit = ArrowDatum,
   public = list(
     IsNull = function(i) Array__IsNull(self, i),
@@ -199,7 +200,8 @@ Array$create <- function(x, type = NULL) {
     error = function(cnd) {
       attempt <- try(vec_to_Array(x, NULL)$cast(type), silent = TRUE)
       abort(
-        c(conditionMessage(cnd),
+        c(
+          conditionMessage(cnd),
           i = if (!inherits(attempt, "try-error")) {
             "You might want to try casting manually with `Array$create(...)$cast(...)`."
           }
@@ -397,7 +399,8 @@ c.Array <- function(...) {
 #' @usage NULL
 #' @format NULL
 #' @export
-DictionaryArray <- R6Class("DictionaryArray",
+DictionaryArray <- R6Class(
+  "DictionaryArray",
   inherit = Array,
   public = list(
     indices = function() DictionaryArray__indices(self),
@@ -429,7 +432,8 @@ DictionaryArray$create <- function(x, dict = NULL) {
 #' @usage NULL
 #' @format NULL
 #' @export
-StructArray <- R6Class("StructArray",
+StructArray <- R6Class(
+  "StructArray",
   inherit = Array,
   public = list(
     field = function(i) StructArray__field(self, i),
@@ -480,7 +484,8 @@ as.data.frame.StructArray <- function(x, row.names = NULL, optional = FALSE, ...
 #' @usage NULL
 #' @format NULL
 #' @export
-ListArray <- R6Class("ListArray",
+ListArray <- R6Class(
+  "ListArray",
   inherit = Array,
   public = list(
     values = function() ListArray__values(self),
@@ -497,7 +502,8 @@ ListArray <- R6Class("ListArray",
 #' @usage NULL
 #' @format NULL
 #' @export
-LargeListArray <- R6Class("LargeListArray",
+LargeListArray <- R6Class(
+  "LargeListArray",
   inherit = Array,
   public = list(
     values = function() LargeListArray__values(self),
@@ -514,7 +520,8 @@ LargeListArray <- R6Class("LargeListArray",
 #' @usage NULL
 #' @format NULL
 #' @export
-FixedSizeListArray <- R6Class("FixedSizeListArray",
+FixedSizeListArray <- R6Class(
+  "FixedSizeListArray",
   inherit = Array,
   public = list(
     values = function() FixedSizeListArray__values(self),
@@ -527,7 +534,8 @@ FixedSizeListArray <- R6Class("FixedSizeListArray",
   )
 )
 
-is.Array <- function(x, type = NULL) { # nolint
+is.Array <- function(x, type = NULL) {
+  # nolint
   is_it <- inherits(x, c("Array", "ChunkedArray"))
   if (is_it && !is.null(type)) {
     is_it <- x$type$ToString() %in% type
@@ -539,7 +547,8 @@ is.Array <- function(x, type = NULL) { # nolint
 #' @usage NULL
 #' @format NULL
 #' @export
-MapArray <- R6Class("MapArray",
+MapArray <- R6Class(
+  "MapArray",
   inherit = ListArray,
   public = list(
     keys = function() MapArray__keys(self),

r/R/arrow-datum.R

@@ -19,7 +19,8 @@
 
 # Base class for Array, ChunkedArray, and Scalar, for S3 method dispatch only.
 # Does not exist in C++ class hierarchy
-ArrowDatum <- R6Class("ArrowDatum",
+ArrowDatum <- R6Class(
+  "ArrowDatum",
   inherit = ArrowObject,
   public = list(
     cast = function(target_type, safe = TRUE, ...) {
@@ -81,14 +82,16 @@ as.vector.ArrowDatum <- function(x, mode) {
 #' @export
 Ops.ArrowDatum <- function(e1, e2) {
   if (missing(e2)) {
-    switch(.Generic,
+    switch(
+      .Generic,
       "!" = return(eval_array_expression(.Generic, e1)),
       "+" = return(eval_array_expression(.Generic, 0L, e1)),
       "-" = return(eval_array_expression("negate_checked", e1)),
     )
   }
 
-  switch(.Generic,
+  switch(
+    .Generic,
     "+" = ,
     "-" = ,
     "*" = ,
@@ -112,7 +115,8 @@ Ops.ArrowDatum <- function(e1, e2) {
 
 #' @export
 Math.ArrowDatum <- function(x, ..., base = exp(1), digits = 0) {
-  switch(.Generic,
+  switch(
+    .Generic,
     abs = eval_array_expression("abs_checked", x),
     ceiling = eval_array_expression("ceil", x),
     sign = eval_array_expression("sign", x),
@@ -161,10 +165,7 @@ Math.ArrowDatum <- function(x, ..., base = exp(1), digits = 0) {
 # Wrapper around call_function that:
 # (1) maps R function names to Arrow C++ compute ("/" --> "divide_checked")
 # (2) wraps R input args as Array or Scalar
-eval_array_expression <- function(FUN,
-                                  ...,
-                                  args = list(...),
-                                  options = empty_named_list()) {
+eval_array_expression <- function(FUN, ..., args = list(...), options = empty_named_list()) {
   if (FUN == "-" && length(args) == 1L) {
     if (inherits(args[[1]], "ArrowObject")) {
       return(eval_array_expression("negate_checked", args[[1]]))

r/R/arrow-info.R

@@ -157,11 +157,14 @@ print.arrow_info <- function(x, ...) {
     cat("\n")
   }
   cat("Arrow package version: ", format(x$version), "\n\n", sep = "")
-  print_key_values("Capabilities", c(
-    x$capabilities,
-    jemalloc = "jemalloc" %in% x$memory_pool$available_backends,
-    mimalloc = "mimalloc" %in% x$memory_pool$available_backends
-  ))
+  print_key_values(
+    "Capabilities",
+    c(
+      x$capabilities,
+      jemalloc = "jemalloc" %in% x$memory_pool$available_backends,
+      mimalloc = "mimalloc" %in% x$memory_pool$available_backends
+    )
+  )
   if (some_features_are_off(x$capabilities) && identical(tolower(Sys.info()[["sysname"]]), "linux")) {
     # Only on linux because (e.g.) we disable certain features on purpose on rtools35
     cat(
@@ -177,22 +180,31 @@ print.arrow_info <- function(x, ...) {
   format_bytes <- function(b, units = "auto", digits = 2L, ...) {
     format(structure(b, class = "object_size"), units = units, digits = digits, ...)
   }
-  print_key_values("Memory", c(
-    Allocator = x$memory_pool$backend_name,
-    # utils:::format.object_size is not properly vectorized
-    Current = format_bytes(x$memory_pool$bytes_allocated, ...),
-    Max = format_bytes(x$memory_pool$max_memory, ...)
-  ))
-  print_key_values("Runtime", c(
-    `SIMD Level` = x$runtime_info$simd_level,
-    `Detected SIMD Level` = x$runtime_info$detected_simd_level
-  ))
-  print_key_values("Build", c(
-    `C++ Library Version` = x$build_info$cpp_version,
-    `C++ Compiler` = x$build_info$cpp_compiler,
-    `C++ Compiler Version` = x$build_info$cpp_compiler_version,
-    `Git ID` = x$build_info$git_id
-  ))
+  print_key_values(
+    "Memory",
+    c(
+      Allocator = x$memory_pool$backend_name,
+      # utils:::format.object_size is not properly vectorized
+      Current = format_bytes(x$memory_pool$bytes_allocated, ...),
+      Max = format_bytes(x$memory_pool$max_memory, ...)
+    )
+  )
+  print_key_values(
+    "Runtime",
+    c(
+      `SIMD Level` = x$runtime_info$simd_level,
+      `Detected SIMD Level` = x$runtime_info$detected_simd_level
+    )
+  )
+  print_key_values(
+    "Build",
+    c(
+      `C++ Library Version` = x$build_info$cpp_version,
+      `C++ Compiler` = x$build_info$cpp_compiler,
+      `C++ Compiler Version` = x$build_info$cpp_compiler_version,
+      `Git ID` = x$build_info$git_id
+    )
+  )
 
   invisible(x)
 }

r/R/arrow-object.R

@@ -16,15 +16,17 @@
 # under the License.
 
 #' @include enums.R
-ArrowObject <- R6Class("ArrowObject",
+ArrowObject <- R6Class(
+  "ArrowObject",
   public = list(
     initialize = function(xp) self$set_pointer(xp),
     pointer = function() get(".:xp:.", envir = self),
     `.:xp:.` = NULL,
     set_pointer = function(xp) {
       if (!inherits(xp, "externalptr")) {
         stop(
-          class(self)[1], "$new() requires a pointer as input: ",
+          class(self)[1],
+          "$new() requires a pointer as input: ",
           "did you mean $create() instead?",
           call. = FALSE
         )
@@ -66,7 +68,8 @@ ArrowObject <- R6Class("ArrowObject",
 `!=.ArrowObject` <- function(lhs, rhs) !(lhs == rhs) # nolint
 
 #' @export
-`==.ArrowObject` <- function(x, y) { # nolint
+`==.ArrowObject` <- function(x, y) {
+  # nolint
   x$Equals(y)
 }