feat: R syntax highlighting and Notebook Support

client/src/components/ContentNavigator/convert.ts

@@ -20,12 +20,14 @@ const stepRef: Record<string, string> = {
   sas: "a7190700-f59c-4a94-afe2-214ce639fcde",
   sql: "a7190700-f59c-4a94-afe2-214ce639fcde",
   python: "ab59f8c4-af9a-4608-a5d5-a8365357bb99",
+  rlang: "ab59f8c4-af9a-4608-a5d5-a8365357bb99",
 };
 
 const stepTitle: Record<string, string> = {
   sas: l10n.t("SAS Program"),
   sql: l10n.t("SQL Program"),
   python: l10n.t("Python Program"),
+  rlang: l10n.t("R Program"),
 };
 
 const NODE_SPACING = 150;
@@ -305,7 +307,7 @@ function generateCodeListFromSASNotebook(content: string): Entry[] {
       let code = cell.value;
       if (code !== "") {
         const language = cell.language;
-        if (["python", "sas", "sql"].includes(language)) {
+        if (["python", "sas", "sql", "rlang"].includes(language)) {
           if (language === "sql") {
             code = `PROC SQL;
 ${code};

client/src/components/notebook/Controller.ts

@@ -11,7 +11,7 @@ export class NotebookController {
   readonly controllerId = "sas-notebook-controller-id";
   readonly notebookType = "sas-notebook";
   readonly label = "SAS Notebook";
-  readonly supportedLanguages = ["sas", "sql", "python"];
+  readonly supportedLanguages = ["sas", "sql", "python", "r"];
 
   private readonly _controller: vscode.NotebookController;
   private _executionOrder = 0;

client/src/components/notebook/exporters/toHTML.ts

@@ -17,6 +17,7 @@ import {
 import { readFileSync } from "fs";
 import hljs from "highlight.js/lib/core";
 import python from "highlight.js/lib/languages/python";
+import r from "highlight.js/lib/languages/r";
 import sql from "highlight.js/lib/languages/sql";
 import { marked } from "marked";
 import path from "path";
@@ -27,6 +28,7 @@ import { includeLogInNotebookExport } from "../../utils/settings";
 const templatesDir = path.resolve(__dirname, "../notebook/exporters/templates");
 
 hljs.registerLanguage("python", python);
+hljs.registerLanguage("r", r);
 hljs.registerLanguage("sql", sql);
 
 export const exportToHTML = async (

client/src/components/notebook/exporters/toSAS.ts

@@ -15,6 +15,10 @@ const exportCell = (cell: NotebookCell) => {
       return text;
     case "python":
       return wrapPython(text);
+    case "r":
+      return wrapRlang(text);
+    case "rlang":
+      return wrapRlang(text);
     case "sql":
       return wrapSQL(text);
     case "markdown":
@@ -36,3 +40,9 @@ submit;
 ${code}
 endsubmit;
 run;`;
+
+const wrapRlang = (code: string) => `proc rlang;
+submit;
+${code}
+endsubmit;
+run;`;

client/src/components/utils/SASCodeDocument.ts

@@ -180,6 +180,14 @@ endsubmit;
 run;`;
   }
 
+  private wrapRlang(code: string) {
+    return `proc rlang;
+submit;
+${code}
+endsubmit;
+run;`;
+  }
+
   private insertLogStartIndicator(code: string): string {
     // add a comment line at the top of code,
     // this comment line will be used as indicator to the beginning of log related with this code
@@ -198,6 +206,13 @@ ${code}`;
       wrapped = this.wrapPython(wrapped);
     }
 
+    if (
+      this.parameters.languageId === "r" ||
+      this.parameters.languageId === "rlang"
+    ) {
+      wrapped = this.wrapRlang(wrapped);
+    }
+
     wrapped = this.wrapCodeWithSASProgramFileName(wrapped);
 
     wrapped = this.wrapCodeWithPreambleAndPostamble(wrapped);

client/test/components/util/SASCodeDocument.test.ts

@@ -38,6 +38,40 @@ run;
     assert.equal(sasCodeDoc.getWrappedCode(), expected);
   });
 
+  it("wrap rlang code", () => {
+    const parameters: SASCodeDocumentParameters = {
+      languageId: "r",
+      code: `for (x in 1:6) {
+  print(x)
+}
+print("test")`,
+      selectedCode: "",
+      htmlStyle: "Illuminate",
+      outputHtml: true,
+      uuid: "519058ad-d33b-4b5c-9d23-4cc8d6ffb163",
+      checkKeyword: async () => false,
+    };
+
+    const sasCodeDoc = new SASCodeDocument(parameters);
+
+    const expected = `/** LOG_START_INDICATOR **/
+title;footnote;ods _all_ close;
+ods graphics on;
+ods html5(id=vscode) style=Illuminate options(bitmap_mode='inline' svg_mode='inline') body="519058ad-d33b-4b5c-9d23-4cc8d6ffb163.htm";
+proc rlang;
+submit;
+for (x in 1:6) {
+  print(x)
+}
+print("test")
+endsubmit;
+run;
+;*';*";*/;run;quit;ods html5(id=vscode) close;
+`;
+
+    assert.equal(sasCodeDoc.getWrappedCode(), expected);
+  });
+
   it("wrap sql code", () => {
     const parameters: SASCodeDocumentParameters = {
       languageId: "sql",

client/testFixture/formatter/expected.sas

@@ -46,6 +46,16 @@ def my_function():
 endsubmit;
 run;
 
+proc rlang;
+submit;
+# Reference to variable defined in previous PROC RLANG call
+print(paste("x =", x))
+my_function <- function() {
+    print("Inside the proc step")
+}
+endsubmit;
+run;
+
 proc lua;
 submit;
 local dsid = sas.open("sashelp.company") -- open for input            
@@ -131,6 +141,17 @@ print('first statement after for loop')
 endinteractive;
 run;
 
+proc rlang;
+submit;
+fruits <- c("apple", "banana", "cherry")
+for (x in fruits) {
+   print(x)
+}
+
+print('first statement after for loop')
+endsubmit;
+run;
+
 proc lua;
 submit;
 

client/testFixture/formatter/unformatted.sas

@@ -40,6 +40,15 @@ def my_function():
     print("Inside the proc step")
 endsubmit;
 run;
+proc rlang;
+submit;
+# Reference to variable defined in previous PROC RLANG call
+print(paste("x =", x))
+my_function <- function() {
+    print("Inside the proc step")
+}
+endsubmit;
+run;
 proc lua;
 submit;
 local dsid = sas.open("sashelp.company") -- open for input            
@@ -126,6 +135,17 @@ print('first statement after for loop')
 endinteractive;
 run;
 
+proc rlang;
+submit;
+fruits <- c("apple", "banana", "cherry")
+for (x in fruits) {
+   print(x)
+}
+
+print('first statement after for loop')
+endsubmit;
+run;
+
 proc lua;
 submit;
 

client/testFixture/sasnb_export.sas

@@ -19,6 +19,23 @@ print("Result: ", a*10 + b)
 endsubmit;
 run;
 
+/*
+## R Code
+
+This is some R code
+*/
+
+/*
+This is a separate note in **Markdown** format.
+*/
+
+proc rlang;
+submit;
+die <- 1:6
+paste("Die Maths: ", die[3]*4 + die[6])
+endsubmit;
+run;
+
 /*
 ## SAS Code
 */

package.json

@@ -1296,7 +1296,8 @@
         "embeddedLanguages": {
           "source.python": "python",
           "source.lua": "lua",
-          "source.sql": "sql"
+          "source.sql": "sql",
+          "source.r": "r"
         }
       }
     ],