Added import mode to Elixir

Relates to p.3 from highlightjs#730
Sannis · Sep 8, 2015 · 19d0e6c · 19d0e6c
1 parent ccabd51
commit 19d0e6c
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 14 deletions.
diff --git a/src/languages/elixir.js b/src/languages/elixir.js
@@ -44,34 +44,65 @@ function(hljs) {
     className: 'class',
     beginKeywords: 'defmodule defrecord', end: /\bdo\b|$|;/
   });
-  var ELIXIR_DEFAULT_CONTAINS = [
-    STRING,
-    hljs.HASH_COMMENT_MODE,
-    CLASS,
-    FUNCTION,
+
+  var ELIXIR_NUMBER = {
+    className: 'number',
+    begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
+    relevance: 0
+  };
+
+  var ELIXIR_SYMBOL_MODES = [
     {
       className: 'symbol',
-      begin: ':',
-      contains: [STRING, {begin: ELIXIR_METHOD_RE}],
+      begin: ELIXIR_IDENT_RE + ':',
       relevance: 0
     },
     {
       className: 'symbol',
-      begin: ELIXIR_IDENT_RE + ':',
+      begin: ':' + ELIXIR_IDENT_RE,
       relevance: 0
     },
     {
-      className: 'number',
-      begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
+      className: 'symbol',
+      begin: ':',
+      contains: [STRING, {begin: ELIXIR_METHOD_RE}],
       relevance: 0
-    },
+    }
+  ];
+
+  var ELIXIR_DEFAULT_CONTAINS = [
+    STRING,
+    hljs.HASH_COMMENT_MODE,
+    CLASS,
+    FUNCTION
+  ].concat(ELIXIR_SYMBOL_MODES).concat([
+    ELIXIR_NUMBER,
     {
       className: 'variable',
       begin: '(\\$\\W)|((\\$|\\@\\@?)(\\w+))'
     },
     {
       begin: '->'
     },
+    // import
+    {
+      beginKeywords: 'import', end: '$',
+      contains: ELIXIR_SYMBOL_MODES.concat([
+        {
+          begin: ELIXIR_IDENT_RE,
+          relevance: 0
+        },
+        // functions list
+        {
+          begin: '\\[', end: '\\]',
+          contains: [
+            ELIXIR_NUMBER
+          ],
+          relevance: 0
+        }
+      ]),
+      relevance: 0
+    },
     { // regexp container
       begin: '(' + hljs.RE_STARTERS_RE + ')\\s*',
       contains: [
@@ -92,7 +123,7 @@ function(hljs) {
       ],
       relevance: 0
     }
-  ];
+  ]);
   SUBST.contains = ELIXIR_DEFAULT_CONTAINS;
 
   return {

diff --git a/src/languages/haskell.js b/src/languages/haskell.js
@@ -71,8 +71,8 @@ function(hljs) {
       },
       {
         className: 'import',
-        begin: '\\bimport\\b', end: '$',
-        keywords: 'import|0 qualified as hiding',
+        beginKeywords: 'import', end: '$',
+        keywords: 'qualified as hiding',
         contains: [LIST].concat(COMMENT_MODES),
         illegal: '\\W\\.|;'
       },

diff --git a/test/detect/elixir/default.txt b/test/detect/elixir/default.txt
@@ -1,3 +1,5 @@
+import Kernel, except: [spawn: 1, +: 2, /: 2, Unless: 2]
+
 defrecord Person, first_name: nil, last_name: "Dudington" do
   def name record do # huh ?
     "#{record.first_name} #{record.last_name}"

diff --git a/test/markup/elixir/import-function-with-slash.except.txt b/test/markup/elixir/import-function-with-slash.except.txt
@@ -0,0 +1 @@
+<span class="hljs-keyword">import</span> Kernel, <span class="hljs-symbol">except:</span> [spawn: <span class="hljs-number">1</span>, +: <span class="hljs-number">2</span>, /: <span class="hljs-number">2</span>, Unless: <span class="hljs-number">2</span>]
diff --git a/test/markup/elixir/import-function-with-slash.txt b/test/markup/elixir/import-function-with-slash.txt
@@ -0,0 +1 @@
+import Kernel, except: [spawn: 1, +: 2, /: 2, Unless: 2]