syntax: treat elixirKernelFunction like elixirKeyword

* removes elixirKernelFunction * fixes elixir-editors#403

Author: jbodah

spec/indent/blocks_spec.rb

@@ -46,16 +46,6 @@ def name(param) do
  EOF
  end
 
- it 'guard in function' do
- expect(<<~EOF).to include_elixir_syntax('elixirKernelFunction', 'is_atom')
- defmodule M do
- def fun(a) when is_atom(a) do
- 1
- end
- end
- EOF
- end
-
  it 'does not consider do: as the start of a block' do
  expect(<<~EOF).to be_elixir_indentation
  def f do

spec/syntax/guard_spec.rb

@@ -18,27 +18,27 @@
 
 describe 'Guard syntax' do
  it 'guard in function' do
- expect(<<~EOF).to include_elixir_syntax('elixirKernelFunction', 'is_atom')
+ expect(<<~EOF).to include_elixir_syntax('elixirKeyword', 'is_atom')
  def fun(a) when is_atom(a), do:
  EOF
  end
 
  it 'guard in if' do
- expect(<<~EOF).to include_elixir_syntax('elixirKernelFunction', 'is_atom')
+ expect(<<~EOF).to include_elixir_syntax('elixirKeyword', 'is_atom')
  if is_atom(:atom), do: true
  EOF
  end
 
  it 'guard in case' do
- expect(<<~EOF).to include_elixir_syntax('elixirKernelFunction', 'is_atom')
+ expect(<<~EOF).to include_elixir_syntax('elixirKeyword', 'is_atom')
  case true do
  true when is_atom(:atom) -> true
  end
  EOF
  end
 
  it 'guard in case (multiline)' do
- expect(<<~EOF).to include_elixir_syntax('elixirKernelFunction', 'is_atom')
+ expect(<<~EOF).to include_elixir_syntax('elixirKeyword', 'is_atom')
  case true do
  true when is_boolean(true) and
  is_atom(:atom) -> true

spec/syntax/kernel_function_spec.rb

@@ -4,21 +4,21 @@
 
 describe 'Kernel function syntax' do
  it 'kernel function used as an atom key in a keyword list outside of a block' do
- expect(<<~EOF).not_to include_elixir_syntax('elixirKernelFunction', 'length')
+ expect(<<~EOF).not_to include_elixir_syntax('elixirKeyword', 'length')
  do
  plug Plug.Parsers, length: 400_000_000
  end
  EOF
  end
 
  it 'kernel function used as an atom key in a keyword list contained in a block' do
- expect(<<~EOF).not_to include_elixir_syntax('elixirKernelFunction', 'length')
+ expect(<<~EOF).not_to include_elixir_syntax('elixirKeyword', 'length')
  plug Plug.Parsers, length: 400_000_000
  EOF
  end
 
  it 'kernel function used as a guard' do
- expect(<<~'EOF').to include_elixir_syntax('elixirKernelFunction', 'length')
+ expect(<<~'EOF').to include_elixir_syntax('elixirKeyword', 'length')
  def hello(name) when length(name) > 20 do
  IO.puts "hello #{name}, you big boy"
  end

spec/syntax/keyword_spec.rb

@@ -14,4 +14,18 @@
  case true do
  EOF
  end
+
+ it 'length' do
+ expect(<<~EOF).not_to include_elixir_syntax('elixirKeyword', 'length')
+ assert String.length(captured) > 0
+ EOF
+
+ expect(<<~EOF).not_to include_elixir_syntax('elixirKeyword', 'size')
+ assert String.size(captured) > 0
+ EOF
+
+ expect(<<~EOF).to include_elixir_syntax('elixirKeyword', 'length')
+ assert length(captured) > 0
+ EOF
+ end
 end

syntax/elixir.vim

@@ -16,18 +16,9 @@ syn cluster elixirDeclaration contains=elixirFunctionDeclaration,elixirModuleDec
 syn match elixirComment '#.*' contains=elixirTodo,@Spell
 syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
 
-syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>' contains=elixirUnusedVariable,elixirKernelFunction
+syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>' contains=elixirUnusedVariable
 
