subsetting back tibble when i > nrow

earowang · earowang · commit 5a44ed1c697b · 2020-05-29T19:54:38.000+12:00
diff --git a/R/subset.R b/R/subset.R
@@ -42,7 +42,8 @@
   }
 
   cn <- names(res)
-  not_tsibble <- !(index_var(x) %in% cn) || vec_size(res) > vec_size(x)
+  nr <- vec_size(x)
+  not_tsibble <- !(index_var(x) %in% cn) || vec_size(res) > nr || any(i > nr)
   if (not_tsibble) return(as_tibble(res))
 
   if (!is_null(i)) {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`cn <- names(res)`
`45`		`- not_tsibble <- !(index_var(x) %in% cn) \|\| vec_size(res) > vec_size(x)`
	`45`	`+ nr <- vec_size(x)`
	`46`	`+ not_tsibble <- !(index_var(x) %in% cn) \|\| vec_size(res) > nr \|\| any(i > nr)`
`46`	`47`	`if (not_tsibble) return(as_tibble(res))`
`47`	`48`
`48`	`49`	`if (!is_null(i)) {`