tweaks to data viewer rownames synthesis

rstudio · Nov 3, 2017 · e2b9ba1 · e2b9ba1
1 parent adfed32
commit e2b9ba1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/cpp/session/modules/SessionDataViewer.R b/src/cpp/session/modules/SessionDataViewer.R
@@ -183,9 +183,10 @@
    if (is.data.frame(x))
    {
       info <- .row_names_info(x, type = 0L)
-      if (is.na(info)[[1]])
+      if (is.integer(info) && is.na(info[[1]]))
       {
-         range <- seq(from = start, to = start + len)
+         n <- info[[2]]
+         range <- seq(from = start, to = min(n, start + len))
          return(as.character(range))
       }
    }