Skip to content

Commit 1e191d5

Browse files
committed
Register xfun::record_print method for data.table
As with knit_print, avoid printing x when !shouldPrint(x). Use the overloaded method in the vignettes instead of relying on the auto-printing detection in print.data.table.
1 parent e4b7912 commit 1e191d5

14 files changed

+25
-12
lines changed

NAMESPACE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ if (getRversion() >= "4.0.0") {
104104
# version of R (and that is checked in .onLoad with error if not).
105105
export(.rbind.data.table) # only export in R<4.0.0 where it is still used; R-devel now detects it is missing doc, #5600
106106
}
107-
if (getRversion() >= "3.6.0") S3method(knitr::knit_print, data.table) # else manual delayed registration from the onLoad hook
107+
if (getRversion() >= "3.6.0") {
108+
S3method(knitr::knit_print, data.table)
109+
S3method(xfun::record_print, data.table)
110+
} # else manual delayed registration from the onLoad hook
108111
S3method(dim, data.table)
109112
S3method(dimnames, data.table)
110113
S3method("dimnames<-", data.table)

R/onLoad.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@
6767
setHook(packageEvent("knitr", "onLoad"), function(...) {
6868
registerS3method("knit_print", "data.table", knit_print.data.table, envir = asNamespace("knitr"))
6969
})
70+
if (isNamespaceLoaded("xfun")) {
71+
registerS3method("record_print", "data.table", record_print.data.table, envir = asNamespace("xfun"))
72+
}
73+
setHook(packageEvent("xfun", "onLoad"), function(...) {
74+
registerS3method("record_print", "data.table", record_print.data.table, envir = asNamespace("xfun"))
75+
})
7076
}
7177

7278
# Set options for the speed boost in v1.8.0 by avoiding 'default' arg of getOption(,default=)

R/print.data.table.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,3 +297,7 @@ knit_print.data.table = function(x, ...) {
297297
if (!shouldPrint(x)) return(invisible(x))
298298
NextMethod()
299299
}
300+
record_print.data.table = function(x, ...) {
301+
if (!shouldPrint(x)) return(character())
302+
NextMethod()
303+
}

vignettes/datatable-benchmarking.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vignette: >
1414

1515
```{r, echo = FALSE, message = FALSE}
1616
library(data.table)
17-
litedown::reactor(comment = "# ", print = NA)
17+
litedown::reactor(comment = "# ")
1818
```
1919

2020
<style>

vignettes/datatable-faq.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ h2 {
3232

3333
```{r, echo = FALSE, message = FALSE}
3434
library(data.table)
35-
litedown::reactor(comment = "# ", print = NA)
35+
litedown::reactor(comment = "# ")
3636
.old.th = setDTthreads(1)
3737
```
3838

vignettes/datatable-importing.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ vignette: >
1010
---
1111

1212
```{r, echo = FALSE, message = FALSE}
13-
litedown::reactor(comment = "# ", print = NA)
13+
litedown::reactor(comment = "# ")
1414
.old.th = data.table::setDTthreads(1)
1515
```
1616

vignettes/datatable-intro.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vignette: >
1515

1616
```{r, echo = FALSE, message = FALSE}
1717
library(data.table)
18-
litedown::reactor(comment = "# ", print = NA)
18+
litedown::reactor(comment = "# ")
1919
.old.th = setDTthreads(1)
2020
```
2121

vignettes/datatable-joins.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ editor_options:
1313

1414
```{r, echo = FALSE, message = FALSE}
1515
library(data.table)
16-
litedown::reactor(comment = "# ", print = NA)
16+
litedown::reactor(comment = "# ")
1717
```
1818

1919
```{r, echo=FALSE, file='_translation_links.R'}

vignettes/datatable-keys-fast-subset.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vignette: >
1515

1616
```{r, echo = FALSE, message = FALSE}
1717
library(data.table)
18-
litedown::reactor(comment = "# ", print = NA)
18+
litedown::reactor(comment = "# ")
1919
.old.th = setDTthreads(1)
2020
```
2121

vignettes/datatable-programming.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vignette: >
1515

1616
```{r init, include = FALSE}
1717
require(data.table)
18-
litedown::reactor(comment = "# ", print = NA)
18+
litedown::reactor(comment = "# ")
1919
```
2020

2121
## Introduction

0 commit comments

Comments
 (0)