Merge pull request #10 from Fred-Wu/plot-viewer-restore

Plot viewer restore

Author: Fred-Wu

.github/workflows/release.yml

@@ -5,7 +5,12 @@ name: release
 
 on:
   push:
-    tags: ["v*"]
+    tags:
+      - "v[0-9]*.[0-9]*.[0-9]*"
+      - "Enhanced_v[0-9]*.[0-9]*.[0-9]*"
+
+permissions:
+  contents: write
 
 env:
   SCRIPT_DIR: ./.github/scripts
@@ -14,15 +19,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: node $SCRIPT_DIR/enableWebpack.js
       - run: npm install
       - uses: lannonbr/vsce-action@4.0.0
         with:
           args: "package"
       - name: Identify output file # can be retrieved as steps.filenames.outputs.file_out
         id: filenames
-        run: echo "::set-output name=file_out::$(ls | grep "^.*\.vsix$" | head -1)"
+        run: echo "file_out=$(find . -maxdepth 1 -name '*.vsix' -print -quit | sed 's#^\./##')" >> "$GITHUB_OUTPUT"
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.filenames.outputs.file_out }}
@@ -34,28 +39,62 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - uses: actions/checkout@v4
       - name: Download artifacts
         uses: actions/download-artifact@v4.1.7
         with:
           path: "artifacts/"
       - name: Get version from tag
         id: get_version
