Refine CM / hljs highlighting

Author: ryyppy

plugins/cm-rescript-mode.js

@@ -7,6 +7,7 @@
 import "codemirror/addon/mode/simple";
 import CodeMirror from "codemirror/lib/codemirror";
 
+
 CodeMirror.defineSimpleMode("rescript", {
   start: [
     // string and byte string
@@ -35,22 +36,18 @@ CodeMirror.defineSimpleMode("rescript", {
       token: ["keyword", "keyword2", null, "def"]
     },
     {
-      regex: /(?:switch|module|as|else|external|for|if|in|mod|ref|type|while|open|open\!)\b/,
+      regex: /(?:and|as|assert|catch|constraint|downto|else|exception|export|external|false|for|if|import|in|include|lazy|let|module|mutable|of|open|private|switch|to|true|try|type|when|while|with\!)\b/,
       token: "keyword"
     },
     {
-      regex: /(?:rec)\b/,
+      regex: /(?:rec|list)\b/,
       token: "keyword2"
     },
     {
       regex: /\b(?:char|bool|option|int|string)\b/,
       token: "atom"
     },
     { regex: /\b(?:true|false)\b/, token: "builtin" },
-    {
-      regex: /\b(fun)(\s+)([a-zA-Z_\|][a-zA-Z0-9_]*)/,
-      token: ["keyword", null, "def"]
-    },
     {
       regex: /\b([A-Z][a-zA-Z0-9_]*)(\.)/,
       token: ["module", null]
@@ -86,6 +83,10 @@ CodeMirror.defineSimpleMode("rescript", {
     //{ regex: /"#+/, token: "string", next: "start" },
     //{ regex: /(?:[^"]|"(?!#))*/, token: "string" }
   //],
+  list: [
+    { regex: /list{/, token: "keyword2", next: "start" },
+    { regex: /[^`]*/, token: "string" }
+  ],
   string_interpolation: [
     { regex: /`/, token: "string", next: "start" },
     { regex: /[^`]*/, token: "string" }

plugins/res-syntax-highlightjs.js renamed to plugins/rescript-highlightjs.js

@@ -1,7 +1,7 @@
 /*
-Language: New BS Syntax
-Author: Gidi Meir Morris <[email protected]>, Cheng Lou
-Category: functional
+Language: ReScript
+Author: Gidi Meir Morris <[email protected]>, Cheng Lou, Patrick Ecker
+Category: common
 */
 
 // Note: Extracted and adapted from the reason-highlightjs package:
@@ -25,19 +25,14 @@ module.exports = function(hljs) {
   var RE_MODULE_IDENT = '[A-Z_][0-9a-zA-Z_]*';
 
   var KEYWORDS = {
-    /* https://github.com/facebook/reason/blob/79e67d5334ef181fdb54bd57bd9e7729f9fe46e7/src/reason-parser/reason_lexer.mll#L94-L154 */
+    // See: https://github.com/rescript-lang/syntax/blob/4872b983eb023f78a972063eb367339e6897bf16/src/res_token.ml#L166
     keyword:
-      'and as assert begin class constraint done downto exception external fun ' +
-      'functor include inherit lazy let pub mutable new nonrec ' +
-      'object of open or pri rec then to type val virtual ' +
-      'try catch finally do else for if switch while import library export ' +
-      'module in raise ' +
-      // invalid
-      'private',
-
+      'and as assert catch constraint downto else exception export external false for' +
+      'if import in include lazy let module mutable of open private rec switch' +
+      'to true try type when while with',
     // not reliable
-    // built_in:
-    //   'array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit',
+     //built_in:
+       //'array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit',
     literal:
       'true false'
   };
@@ -119,13 +114,13 @@ module.exports = function(hljs) {
     className: 'literal',
     variants: [
       {
-        begin: 'list\\[',
+        begin: 'list\\{',
       },
       {
-        begin: '\\[',
+        begin: '\\{',
       },
       {
-        begin: '\\]',
+        begin: '\\}',
       },
     ]
   };

src/common/App.js

@@ -11,15 +11,15 @@
   let js = require('highlight.js/lib/languages/javascript');
   let ocaml = require('highlight.js/lib/languages/ocaml');
   let reason = require('plugins/reason-highlightjs');
-  let res = require('plugins/res-syntax-highlightjs');
+  let rescript = require('plugins/rescript-highlightjs');
   let bash = require('highlight.js/lib/languages/bash');
   let json = require('highlight.js/lib/languages/json');
   let html = require('highlight.js/lib/languages/xml');
   let text = require('highlight.js/lib/languages/plaintext');
   let diff = require('highlight.js/lib/languages/diff');
 
   hljs.registerLanguage('reason', reason);
-  hljs.registerLanguage('res', res);
+  hljs.registerLanguage('rescript', rescript);
   hljs.registerLanguage('javascript', js);
   hljs.registerLanguage('ts', js);
   hljs.registerLanguage('ocaml', ocaml);

src/common/App.res

@@ -100,7 +100,7 @@
 }
 
 .cm-s-material .cm-builtin {
-  color: #FFCB6B;
+  @apply text-orange-dark;
 }
 
 .cm-s-material .cm-decorator {