updating references to "rlang" as a language to "r" to work better with VS Code's language server

Author: Wizzzzzzard

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", "rlang"];
+  readonly supportedLanguages = ["sas", "sql", "python", "r"];
 
   private readonly _controller: vscode.NotebookController;
   private _executionOrder = 0;

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

@@ -28,7 +28,7 @@ import { includeLogInNotebookExport } from "../../utils/settings";
 const templatesDir = path.resolve(__dirname, "../notebook/exporters/templates");
 
 hljs.registerLanguage("python", python);
-hljs.registerLanguage("rlang", r);
+hljs.registerLanguage("r", r);
 hljs.registerLanguage("sql", sql);
 
 export const exportToHTML = async (

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

@@ -15,6 +15,8 @@ const exportCell = (cell: NotebookCell) => {
       return text;
     case "python":
       return wrapPython(text);
+    case "r":
+      return wrapRlang(text);
     case "rlang":
       return wrapRlang(text);
     case "sql":

client/src/components/utils/SASCodeDocument.ts

@@ -206,7 +206,7 @@ ${code}`;
       wrapped = this.wrapPython(wrapped);
     }
 
-    if (this.parameters.languageId === "rlang") {
+    if (this.parameters.languageId === "r" || this.parameters.languageId === "rlang") {
       wrapped = this.wrapRlang(wrapped);
     }
 

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

@@ -40,7 +40,7 @@ run;
 
   it("wrap rlang code", () => {
     const parameters: SASCodeDocumentParameters = {
-      languageId: "rlang",
+      languageId: "r",
       code: `for (x in 1:6) {
   print(x)
 }