correctedchanges

Author: venom1204

R/print.data.table.R

@@ -265,8 +265,8 @@ char.trunc = function(x, trunc.char = getOption("datatable.prettyprint.char")) {
 dt_width = function(x, nrow, class, row.names, col.names) {
   widths = apply(nchar(x, type='width'), 2L, max)
   if (class) widths = pmax(widths, 6L)
-  names_widths = if (col.names == "none") rep(0L, ncol(x)) else sapply(colnames(x), nchar, type = "width")
-  dt_widths = pmax(widths, names_widths)
+  if (col.names != "none") names = sapply(colnames(x), nchar, type="width") else names = 0L
+  dt_widths = pmax(widths, names)
   rownum_width = if (row.names) as.integer(ceiling(log10(nrow))+2.0) else 0L
   cumsum(dt_widths + 1L) + rownum_width
 }

inst/tests/tests.Rraw

@@ -21142,14 +21142,14 @@ test(2314.1, any(grepl("<int>", tail(capture.output(print(dt, class = TRUE)), 2)
 # Test that class=TRUE with col.names="top" doesn't show classes at bottom
 test(2314.2, !any(grepl("<int>", tail(capture.output(print(dt, class = TRUE, col.names = "top")), 2))), TRUE)
 
-test(2313.1, {
+test(2315.1, {
   dt <- data.table(short=1:3, verylongcolumnname=4:6)
   print(dt, col.names="none")
-}, output="1: 1 4\n2: 2 5\n3: 3 6\n")
+}, output="1: 1 4\n2: 2 5\n3: 3 6")
 test(2313.2, {
   dt <- data.table(x=123456, y="wide_string")
   print(dt, col.names="none")
-}, output="1: 123456 wide_string\n")
+}, output="1: 123456 wide_string")
 test(2313.3, {
   dt <- data.table(a=NA_integer_, b=NaN)
   print(dt, col.names="none")