Allow JSON to handle comments

CHANGES.md

@@ -6,6 +6,7 @@ New styles:
 
 Improvements:
 - fix(Elixir): improve regex for numbers
+- JSON: support for comments in JSON (#2016)
 
 ## Version 9.15.10
 New languages:

src/languages/json.js

@@ -1,11 +1,15 @@
 /*
-Language: JSON
+Language: JSON / JSON with Comments
 Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
 Category: common, protocols
 */
 
 function(hljs) {
   var LITERALS = {literal: 'true false null'};
+  var ALLOWED_COMMENTS = [
+    hljs.C_LINE_COMMENT_MODE,
+    hljs.C_BLOCK_COMMENT_MODE
+  ]
   var TYPES = [
     hljs.QUOTE_STRING_MODE,
     hljs.C_NUMBER_MODE
@@ -25,15 +29,18 @@ function(hljs) {
         illegal: '\\n',
       },
       hljs.inherit(VALUE_CONTAINER, {begin: /:/})
-    ],
+    ].concat(ALLOWED_COMMENTS),
     illegal: '\\S'
   };
   var ARRAY = {
     begin: '\\[', end: '\\]',
     contains: [hljs.inherit(VALUE_CONTAINER)], // inherit is a workaround for a bug that makes shared modes with endsWithParent compile only the ending of one of the parents
     illegal: '\\S'
   };
-  TYPES.splice(TYPES.length, 0, OBJECT, ARRAY);
+  TYPES.push(OBJECT, ARRAY);
+  ALLOWED_COMMENTS.forEach(function(rule) {
+    TYPES.push(rule)
+  })
   return {
     contains: TYPES,
     keywords: LITERALS,

test/markup/index.js

@@ -26,7 +26,7 @@ function testLanguage(language) {
 
           actual.trim().should.equal(expected.trim());
           done();
-        });
+        }).catch(function(err) { return done(err) });
       });
     });
   });

test/markup/json/comments.expect.txt

@@ -0,0 +1,18 @@
+<span class="hljs-comment">/* multi-line comment before */</span>
+[
+  {
+    <span class="hljs-attr">"title"</span>: <span class="hljs-string">"apples"</span>, <span class="hljs-comment">// yum</span>
+    <span class="hljs-attr">"count"</span>: [<span class="hljs-number">12000</span>, <span class="hljs-number">20000</span>], <span class="hljs-comment">/* so many? */</span>
+    <span class="hljs-attr">"description"</span>: {<span class="hljs-attr">"text"</span>: <span class="hljs-string">"..."</span>, <span class="hljs-attr">"sensitive"</span>: <span class="hljs-literal">false</span>}
+  },
+  {
+    <span class="hljs-attr">"title"</span>: <span class="hljs-string">"oranges"</span>,
+    <span class="hljs-attr">"count"</span>: [<span class="hljs-number">17500</span>, <span class="hljs-literal">null</span>],
+    <span class="hljs-attr">"description"</span>: {<span class="hljs-attr">"text"</span>: <span class="hljs-string">"..."</span>, <span class="hljs-attr">"sensitive"</span>: <span class="hljs-literal">false</span>}
+  }
+  <span class="hljs-comment">// {</span>
+  <span class="hljs-comment">//   "title" : "brocolli"</span>
+  <span class="hljs-comment">// }</span>
+]
+<span class="hljs-comment">/* multi-line
+comment after */</span>

test/markup/json/comments.txt

@@ -0,0 +1,18 @@
+/* multi-line comment before */
+[
+  {
+    "title": "apples", // yum
+    "count": [12000, 20000], /* so many? */
+    "description": {"text": "...", "sensitive": false}
+  },
+  {
+    "title": "oranges",
+    "count": [17500, null],
+    "description": {"text": "...", "sensitive": false}
+  }
+  // {
+  //   "title" : "brocolli"
+  // }
+]
+/* multi-line
+comment after */