Merge pull request #5 from fram-lang/comments

Update syntax highlighting of Fram comments

Author: ppolesiuk

js/highlight-fram.js

@@ -1,4 +1,18 @@
 hljs.registerLanguage("fram", function (hljs) {
+  // Based on `hljs.END_SAME_AS_BEGIN`, which is included with highlight.js.
+  // Here we only require that the opening match group is a suffix of the
+  // closing one. Used for Fram comments.
+  function MATCH_BEGIN_END(mode) {
+    return Object.assign(mode,
+      { 'on:begin': (m, resp) =>
+          { resp.data._beginMatch = m[1]; },
+        'on:end':   (m, resp) =>
+          { if (!m[1].endsWith(resp.data._beginMatch)) resp.ignoreMatch(); }
+      });
+  }
+
+  const COMMENT_NAME = "([\\w'<>&$?!@^+\\-~*%;,=|:./#]*)";
+
   return {
     keywords: {
       keyword:
@@ -10,11 +24,11 @@ hljs.registerLanguage("fram", function (hljs) {
     contains: [
       hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
-      hljs.C_LINE_COMMENT_MODE,
-      hljs.COMMENT("\\(\\*", "\\*\\)"),
+      hljs.HASH_COMMENT_MODE,
+      MATCH_BEGIN_END(hljs.COMMENT("{#" + COMMENT_NAME, COMMENT_NAME + "#}")),
       {
         className: "type",
-        begin: "\\b[A-Z]\\w*",
+        begin: "\\b[A-Z][\\w']*",
       },
       {
         className: "number",