fix(clj) Fix broken/inconsistent highlighting for $, Numbers, namespaced maps, HINT mode. Add charachter, regex and punctuation modes.

src/languages/clojure.js

@@ -8,8 +8,8 @@ Category: lisp
 
 /** @type LanguageFn */
 export default function(hljs) {
-  const SYMBOLSTART = 'a-zA-Z_\\-!.?+*=<>&#\'';
-  const SYMBOL_RE = '[' + SYMBOLSTART + '][' + SYMBOLSTART + '0-9/;:]*';
+  const SYMBOLSTART = 'a-zA-Z_\\-!.?+*=<>&\'';
+  const SYMBOL_RE = '[' + SYMBOLSTART + '][' + SYMBOLSTART + '0-9/;:$]*';
   const globals = 'def defonce defprotocol defstruct defmulti defmethod defn- defn defmacro deftype defrecord';
   const keywords = {
     $pattern: SYMBOL_RE,
@@ -45,15 +45,15 @@ export default function(hljs) {
       'lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize'
   };
 
-  const SIMPLE_NUMBER_RE = '[-+]?\\d+(\\.\\d+)?';
+  const NUMBER_RE = /[-+]?(((0[xX][0-9a-fA-F]+|0[0-7]+|[1-9][0-9]?[rR][0-9a-zA-Z]+)N?)|[0-9]+(\/[0-9]+|N|((\.[0-9]*)?([eE][+-]?[0-9]+)?M?)))/
 
   const SYMBOL = {
     begin: SYMBOL_RE,
     relevance: 0
   };
   const NUMBER = {
-    className: 'number',
-    begin: SIMPLE_NUMBER_RE,
+    scope: 'number',
+    match: NUMBER_RE,
     relevance: 0
   };
   const STRING = hljs.inherit(hljs.QUOTE_STRING_MODE, {

test/markup/clojure/number.expect.txt

@@ -0,0 +1,50 @@
+<span class="hljs-comment">; integer</span>
+<span class="hljs-number">00</span>
+<span class="hljs-number">42</span>
+
+<span class="hljs-comment">; BigInt</span>
+<span class="hljs-number">42N</span>
+<span class="hljs-number">0N</span>
+
+<span class="hljs-comment">; octal</span>
+<span class="hljs-number">052</span>
+<span class="hljs-number">00N</span>
+
+<span class="hljs-comment">; hex</span>
+<span class="hljs-number">0x2a</span>
+<span class="hljs-number">0x0N</span>
+
+<span class="hljs-comment">; radix</span>
+<span class="hljs-number">2r101010</span>
+<span class="hljs-number">8r52</span>
+<span class="hljs-number">16r2a</span>
+<span class="hljs-number">36r16</span>
+
+<span class="hljs-comment">; radix BigInt</span>
+<span class="hljs-number">2r101010N</span>
+<span class="hljs-number">8r52N</span>
+<span class="hljs-number">16r2aN</span>
+<span class="hljs-number">36r16N</span>
+
+<span class="hljs-comment">;; ratios</span>
+<span class="hljs-number">1/2</span>
+<span class="hljs-number">-1/2</span>
+
+<span class="hljs-comment">;; floats</span>
+<span class="hljs-number">42.0</span>
+<span class="hljs-number">-42.0</span>
+<span class="hljs-number">42.</span>
+
+<span class="hljs-comment">; BigDecimal</span>
+<span class="hljs-number">42.0M</span>
+<span class="hljs-number">-42M</span>
+<span class="hljs-number">42.M</span>
+<span class="hljs-number">42M</span>
+
+<span class="hljs-comment">; with Exponent</span>
+<span class="hljs-number">42.0E2</span>
+<span class="hljs-number">-42.0E+9</span>
+<span class="hljs-number">42E-0</span>
+
+<span class="hljs-number">42.0E2M</span>
+<span class="hljs-number">42E+9M</span>

test/markup/clojure/number.txt

@@ -0,0 +1,50 @@
+; integer
+00
+42
+
+; BigInt
+42N
+0N
+
+; octal
+052
+00N
+
+; hex
+0x2a
+0x0N
+
+; radix
+2r101010
+8r52
+16r2a
+36r16
+
+; radix BigInt
+2r101010N
+8r52N
+16r2aN
+36r16N
+
+;; ratios
+1/2
+-1/2
+
+;; floats
+42.0
+-42.0
+42.
+
+; BigDecimal
+42.0M
+-42M
+42.M
+42M
+
+; with Exponent
+42.0E2
+-42.0E+9
+42E-0
+
+42.0E2M
+42E+9M

test/markup/clojure/symbols-numbers.expect.txt

@@ -1 +1,4 @@
 (<span class="hljs-keyword">def</span> <span class="hljs-title">+x</span> [(<span class="hljs-name">a</span> <span class="hljs-number">1</span>) <span class="hljs-number">+2</span> <span class="hljs-number">-3.0</span> y-5])
+(<span class="hljs-name">System/getProperty</span> <span class="hljs-string">&quot;java.vm.version&quot;</span>)
+(<span class="hljs-name">.getEnclosingClass</span> java.util.Map$Entry)
+(<span class="hljs-name">java.util.Map$Entry.</span> .getEnclosingClass)

test/markup/clojure/symbols-numbers.txt

@@ -1 +1,4 @@
 (def +x [(a 1) +2 -3.0 y-5])
+(System/getProperty "java.vm.version")
+(.getEnclosingClass java.util.Map$Entry)
+(java.util.Map$Entry. .getEnclosingClass)