Need to preserve dim and dimnames

Author: krlmlr

R/subsetting-matrix.R

@@ -28,7 +28,7 @@ tbl_subassign_matrix <- function(x, j, value, j_arg, value_arg) {
 
   withCallingHandlers(
     for (j in col_idx) {
-      x[[j]] <- vectbl_assign_matrix(x[[j]], cells[[j]], value)
+      x[[j]] <- vectbl_assign(x[[j]], cells[[j]], value)
     },
 
     vctrs_error_incompatible_type = function(cnd) {
@@ -61,15 +61,6 @@ cells_to_col_idx <- function(cells) {
   col_idx
 }
 
-vectbl_assign_matrix <- function(x, i, value) {
-  d <- dim(x)
-  dn <- dimnames(x)
-  x <- vectbl_assign(x, i, value)
-  dim(x) <- d
-  dimnames(x) <- dn
-  x
-}
-
 # Errors ------------------------------------------------------------------
 
 error_subset_matrix_must_be_logical <- function(j_arg) {

R/subsetting.R

@@ -668,7 +668,11 @@ vectbl_assign <- function(x, i, value) {
     }
   } else {
     if (.Call("tibble_need_coerce", x)) {
+      d <- dim(x)
+      dn <- dimnames(x)
       x <- vec_slice(value, rep(NA_integer_, length(x)))
+      dim(x) <- d
+      dimnames(x) <- dn
     }
   }
 

tests/testthat/_snaps/subsetting.md

@@ -557,16 +557,18 @@
       `NULL` must be a vector, a bare list, a data frame or a matrix.
     Code
       # # [<-.tbl_df and overwriting NA
-      df <- tibble(x = rep(NA, 3))
+      df <- tibble(x = rep(NA, 3), z = matrix(NA, ncol = 2, dimnames = list(NULL, c(
+        "a", "b"))))
       df[1, "x"] <- 5
+      df[1, "z"] <- 5
       df
     Output
-      # A tibble: 3 x 1
-            x
-        <dbl>
-      1     5
-      2    NA
-      3    NA
+      # A tibble: 3 x 2
+            x z[,"a"] [,"b"]
+        <dbl>   <dbl>  <dbl>
+      1     5       5      5
+      2    NA      NA     NA
+      3    NA      NA     NA
     Code
       # # [<-.tbl_df and overwriting with NA
       df <- tibble(a = TRUE, b = 1L, c = sqrt(2), d = 0+3i + 1, e = "e", f = raw(1),

tests/testthat/test-subsetting.R

@@ -924,8 +924,9 @@ test_that("output test", {
     df[1:3, 1:3] <- NULL
 
     "# [<-.tbl_df and overwriting NA"
-    df <- tibble(x = rep(NA, 3))
+    df <- tibble(x = rep(NA, 3), z = matrix(NA, ncol = 2, dimnames = list(NULL, c("a", "b"))))
     df[1, "x"] <- 5
+    df[1, "z"] <- 5
     df
 
     "# [<-.tbl_df and overwriting with NA"