-syn match elixirKeyword '\(\.\)\@<!\<\(for\|case\|when\|with\|cond\|if\|unless\|try\|receive\|send\)\>'
-syn match elixirKeyword '\(\.\)\@<!\<\(exit\|raise\|throw\|after\|rescue\|catch\|else\)\>'
-syn match elixirKeyword '\(\.\)\@<!\<\(quote\|unquote\|super\|spawn\|spawn_link\|spawn_monitor\)\>'
-
-" Kernel functions
-syn keyword elixirKernelFunction contained is_atom is_binary is_bitstring is_boolean is_float
-syn keyword elixirKernelFunction contained is_function is_integer is_list is_map is_nil
-syn keyword elixirKernelFunction contained is_number is_pid is_port is_reference is_tuple
-syn keyword elixirKernelFunction contained abs binary_part bit_size byte_size div elem hd length
-syn keyword elixirKernelFunction contained map_size node rem round tl trunc tuple_size
+syn match elixirKeyword '\(\.\)\@<!\<\(for\|case\|when\|with\|cond\|if\|unless\|try\|receive\|send\|exit\|raise\|throw\|after\|rescue\|catch\|else\|quote\|unquote\|super\|spawn\|spawn_link\|spawn_monitor\|is_atom\|is_binary\|is_bitstring\|is_boolean\|is_float\|is_function\|is_integer\|is_list\|is_map\|is_nil\|is_number\|is_pid\|is_port\|is_reference\|is_tuple\|abs\|binary_part\|bit_size\|byte_size\|div\|elem\|hd\|length\|map_size\|node\|rem\|round\|tl\|trunc\|tuple_size\)\>'
 
 syn keyword elixirInclude import require alias use
 
@@ -86,14 +77,14 @@ syn region elixirString matchgroup=elixirStringDelimiter start=+\z('\)+ end=+
 syn region elixirString matchgroup=elixirStringDelimiter start=+\z("\)+ end=+\z1+ skip=+\\\\\|\\\z1+ contains=@Spell,@elixirStringContained
 syn region elixirString matchgroup=elixirStringDelimiter start=+\z('''\)+ end=+^\s*\z1+ contains=@Spell,@elixirStringContained
 syn region elixirString matchgroup=elixirStringDelimiter start=+\z("""\)+ end=+^\s*\z1+ contains=@Spell,@elixirStringContained
-syn region elixirInterpolation matchgroup=elixirInterpolationDelimiter start="#{" end="}" contained contains=ALLBUT,elixirKernelFunction,elixirComment,@elixirNotTop
+syn region elixirInterpolation matchgroup=elixirInterpolationDelimiter start="#{" end="}" contained contains=ALLBUT,elixirComment,@elixirNotTop
 
 syn match elixirAtomInterpolated ':\("\)\@=' contains=elixirString
 syn match elixirString "\(\w\)\@<!?\%(\\\(x\d{1,2}\|\h{1,2}\h\@!\>\|0[0-7]{0,2}[0-7]\@!\>\|[^x0MC]\)\|(\\[MC]-)+\w\|[^\s\\]\)"
 
-syn region elixirBlock matchgroup=elixirBlockDefinition start="\<do\>:\@!" end="\<end\>" contains=ALLBUT,elixirKernelFunction,@elixirNotTop fold
-syn region elixirElseBlock matchgroup=elixirBlockDefinition start="\<else\>:\@!" end="\<end\>" contains=ALLBUT,elixirKernelFunction,@elixirNotTop fold
-syn region elixirAnonymousFunction matchgroup=elixirBlockDefinition start="\<fn\>" end="\<end\>" contains=ALLBUT,elixirKernelFunction,@elixirNotTop fold
+syn region elixirBlock matchgroup=elixirBlockDefinition start="\<do\>:\@!" end="\<end\>" contains=ALLBUT,@elixirNotTop fold
+syn region elixirElseBlock matchgroup=elixirBlockDefinition start="\<else\>:\@!" end="\<end\>" contains=ALLBUT,@elixirNotTop fold
+syn region elixirAnonymousFunction matchgroup=elixirBlockDefinition start="\<fn\>" end="\<end\>" contains=ALLBUT,@elixirNotTop fold
 
 syn region elixirArguments start="(" end=")" contained contains=elixirOperator,elixirAtom,elixirPseudoVariable,elixirAlias,elixirBoolean,elixirVariable,elixirUnusedVariable,elixirNumber,elixirDocString,elixirAtomInterpolated,elixirRegex,elixirString,elixirStringDelimiter,elixirRegexDelimiter,elixirInterpolationDelimiter,elixirSigil,elixirAnonymousFunction
 
@@ -200,7 +191,6 @@ hi def link elixirComment Comment
 hi def link elixirTodo Todo
 hi def link elixirKeyword Define
 hi def link elixirExUnitAssert Keyword
-hi def link elixirKernelFunction Define
 hi def link elixirOperator Operator
 hi def link elixirAtom Constant
 hi def link elixirPseudoVariable Constant