lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/scad_highlight_rules.js in gollum-3.1.2 vs lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/scad_highlight_rules.js in gollum-3.1.3

@@ -53,11 +53,10 @@
                 regex : "\\/\\/.*$"
             },
             DocCommentHighlightRules.getStartRule("start"),
             {
                 token : "comment", // multi line comment
-                merge : true,
                 regex : "\\/\\*",
                 next : "comment"
             }, {
                 token : "string", // single line
                 regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
@@ -106,32 +105,29 @@
                 token : "comment", // closing comment
                 regex : ".*?\\*\\/",
                 next : "start"
             }, {
                 token : "comment", // comment spanning whole line
-                merge : true,
                 regex : ".+"
             }
         ],
         "qqstring" : [
             {
                 token : "string",
                 regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
                 next : "start"
             }, {
                 token : "string",
-                merge : true,
                 regex : '.+'
             }
         ],
         "qstring" : [
             {
                 token : "string",
                 regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
                 next : "start"
             }, {
                 token : "string",
-                merge : true,
                 regex : '.+'
             }
         ]
     };