Merge branch 'master' into custom-lsp-command

Author: Tal Hadad

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 You can check all of our changes from [Release Page](https://github.com/REditorSupport/vscode-R/releases)
 
+## [2.8.3](https://github.com/REditorSupport/vscode-R/releases/tag/v2.8.3)
+
+Enhancements:
+
+* Substitute variables in `r.rpath` and `r.rterm` settings. (#1444)
+* Improve code chunk handling in base .R files. (#1454, thanks @kylebutts)
+
+Fixes:
+
+* Fix multiline smart-knit (#1493)
+* Fix RMD Progress Bar (#1491)
+* Remove `.` as an R language `editor.wordSeparators` (#1503, thanks @opasche)
+* `numeric_version()` wants character as of R 4.4 (#1520, #1523, thanks @jennybc and @pawelru)
+* Handle terminals created by vscode-Python (#1511, thanks @tomasnobrega)
+
 ## [2.8.2](https://github.com/REditorSupport/vscode-R/releases/tag/v2.8.2)
 
 Enhancements:

R/session/init.R

@@ -16,7 +16,7 @@ init_first <- function() {
         return()
     }
 
-    # check requried packages
+    # check required packages
     required_packages <- c("jsonlite", "rlang")
     missing_packages <- required_packages[
         !vapply(required_packages, requireNamespace,

R/session/rstudioapi.R

@@ -230,14 +230,14 @@ viewer <- function(url, height = NULL) {
 }
 
 getVersion <- function() {
-    numeric_version(0)
+    numeric_version("0")
 }
 
 versionInfo <- function() {
     list(
         citation = "",
         mode = "vscode",
-        version = numeric_version(0),
+        version = numeric_version("0"),
         release_name = "vscode"
     )
 }

package.json

@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "R Extension for Visual Studio Code",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "author": "REditorSupport",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "REditorSupport",
@@ -2057,6 +2057,11 @@
         }
       }
     },
+    "configurationDefaults": {
+      "[r]": {
+        "editor.wordSeparators": "`~!@#$%^&*()-=+[{]}\\|;:'\",<>/"
+      }
+    },
     "taskDefinitions": [
       {
         "type": "R",
@@ -2181,7 +2186,7 @@
     "ag-grid-community": "^30.2.0",
     "cheerio": "1.0.0-rc.10",
     "crypto": "^1.0.1",
-    "ejs": "^3.1.7",
+    "ejs": "^3.1.10",
     "fs-extra": "^10.0.0",
     "highlight.js": "^10.7.3",
     "httpgd": "^0.1.6",

src/rTerminal.ts

@@ -174,10 +174,18 @@ export function deleteTerminal(term: vscode.Terminal): void {
 }
 
 export async function chooseTerminal(): Promise<vscode.Terminal | undefined> {
+    // VSCode Python's extension creates hidden terminal with string 'Deactivate'
+    // For now ignore terminals with this string
+    const ignoreTermIdentifier = 'Deactivate';
+
+    // Filter out terminals to be ignored
+    const visibleTerminals = vscode.window.terminals.filter(terminal => {
+        return !terminal.name.toLowerCase().includes(ignoreTermIdentifier);
+    });
+
     if (config().get('alwaysUseActiveTerminal')) {
-        if (vscode.window.terminals.length < 1) {
+        if (visibleTerminals.length < 1) {
             void vscode.window.showInformationMessage('There are no open terminals.');
-
             return undefined;
         }
 
@@ -189,53 +197,32 @@ export async function chooseTerminal(): Promise<vscode.Terminal | undefined> {
     for (let i = 0; i < vscode.window.terminals.length; i++){
         msg += `Terminal ${i}: ${vscode.window.terminals[i].name} `;
     }
-    if (vscode.window.terminals.length > 0) {
-        const rTermNameOptions = ['R', 'R Interactive'];
-        if (vscode.window.activeTerminal !== undefined) {
-            const activeTerminalName = vscode.window.activeTerminal.name;
-            if (rTermNameOptions.includes(activeTerminalName)) {
-                return vscode.window.activeTerminal;
-            }
-            for (let i = vscode.window.terminals.length - 1; i >= 0; i--){
-                const terminal = vscode.window.terminals[i];
-                const terminalName = terminal.name;
-                if (rTermNameOptions.includes(terminalName)) {
-                    terminal.show(true);
-                    return terminal;
-                }
-            }
-        } else {
-            msg += `B. There are ${vscode.window.terminals.length} terminals: `;
-            for (let i = 0; i < vscode.window.terminals.length; i++){
-                msg += `Terminal ${i}: ${vscode.window.terminals[i].name} `;
-            }
-            // Creating a terminal when there aren't any already does not seem to set activeTerminal
-            if (vscode.window.terminals.length === 1) {
-                const activeTerminalName = vscode.window.terminals[0].name;
-                if (rTermNameOptions.includes(activeTerminalName)) {
-                    return vscode.window.terminals[0];
-                }
-            } else {
-                msg += `C. There are ${vscode.window.terminals.length} terminals: `;
-                for (let i = 0; i < vscode.window.terminals.length; i++){
-                    msg += `Terminal ${i}: ${vscode.window.terminals[i].name} `;
-                }
-                console.info(msg);
-                void vscode.window.showErrorMessage('Error identifying terminal! Please run command "Developer: Toggle Developer Tools", find the message starting with "[chooseTerminal]", and copy the message to https://github.com/REditorSupport/vscode-R/issues');
 
-                return undefined;
-            }
-        }
-    }
+    const rTermNameOptions = ['R', 'R Interactive'];
+
+    const validRTerminals = visibleTerminals.filter(terminal => {
+        return rTermNameOptions.includes(terminal.name);
+    });
 
-    if (rTerm === undefined) {
+    if (validRTerminals.length > 0) {
+        // If there is an active terminal that is an R terminal, use it
+        if (vscode.window.activeTerminal && rTermNameOptions.includes(vscode.window.activeTerminal.name)) {
+            return vscode.window.activeTerminal;
+        }
+        // Otherwise, use last valid R terminal
+        const rTerminal = validRTerminals[validRTerminals.length - 1];
+        rTerminal.show(true);
+        return rTerminal;
+    } else {
+        // If no valid R terminals are found, create a new one
+        console.info(msg);
         await createRTerm(true);
         await delay(200); // Let RTerm warm up
+        return rTerm;
     }
-
-    return rTerm;
 }
 
+
 export async function runSelectionInTerm(moveCursor: boolean, useRepl = true): Promise<void> {
     const selection = getSelection();
     if (!selection) {

src/rmarkdown/knit.ts

@@ -137,7 +137,7 @@ export class RMarkdownKnitManager extends RMarkdownManager {
         // precedence:
         // knit > site > configuration
         if (yamlParams?.['knit']) {
-            const knitParam = yamlParams['knit'];
+            const knitParam = yamlParams['knit'].trim();
             knitCommand = outputFormat ?
                 `${knitParam}(${docPath}, output_format = '${outputFormat}')` :
                 `${knitParam}(${docPath})`;

src/rmarkdown/manager.ts

@@ -123,8 +123,8 @@ export abstract class RMarkdownManager {
 
                         }
                         const percentRegex = /[0-9]+(?=%)/g;
+                        const divisionRegex = /([0-9]+)\/([0-9]+)/g;
                         const percentRegOutput = dat.match(percentRegex);
-
                         if (percentRegOutput) {
                             for (const item of percentRegOutput) {
                                 const perc = Number(item);
@@ -136,7 +136,20 @@ export abstract class RMarkdownManager {
                                 );
                                 currentProgress = perc;
                             }
+                        } else {
+                            const divisionRegOutput = divisionRegex.exec(dat);
+                            if (divisionRegOutput) {
+                                const perc = Math.ceil(parseInt(divisionRegOutput[1]) / parseInt(divisionRegOutput[2]) * 100);
+                                progress?.report(
+                                    {
+                                        increment: perc - currentProgress,
+                                        message: `${perc}%`
+                                    }
+                                );
+                                currentProgress = perc;
+                            }
                         }
+
                         if (token?.isCancellationRequested) {
                             if (childProcess) {
                                 resolve(childProcess);

yarn.lock

@@ -1136,10 +1136,10 @@ duplexer2@~0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-ejs@^3.1.7:
-  version "3.1.7"
-  resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz"
-  integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==
+ejs@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"