Skip to content

Commit

Permalink
Add defdelegate to Elixir and fix keyword test
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewlehner committed Jan 10, 2021
1 parent bd266a7 commit 92d784e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 3 additions & 2 deletions components/prism-elixir.js
Expand Up @@ -55,7 +55,7 @@ Prism.languages.elixir = {
alias: 'variable'
},
'number': /\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,
'keyword': /\b(?:after|alias|and|case|catch|cond|def(?:callback|exception|impl|module|p|protocol|struct)?|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
'keyword': /\b(?:after|alias|and|case|catch|cond|def(?:callback|exception|impl|module|p|protocol|struct|delegate)?|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
'boolean': /\b(?:true|false|nil)\b/,
'operator': [
/\bin\b|&&?|\|[|>]?|\\\\|::|\.\.\.?|\+\+?|-[->]?|<[-=>]|>=|!==?|\B!|=(?:==?|[>~])?|[*\/^]/,
Expand All @@ -77,10 +77,11 @@ Prism.languages.insertBefore('elixir', 'keyword', {
'module': {
pattern: /\b(defmodule\s)[A-Z][\w.\\]+/,
lookbehind: true,
alias: 'class-name'
},
'function': {
pattern: /\b(defp?\s)[\w.\\]+/,
lookbehind: true,
lookbehind: true
}
});

Expand Down
10 changes: 7 additions & 3 deletions tests/languages/elixir/keyword_feature.test
Expand Up @@ -3,7 +3,9 @@ catch cond def
defcallback
defexception
defimpl defmodule
defp defprotocol
defp
defprotocol
defdelegate
defstruct do else
end fn for if
import not or
Expand All @@ -18,7 +20,9 @@ unless use when
["keyword", "defcallback"],
["keyword", "defexception"],
["keyword", "defimpl"], ["keyword", "defmodule"],
["keyword", "defp"], ["keyword", "defprotocol"],
["keyword", "defp"],
["keyword", "defprotocol"],
["keyword", "defdelegate"],
["keyword", "defstruct"], ["keyword", "do"], ["keyword", "else"],
["keyword", "end"], ["keyword", "fn"], ["keyword", "for"], ["keyword", "if"],
["keyword", "import"], ["keyword", "not"], ["keyword", "or"],
Expand All @@ -28,4 +32,4 @@ unless use when

----------------------------------------------------

Checks for all keywords.
Checks for all keywords.

0 comments on commit 92d784e

Please sign in to comment.