-        run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\/v/}
+        run: |
+          tag="${GITHUB_REF_NAME}"
+          echo "tag=${tag}" >> "$GITHUB_OUTPUT"
+          echo "version=${tag##*v}" >> "$GITHUB_OUTPUT"
+      - name: Extract release notes from changelog
+        run: |
+          version="${{ steps.get_version.outputs.version }}"
+          extract_section() {
+            awk -v heading="$1" '
+              /^##[[:space:]]+/ {
+                current = $0
+                sub(/^##[[:space:]]+/, "", current)
+                sub(/[[:space:]]+-.*$/, "", current)
+                if (current == heading) {
+                  in_section = 1
+                  next
+                }
+                if (in_section) {
+                  exit
+                }
+              }
+              in_section { print }
+            ' CHANGELOG.md
+          }
+          extract_section "$version" > release-notes.md
+          if ! grep -q '[^[:space:]]' release-notes.md; then
+            extract_section "Unreleased" > release-notes.md
+          fi
+          if ! grep -q '[^[:space:]]' release-notes.md; then
+            echo "::error::CHANGELOG.md does not contain a section for ${version} or Unreleased."
+            exit 1
+          fi
       - name: Create release
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          files: "artifacts/*/*"
-          prerelease: false
-          draft: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release create "${{ steps.get_version.outputs.tag }}" artifacts/*/* \
+            --title "${{ steps.get_version.outputs.tag }}" \
+            --notes-file release-notes.md \
+            --verify-tag
 
 
   publish:
     name: Publish
+    needs: release
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: node $SCRIPT_DIR/enableWebpack.js
       - run: npm install
       - name: Publish to Open VSX Registry

.markdownlint.json

@@ -3,5 +3,8 @@
       "allowed_elements": [ "details", "summary", "br" ]
     },
     "line-length": false,
+    "no-duplicate-heading": {
+      "siblings_only": true
+    },
     "no-trailing-punctuation": false
-}
+}

CHANGELOG.md

@@ -1,33 +1,111 @@
 # Changelog
 
+## Unreleased
+
+### Bug Fixes
+
+* Fixed plot viewer restore for multiple R terminals. After an extension host restart, `R Plot: Show Viewers` now restores only the plot viewer for the currently attached R process.
+* Fixed httpgd plot routing for multiple attached R terminals. New plots now continue in the plot viewer that belongs to the focused terminal's R process.
+* Fixed direct plotting after plot viewer restore so new httpgd plots can reopen or update the attached session's viewer without first manually showing the viewer.
+
+### Minor
+
+* Added the attached R process ID to data viewer tab titles, including Live Share guest data viewers.
+* Updated the GitHub release workflow so versioned releases use the matching `CHANGELOG.md` section as the GitHub Release notes.
+
+### Maintenance
+
+* Removed confirmed unused TypeScript helpers, imports, and stale help viewer CRAN parsing code.
+* Removed the bundled npm `node` dependency so build scripts use the environment-provided Node.js runtime.
+* Removed the deprecated npm `crypto` shim; the extension uses Node.js' built-in `crypto` module.
+* Updated in-range development dependency lockfile entries while leaving `ag-grid-community` unchanged.
+* Tightened release tag handling to version-shaped tags and removed deprecated GitHub Actions `set-output` usage.
+
 ## 3.0.6 - 2026-03-17
 
-* Removed "No text editor active." warning pop-up.
+### Bug Fixes
+
+* Removed the "No text editor active." warning pop-up.
+* Reverted the `later`-based workspace scan change.
 
 ## 3.0.5 - 2026-01-04
 
-### Major
+### Features
 
 * Added a UI button to refresh data viewer.
+* Added support for viewing `polars` data frames.
+* Added support for viewing environments in the data viewer.
+
+### Bug Fixes
+
+* Fixed data viewer refresh behavior.
+* Fixed data viewer rendering for environment objects.
+* Fixed completion after `$` for cases such as R6, R7, and packages where unavailable methods previously stopped completion results from appearing.
+* Fixed Live Share guest attach handling for httpgd plot servers.
 
 ### Minor
 
 * Simplified data viewer loading overlay text.
-* Fixed completion trigger `$` that may not show anything, ie from R6 or R7. For a package like `torch`, if a method was not implemented, and resulted in an error, the completion would not suggest the method.
-* Fixed data viewer if an object is an environment.
 
-## 3.0.2 - 2025-11-17
+## 3.0.4 - 2025-12-25
+
+### Features
+
+* Added one plot viewer per R session so multiple sessions no longer share a single plot panel.
+* Added a loading indicator and updated grid behavior in the data viewer.
+
+### Bug Fixes
+
+* Fixed Live Share startup and session sharing behavior.
+* Fixed cleanup of data viewers and httpgd plot viewers when workspace or server sharing is toggled.
+* Fixed disposal of open viewers after an extension restart when the R session is still running.
+* Fixed data viewer name display for single-column data.
 
 ### Minor
 
-* Further improvements to R language service stoping mechanism to a Quarto document.
+* Improved data viewer grid configuration for large and complex data.
+* Stopped the R language server for temporary source files and stopped the help server after the help viewer is closed.
+
+## 3.0.2 - 2025-11-17
+
+### Bug Fixes
+
+* Improved R language server shutdown for Quarto documents.
+* Fixed language server shutdown for untitled Quarto documents.
+* Included updates related to bracketed paste behavior on Windows.
+
+## 3.0.1 - 2025-11-06
+
+### Bug Fixes
 
-## 3.0.1 - 2025-10-27
+* Fixed plot viewer panels not reopening after an R session is dropped and reattached.
 
-### Major
+## 3.0.0 - 2025-10-27
 
-* Added support for dynamic data loading in the Data Viewer.
+### Features
+
+* Added a redesigned data viewer with server-side row loading for large data.
+* Added support for dynamic data loading in the data viewer.
+* Added data viewer filtering support, including date, boolean, `POSIXct`, and `POSIXlt` columns.
+* Added support for Arrow table data in the data viewer.
 * Added an option to launch the R terminal within the side editor area.
 * Updated language server behavior to start only when an R-related file is opened and shut down when all files are closed.
+* Updated the session status bar so it appears only when an R terminal is attached.
+
+### Bug Fixes
+
+* Fixed disappearing data viewer rows.
+* Fixed multiple data viewer request handling.
+* Fixed `dataview_table` behavior.
+
+### Minor
+
+* Improved R syntax highlighting.
+* Improved data viewer configuration for large and complex data.
+* Improved data viewer row number and filtered-column display.
+* Moved R and R Markdown syntax definitions to `vscode-R-syntax`.
+* Showed the R sidebar icon only when the extension is active.
+
+See [CHANGELOG.old.md](https://github.com/REditorSupport/vscode-R/blob/master/CHANGELOG.old.md) for changes before v3.0.0.
 
 <!-- generated by git-cliff -->

R/session/vsc.R

@@ -117,8 +117,8 @@ dataview_table <- local({
              metadata_only = FALSE, force = FALSE) {
 
         if (!is.data.frame(data) && !is.matrix(data) &&
-            !inherits(data, "ArrowTabular") &&
-            !inherits(data, "polars_data_frame")) {
+                !inherits(data, "ArrowTabular") &&
+                !inherits(data, "polars_data_frame")) {
             stop("data must be a data frame, a matrix or an arrow table object.")
         }
 
@@ -747,12 +747,55 @@ removeTaskCallback("vsc.plot")
 use_httpgd <- identical(getOption("vsc.use_httpgd", FALSE), TRUE)
 show_plot <- !identical(getOption("vsc.plot", "Two"), FALSE)
 if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
+    httpgd_plot_updated <- FALSE
+
+    is_httpgd_dev <- function() {
+        names(dev.cur()) %in% c("httpgd", "unigd")
+    }
+
+    request_httpgd <- function() {
+        tryCatch({
+            if (length(httpgd::hgd_details()) > 0) {
+                .vsc$request("httpgd", url = httpgd::hgd_url())
+            }
+        }, error = message)
+    }
+
+    new_httpgd_plot <- function(...) {
+        if (is_httpgd_dev()) {
+            httpgd_plot_updated <<- TRUE
+        }
+    }
+
     options(device = function(...) {
         httpgd::hgd(
             silent = TRUE
         )
-        .vsc$request("httpgd", url = httpgd::hgd_url())
+        request_httpgd()
     })
+
+    update_httpgd_plot <- function(...) {
+        tryCatch({
+            if (httpgd_plot_updated && is_httpgd_dev()) {
+                httpgd_plot_updated <<- FALSE
+                request_httpgd()
+            }
+        }, error = message)
+        TRUE
+    }
+
+    setHook("plot.new", new_httpgd_plot, "replace")
+    setHook("grid.newpage", new_httpgd_plot, "replace")
+
+    rebind(".External.graphics", function(...) {
+        out <- .Primitive(".External.graphics")(...)
+        if (is_httpgd_dev()) {
+            httpgd_plot_updated <<- TRUE
+        }
+        out
+    }, "base")
+
+    addTaskCallback(update_httpgd_plot, name = "vsc.plot")
 } else if (use_httpgd) {
     message("Install package `httpgd` to use vscode-R with httpgd!")
 } else if (show_plot) {