enh(haskell) Add support for NumericalUnderscores

highlightjs · Apr 19, 2021 · b3f881e · b3f881e
1 parent e2151e3
commit b3f881e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -79,6 +79,7 @@ Grammars:
 - enh(parser) highlight object properties (#3072) [Josh Goebel][]
 - enh(javascript/typescript) highlight object properties (#3072) [Josh Goebel][]
 - enh(haskell) add support for BinaryLiterals (#3150) [Martijn Bastiaan][]
+- enh(haskell) add support for NumericalUnderscores (#3150) [Martijn Bastiaan][]
 
 New Languages:
 

diff --git a/src/languages/haskell.js b/src/languages/haskell.js
@@ -154,11 +154,16 @@ export default function(hljs) {
       PREPROCESSOR,
 
       // Literals and names.
+      hljs.inherit(hljs.BINARY_NUMBER_MODE, {
+        begin: '\\b(0b[01_]+)'
+      }),
+
+      hljs.inherit(hljs.C_NUMBER_MODE, {
+        begin: '(-?)(\\b0[xX][a-fA-F0-9_]+|(\\b(\\d|_)+(\\.(\\d|_)*)?|\\.(\\d|_)+)([eE][-+]?(\\d|_)+)?)'
+      }),
 
       // TODO: characters.
       hljs.QUOTE_STRING_MODE,
-      hljs.C_NUMBER_MODE,
-      hljs.BINARY_NUMBER_MODE,
       CONSTRUCTOR,
       hljs.inherit(hljs.TITLE_MODE, {
         begin: '^[_a-z][\\w\']*'

diff --git a/test/markup/haskell/numbers.expect.txt b/test/markup/haskell/numbers.expect.txt
@@ -0,0 +1,3 @@
+<span class="hljs-number">0b001_001</span>
+<span class="hljs-number">0x000_0FF</span>
+<span class="hljs-number">132_15</span>
diff --git a/test/markup/haskell/numbers.txt b/test/markup/haskell/numbers.txt
@@ -0,0 +1,3 @@
+0b001_001
+0x000_0FF
+132_15