Merge branch 'master' of https://github.com/ElianHugh/vscode-R

Author: ElianHugh

CHANGELOG.md

@@ -4,6 +4,45 @@
 
 You can check all of our changes from [Release Page](https://github.com/REditorSupport/vscode-R/releases)
 
+## [2.1.0](https://github.com/REditorSupport/vscode-R/releases/tag/v2.1.0)
+
+Important changes
+
+* The project is migrated to [REditorSupport](https://github.com/REditorSupport) organization on
+GitHub. (#98)
+* The R language service (completion, document outline, definition, etc.,
+formerly implemented in [vscode-r-lsp](https://github.com/REditorSupport/vscode-r-lsp)) is now
+integrated into vscode-R (#695). The vscode-r-lsp extension will be unpublished from the
+VS Code marketplace
+at some point.
+  * Search `r-lsp` extension, uninstall it and vscode-R will start the R langauge service
+  automatically.
+  * The language service still depends on the R package [`languageserver`](https://github.com/REditorSupport/languageserver). Make sure the package is installed before using vscode-R.
+  * To opt-out the language service, set `"r.lsp.enabled": false` in your user settings.
+* R session watcher is now enabled by default. (#670)
+  * `r.previewDataframe` and `r.previewEnvironment` will use the session watcher if enabled.
+  * To opt-out, set `"r.sessionWatcher": false` in your user settings.
+
+New Features
+
+* Preview R Markdown documents via background process with auto-refresh and dark theme support. (#692, #699)
+
+Enhancements
+
+* Several enhancements of the workspace viewer. (#672)
+* The plot viewer now supports customizable CSS file via `r.plot.customStyleOverwrites` and
+ `r.plot.togglePreviewPlots` now cycles through mutlirow/scroll/hidden. (#678, #681)
+* The data viewer is now based on [ag-grid](https://github.com/ag-grid/ag-grid) with better performance and better support for filtering and dark theme. (#708)
+  * The data viewer might not work with existing R sessions started before the extension update.
+  A restart of sessions is needed to use the new data viewer.
+* Command `r.showPlotHistory` is removed in favor of the httpgd-based plot viewer. (#706)
+* The plot viewer now supports full window mode. (#709)
+
+Fixes
+
+* LiveShare API bug fix and enhancements. (#679)
+* Fix syntax highlighting of integers in scientific notation. (#683)
+
 ## [2.0.0](https://github.com/REditorSupport/vscode-R/releases/tag/v2.0.0)
 
 Highlight

R/vsc.R

@@ -176,13 +176,10 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
 } else if (use_httpgd) {
   message("Install package `httpgd` to use vscode-R with httpgd!")
 } else if (show_plot) {
-  dir_plot_history <- file.path(dir_session, "images")
-  dir.create(dir_plot_history, showWarnings = FALSE, recursive = TRUE)
   plot_file <- file.path(dir_session, "plot.png")
   plot_lock_file <- file.path(dir_session, "plot.lock")
   file.create(plot_file, plot_lock_file, showWarnings = FALSE)
 
-  plot_history_file <- NULL
   plot_updated <- FALSE
   null_dev_id <- c(pdf = 2L)
   null_dev_size <- c(7 + pi, 7 + pi)
@@ -194,8 +191,6 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
 
   new_plot <- function() {
     if (check_null_dev()) {
-      plot_history_file <<- file.path(dir_plot_history,
-        format(Sys.time(), "%Y%m%d-%H%M%OS6.png"))
       plot_updated <<- TRUE
     }
   }
@@ -221,9 +216,6 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
           on.exit({
             dev.off()
             cat(get_timestamp(), file = plot_lock_file)
-            if (!is.null(plot_history_file)) {
-              file.copy(plot_file, plot_history_file, overwrite = TRUE)
-            }
           })
           replayPlot(record)
         }
@@ -249,26 +241,38 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
 
 show_view <- !identical(getOption("vsc.view", "Two"), FALSE)
 if (show_view) {
-  dataview_data_type <- function(x) {
-    if (is.numeric(x)) {
-      if (is.null(attr(x, "class"))) {
-        "num"
-      } else {
-        "num-fmt"
+  get_column_def <- function(name, field, value) {
+    filter <- TRUE
+    if (is.numeric(value)) {
+      type <- "numericColumn"
+      if (is.null(attr(value, "class"))) {
+        filter <- "agNumberColumnFilter"
       }
-    } else if (inherits(x, "Date")) {
-      "date"
+    } else if (inherits(value, "Date")) {
+      type <- "dateColumn"
+      filter <- "agDateColumnFilter"
     } else {
-      "string"
+      type <- "textColumn"
+      filter <- "agTextColumnFilter"
     }
+    list(
+      headerName = name,
+      field = field,
+      type = type,
+      filter = filter
+    )
   }
 
   dataview_table <- function(data) {
+    if (is.matrix(data)) {
+      data <- as.data.frame.matrix(data)
+    }
+
     if (is.data.frame(data)) {
       nrow <- nrow(data)
       colnames <- colnames(data)
       if (is.null(colnames)) {
-        colnames <- sprintf("(X%d)", seq_len(ncol(data)))
+        colnames <- sprintf("V%d", seq_len(ncol(data)))
       } else {
         colnames <- trimws(colnames)
       }
@@ -278,49 +282,23 @@ if (show_view) {
       } else {
         rownames <- seq_len(nrow)
       }
+      colnames <- c("(row)", colnames)
+      fields <- sprintf("x%d", seq_along(colnames))
       data <- c(list(" " = rownames), .subset(data))
-      colnames <- c(" ", colnames)
-      types <- vapply(data, dataview_data_type,
-        character(1L), USE.NAMES = FALSE)
-      data <- vapply(data, function(x) {
-        trimws(format(x))
-      }, character(nrow), USE.NAMES = FALSE)
-      dim(data) <- c(length(rownames), length(colnames))
-    } else if (is.matrix(data)) {
-      if (is.factor(data)) {
-        data <- format(data)
-      }
-      types <- rep(dataview_data_type(data), ncol(data))
-      colnames <- colnames(data)
-      colnames(data) <- NULL
-      if (is.null(colnames)) {
-        colnames <- sprintf("(X%d)", seq_len(ncol(data)))
-      } else {
-        colnames <- trimws(colnames)
-      }
-      rownames <- rownames(data)
-      rownames(data) <- NULL
-      data <- trimws(format(data))
-      if (is.null(rownames)) {
-        types <- c("num", types)
-        rownames <- seq_len(nrow(data))
-      } else {
-        types <- c("string", types)
-        rownames <- trimws(rownames)
-      }
-      dim(data) <- c(length(rownames), length(colnames))
-      colnames <- c(" ", colnames)
-      data <- cbind(rownames, data)
+      names(data) <- fields
+      class(data) <- "data.frame"
+      attr(data, "row.names") <- .set_row_names(nrow)
+      columns <- .mapply(get_column_def,
+        list(colnames, fields, data),
+        NULL
+      )
+      list(
+        columns = columns,
+        data = data
+      )
     } else {
-      stop("data must be data.frame or matrix")
+      stop("data must be a data.frame or a matrix")
     }
-    columns <- .mapply(function(title, type) {
-      class <- if (type == "string") "text-left" else "text-right"
-      list(title = scalar(title),
-        className = scalar(class),
-        type = scalar(type))
-    }, list(colnames, types), NULL)
-    list(columns = columns, data = data)
   }
 
   show_dataview <- function(x, title, uuid = NULL,
@@ -385,7 +363,7 @@ if (show_view) {
     if (is.data.frame(x) || is.matrix(x)) {
       data <- dataview_table(x)
       file <- tempfile(tmpdir = tempdir, fileext = ".json")
-      jsonlite::write_json(data, file, matrix = "rowmajor")
+      jsonlite::write_json(data, file, auto_unbox = TRUE)
       request("dataview", source = "table", type = "json",
         title = title, file = file, viewer = viewer, uuid = uuid)
     } else if (is.list(x)) {

README.md

@@ -3,42 +3,42 @@
 [![Badge](https://aka.ms/vsls-badge)](https://aka.ms/vsls)
 
 This [VS Code](https://code.visualstudio.com/) extension provides support for the [R programming language](https://www.r-project.org), including features such as
-extended syntax highlighting, interacting with R terminals, viewing data, plots, workspace variables, help pages, managing packages, and working with [R Markdown](https://rmarkdown.rstudio.com/) documents.
+extended syntax highlighting, R language service based on code analysis, interacting with R terminals, viewing data, plots, workspace variables, help pages, managing packages, and working with [R Markdown](https://rmarkdown.rstudio.com/) documents.
 
 Go to the [wiki](https://github.com/REditorSupport/vscode-R/wiki) to view the documentation of the extension.
 
 ## Getting started
 
 1. [Install R](https://cloud.r-project.org/) (>= 3.4.0) on your system. For Windows users, Writing R Path to the registry is recommended in the installation.
 
-2. Install [`jsonlite`](https://github.com/jeroen/jsonlite) and [`rlang`](https://github.com/r-lib/rlang) packages in R.
+2. Install [`languageserver`](https://github.com/REditorSupport/languageserver) in R.
 
     ```r
-    install.packages(c("jsonlite", "rlang"))
+    install.packages("languageserver")
     ```
 
 3. Install the [R extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=Ikuyadeu.r).
 
 4. Create an R file and start coding.
 
-Note that the above steps only provide basic code editing functionalities and features of interacting with R sessions. To get full R development experience such as code completion, linting, formatting, debugging, etc., go to the installation wiki pages ([Windows](https://github.com/REditorSupport/vscode-R/wiki/Installation:-Windows) | [macOS](https://github.com/REditorSupport/vscode-R/wiki/Installation:-macOS) | [Linux](https://github.com/REditorSupport/vscode-R/wiki/Installation:-Linux)) for detailed instructions of installing the following recommended software and extensions:
+The following software or extensions are recommended to enhance the experience of using R in VS Code:
 
 * [radian](https://github.com/randy3k/radian): A modern R console that corrects many limitations of the official R terminal and supports many features such as syntax highlighting and auto-completion.
 
-* [languageserver](https://github.com/REditorSupport/languageserver): An R package that implements the Language Server Protocol for R to provide a wide range of language analysis features such as auto-completion, function signature, documentation, symbol highlight, document outline, code formatting, symbol hover, diagnostics, go to definition, find references, etc.
-
-* [vscode-r-lsp](https://marketplace.visualstudio.com/items?itemName=REditorSupport.r-lsp): A VS Code extension of R LSP Client to communicate between VS Code and R Language Server.
-
 * [VSCode-R-Debugger](https://github.com/ManuelHentschel/VSCode-R-Debugger): A VS Code extension to support R debugging capabilities.
 
 * [httpgd](https://github.com/nx10/httpgd): An R package to provide a graphics device that asynchronously serves SVG graphics via HTTP and WebSockets.
 
+Go to the installation wiki pages ([Windows](https://github.com/REditorSupport/vscode-R/wiki/Installation:-Windows) | [macOS](https://github.com/REditorSupport/vscode-R/wiki/Installation:-macOS) | [Linux](https://github.com/REditorSupport/vscode-R/wiki/Installation:-Linux)) for more detailed instructions.
+
 ## Features
 
 * Extended syntax highlighting for R, R Markdown, and R Documentation.
 
 * Snippets for R and R Markdown.
 
+* [R Language Service](https://github.com/REditorSupport/vscode-R/wiki/R-Language-Service): Code completion, function signature, symbol highlight, document outline, formatting, definition, refere
+
 * [Interacting with R terminals](https://github.com/REditorSupport/vscode-R/wiki/Interacting-with-R-terminals): Sending code to terminals, running multiple terminals, working with remote servers.
 
 * [Package development](https://github.com/REditorSupport/vscode-R/wiki/Package-development): Build, test, install, load all and other commands from devtools.

html/httpgd/index.js

@@ -21,9 +21,14 @@ function getSmallPlots() {
     return smallPlots;
 }
 let isHandlerDragging = false;
+let isFullWindow = false;
 function postResizeMessage(userTriggered = false) {
-    const newHeight = largePlotDiv.clientHeight;
-    const newWidth = largePlotDiv.clientWidth;
+    let newHeight = largePlotDiv.clientHeight;
+    let newWidth = largePlotDiv.clientWidth;
+    if (isFullWindow) {
+        newHeight = window.innerHeight;
+        newWidth = window.innerWidth;
+    }
     if (userTriggered || newHeight !== oldHeight || newWidth !== oldWidth) {
         const msg = {
             message: 'resize',
@@ -66,6 +71,9 @@ window.addEventListener('message', (ev) => {
     else if (msg.message === 'togglePreviewPlotLayout') {
         togglePreviewPlotLayout(msg.style);
     }
+    else if (msg.message === 'toggleFullWindow') {
+        toggleFullWindowMode(msg.useFullWindow);
+    }
 });
 function addPlot(html) {
     const wrapper = document.createElement('div');
@@ -124,6 +132,17 @@ function togglePreviewPlotLayout(newStyle) {
     smallPlotDiv.classList.remove('multirow', 'scroll', 'hidden');
     smallPlotDiv.classList.add(newStyle);
 }
+function toggleFullWindowMode(useFullWindow) {
+    isFullWindow = useFullWindow;
+    if (useFullWindow) {
+        document.body.classList.add('fullWindow');
+        window.scrollTo(0, 0);
+    }
+    else {
+        document.body.classList.remove('fullWindow');
+    }
+    postResizeMessage(true);
+}
 ////
 // On window load
 ////
@@ -136,15 +155,15 @@ window.onload = () => {
 ////
 document.addEventListener('mousedown', (e) => {
     // If mousedown event is fired from .handler, toggle flag to true
-    if (e.target === handler) {
+    if (!isFullWindow && e.target === handler) {
         isHandlerDragging = true;
         handler.classList.add('dragging');
         document.body.style.cursor = 'ns-resize';
     }
 });
 document.addEventListener('mousemove', (e) => {
     // Don't do anything if dragging flag is false
-    if (!isHandlerDragging) {
+    if (isFullWindow || !isHandlerDragging) {
         return false;
     }
     // postLogMessage('mousemove');

html/httpgd/index.ts

@@ -44,10 +44,15 @@ function getSmallPlots(): HTMLAnchorElement[] {
 let isHandlerDragging = false;
 
 
+let isFullWindow = false;
 
 function postResizeMessage(userTriggered: boolean = false){
-  const newHeight = largePlotDiv.clientHeight;
-  const newWidth = largePlotDiv.clientWidth;
+  let newHeight = largePlotDiv.clientHeight;
+  let newWidth = largePlotDiv.clientWidth;
+  if(isFullWindow){
+    newHeight = window.innerHeight;
+    newWidth = window.innerWidth;
+  }
   if(userTriggered || newHeight !== oldHeight || newWidth !== oldWidth){
     const msg: ResizeMessage = {
       message: 'resize',
@@ -86,6 +91,8 @@ window.addEventListener('message', (ev: MessageEvent<InMessage>) => {
     addPlot(msg.html);
   } else if(msg.message === 'togglePreviewPlotLayout'){
     togglePreviewPlotLayout(msg.style);
+  } else if(msg.message === 'toggleFullWindow'){
+    toggleFullWindowMode(msg.useFullWindow);
   }
 });
 
@@ -165,6 +172,16 @@ function togglePreviewPlotLayout(newStyle: PreviewPlotLayout): void {
   smallPlotDiv.classList.add(newStyle);
 }
 
+function toggleFullWindowMode(useFullWindow): void {
+  isFullWindow = useFullWindow;
+  if(useFullWindow){
+    document.body.classList.add('fullWindow');
+    window.scrollTo(0, 0);
+  } else {
+    document.body.classList.remove('fullWindow');
+  }
+  postResizeMessage(true);
+}
 
 ////
 // On window load
@@ -183,7 +200,7 @@ window.onload = () => {
 
 document.addEventListener('mousedown', (e) => {
   // If mousedown event is fired from .handler, toggle flag to true
-  if (e.target === handler) {
+  if (!isFullWindow && e.target === handler) {
     isHandlerDragging = true;
     handler.classList.add('dragging');
     document.body.style.cursor = 'ns-resize';
@@ -192,7 +209,7 @@ document.addEventListener('mousedown', (e) => {
 
 document.addEventListener('mousemove', (e) => {
   // Don't do anything if dragging flag is false
-  if (!isHandlerDragging) {
+  if (isFullWindow || !isHandlerDragging) {
     return false;
   }