Merge pull request #2106 from rstudio/fix-integer64

fix: allow numeric formatters to work with `integer64` values

Author: rich-iannone

.Rbuildignore

@@ -122,6 +122,7 @@ tests/testthat/_snaps/image.md
 
 tests/testthat/test-info_tables.R
 tests/testthat/test-input_data_validation.R
+tests/testthat/test-integer64.R
 
 tests/testthat/test-l_fmt_date_time.R
 

R/fmt.R

@@ -1445,6 +1445,11 @@ num_fmt_factory <- function(
 
   function(x) {
 
+    # Convert bit64::integer64 to numeric for formatting
+    if (inherits(x, "integer64")) {
+      x <- as.numeric(x)
+    }
+
     # Create `x_str` with the same length as `x`
     x_str <- rep_len(NA_character_, length(x))
 

R/fmt_number.R

@@ -237,10 +237,10 @@
 #'
 #' @section Compatibility of formatting function with data values:
 #'
-#' `fmt_number()` is compatible with body cells that are of the `"numeric"` or
-#' `"integer"` types. Any other types of body cells are ignored during
-#' formatting. This is to say that cells of incompatible data types may be
-#' targeted, but there will be no attempt to format them.
+#' `fmt_number()` is compatible with body cells that are of the `"numeric"`,
+#' `"integer"`, or `"integer64"` types. Any other types of body cells are
+#' ignored during formatting. This is to say that cells of incompatible data
+#' types may be targeted, but there will be no attempt to format them.
 #'
 #' @section Compatibility of arguments with the `from_column()` helper function:
 #'
@@ -540,7 +540,8 @@ fmt_number <- function(
   # of suffix labels, or NULL (the case where `suffixing` is FALSE)
   suffix_labels <- normalize_suffixing_inputs(suffixing, scale_by, system)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
+
   check_columns_valid_if_strict(data, {{ columns }}, valid_class, call = fn_call)
 
   # Set the `formatC_format` option according to whether number
@@ -685,10 +686,10 @@ fmt_number <- function(
 #'
 #' @section Compatibility of formatting function with data values:
 #'
-#' `fmt_integer()` is compatible with body cells that are of the `"numeric"` or
-#' `"integer"` types. Any other types of body cells are ignored during
-#' formatting. This is to say that cells of incompatible data types may be
-#' targeted, but there will be no attempt to format them.
+#' `fmt_integer()` is compatible with body cells that are of the `"numeric"`,
+#' `"integer"`, or `"integer64"` types. Any other types of body cells are
+#' ignored during formatting. This is to say that cells of incompatible data
+#' types may be targeted, but there will be no attempt to format them.
 #'
 #' @section Compatibility of arguments with the `from_column()` helper function:
 #'

R/format_data.R

@@ -368,7 +368,7 @@ fmt_scientific <- function(
   # of suffix labels, or NULL (the case where `suffixing` is FALSE)
   suffix_labels <- normalize_suffixing_inputs(suffixing, scale_by, system = "intl")
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # If `n_sigfig` is defined (and not `NA`) modify the number of
@@ -898,7 +898,7 @@ fmt_engineering <- function(
   # of suffix labels, or NULL (the case where `suffixing` is FALSE)
   suffix_labels <- normalize_suffixing_inputs(suffixing, scale_by, system = "intl")
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Pass `data`, `columns`, `rows`, and the formatting
@@ -1518,7 +1518,7 @@ fmt_number_si <- function(
   sep_mark <- get_locale_sep_mark(locale, sep_mark, use_seps)
   dec_mark <- get_locale_dec_mark(locale, dec_mark)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Pass `data`, `columns`, `rows`, and the formatting
@@ -2116,7 +2116,7 @@ fmt_percent <- function(
   locale <- normalize_locale(locale = locale)
   locale <- resolve_locale(data = data, locale = locale)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   if (scale_values) {
@@ -2426,7 +2426,7 @@ fmt_partsper <- function(
   locale <- normalize_locale(locale = locale)
   locale <- resolve_locale(data = data, locale = locale)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Scale values according to `to_units` value
@@ -2801,7 +2801,7 @@ fmt_fraction <- function(
     ))
   }
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Use locale-based `sep_mark` if a locale ID is provided
@@ -3200,10 +3200,10 @@ round_gt <- function(x, digits = 0) {
 #'
 #' @section Compatibility of formatting function with data values:
 #'
-#' `fmt_currency()` is compatible with body cells that are of the `"numeric"` or
-#' `"integer"` types. Any other types of body cells are ignored during
-#' formatting. This is to say that cells of incompatible data types may be
-#' targeted, but there will be no attempt to format them.
+#' `fmt_currency()` is compatible with body cells that are of the `"numeric"`,
+#' `"integer"`, or `"integer64"` types. Any other types of body cells are
+#' ignored during formatting. This is to say that cells of incompatible data
+#' types may be targeted, but there will be no attempt to format them.
 #'
 #' @section Compatibility of arguments with the `from_column()` helper function:
 #'
@@ -3522,7 +3522,7 @@ fmt_currency <- function(
   locale <- normalize_locale(locale = locale)
   locale <- resolve_locale(data = data, locale = locale)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Resolve the currency either from direct input in `currency` or
@@ -3731,7 +3731,7 @@ fmt_roman <- function(
   # Ensure that arguments are matched
   case <- rlang::arg_match0(case, values = c("upper", "lower"))
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Pass `data`, `columns`, `rows`, and the formatting
@@ -3969,7 +3969,7 @@ fmt_index <- function(
   # Use locale-based `idx_set` if a locale ID is provided
   idx_set <- get_locale_idx_set(locale)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Pass `data`, `columns`, `rows`, and the formatting
@@ -4338,7 +4338,7 @@ fmt_spelled_num <- function(
   # Obtain a locale-based `num_spellout_set` vector
   num_spellout_set <- get_locale_num_spellout(locale = locale)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Pass `data`, `columns`, `rows`, and the formatting
@@ -4650,7 +4650,7 @@ fmt_bytes <- function(
   locale <- normalize_locale(locale = locale)
   locale <- resolve_locale(data = data, locale = locale)
 
-  valid_class <- c("numeric", "integer")
+  valid_class <- c("numeric", "integer", "integer64")
   check_columns_valid_if_strict(data, {{ columns }}, valid_class)
 
   # Use locale-based marks if a locale ID is provided

R/utils.R

@@ -2437,7 +2437,17 @@ column_classes_are_valid <- function(data, columns, valid_classes, call = rlang:
       FUN.VALUE = logical(1),
       USE.NAMES = FALSE,
       # TRUE if inherits any of the valid classes
-      FUN = function(x) inherits(x, valid_classes)
+      FUN = function(x) {
+        # Check standard inheritance
+        if (inherits(x, valid_classes)) {
+          return(TRUE)
+        }
+        # If valid_classes includes numeric or integer types, also check for bit64::integer64
+        if (any(c("numeric", "integer") %in% valid_classes) && inherits(x, "integer64")) {
+          return(TRUE)
+        }
+        FALSE
+      }
     )
   )
 }

R/utils_render_common.R

@@ -132,7 +132,19 @@ is_compatible_formatter <- function(table, column, rows, compat) {
     return(TRUE)
   }
 
-  inherits(table[[column]][rows], compat)
+  column_data <- table[[column]][rows]
+  
+  # Check for standard class inheritance
+  if (inherits(column_data, compat)) {
+    return(TRUE)
+  }
+  
+  # If compat includes numeric or integer types, also check for bit64::integer64
+  if (any(c("numeric", "integer") %in% compat) && inherits(column_data, "integer64")) {
+    return(TRUE)
+  }
+  
+  FALSE
 }
 
 #' Render any formatting directives available in the `substitutions` list