Merge pull request #896 from MMesch/npmjsorg

update ihaskell labextension version + Haskell-r syntax highlighting

ihaskell_labextension/package.json

 {
   "name": "ihaskell_jupyterlab",
-  "version": "0.0.2",
+  "version": "0.0.6",
   "description": "adds ihaskell syntax highlighting to jupyterlab",
   "keywords": [
     "jupyter",
@@ -30,11 +30,11 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^0.16.1",
-    "@jupyterlab/apputils": "^0.16.2",
-    "@jupyterlab/docregistry": "^0.16.1",
-    "@jupyterlab/notebook": "^0.16.1",
-    "@jupyterlab/services": "^2.0.1",
+    "@jupyterlab/application": "^0.17.1",
+    "@jupyterlab/apputils": "^0.17.2",
+    "@jupyterlab/docregistry": "^0.17.1",
+    "@jupyterlab/notebook": "^0.17.1",
+    "@jupyterlab/services": "^3.0.1",
     "@phosphor/disposable": "^1.1.2"
   },
   "devDependencies": {

ihaskell_labextension/src/codemirror-ihaskell.ts

@@ -5,15 +5,20 @@ import 'codemirror/mode/haskell/haskell';
 
 CodeMirror.defineMode("ihaskell", (config) => {
   let hmode = CodeMirror.getMode(config, "haskell");
-    return CodeMirror.multiplexingMode(
-        hmode,
-        {
-           open: /:(?=!)/, // Matches : followed by !, but doesn't consume !
-           close: /^(?!!)/, // Matches start of line not followed by !, doesn't consume character
-           mode: CodeMirror.getMode(config, "text/plain"),
-           delimStyle: "delimit"
-        }
-        );
+  return CodeMirror.multiplexingMode(
+    hmode,
+    {
+      open: /:(?=!)/, // Matches : followed by !, but doesn't consume !
+      close: /^(?!!)/, // Matches start of line not followed by !, doesn't consume character
+      mode: CodeMirror.getMode(config, "text/plain"),
+      delimStyle: "delimit"
+    },
+    {
+      open: /\[r\||\[rprint\||\[rgraph\|/,
+      close: /\|\]/ ,
+      mode: CodeMirror.getMode(config, "text/x-rsrc"),
+      delimStyle: "delimit"}
+  );
 });
 
 CodeMirror.defineMIME("text/x-ihaskell", "ihaskell");