Improve Elixir highlighting

Changes:
- fix atoms with underscores highlighting
- distinct docstrings and attributes
- proper tests highlighting
- jsf file now has TODO section
- disable linums option in ftyperc (it's always
  disabled for other modes)
This commit is contained in:
Andrew Lisin 2015-01-22 22:57:40 +06:00
parent 319a6ebeee
commit 94698a1568
2 changed files with 29 additions and 13 deletions

View File

@ -2,6 +2,15 @@
# Written by Andrey Lisin (at gmail.com) # Written by Andrey Lisin (at gmail.com)
# TODO
# - test attributes and docstrings highlighting
# - maybe highlight arithmetical operations
# - comprehensions highlighting
# Changes
# - fix atom with underscore highlighting
# - distinct docstrings and module attributes
=Idle =Idle
=Comment fg_030 =Comment fg_030
=Keyword bold =Keyword bold
@ -10,6 +19,7 @@
=Extrapolation fg_200 bold =Extrapolation fg_200 bold
=Atom fg_530 =Atom fg_530
=Attribute fg_505 =Attribute fg_505
=ModAttr fg_141
=Brace fg_440 =Brace fg_440
=Brack fg_311 =Brack fg_311
=Int fg_033 =Int fg_033
@ -26,7 +36,7 @@
"'" single_quoted recolor=-1 "'" single_quoted recolor=-1
"\"" double_quoted recolor=-1 "\"" double_quoted recolor=-1
":" atom recolor=-1 ":" atom recolor=-1
"@" is_edoc noeat "@" modattr recolor=-1
"[]" brack recolor=-1 "[]" brack recolor=-1
"{}" brace recolor=-1 "{}" brace recolor=-1
"|" maybe_pipe "|" maybe_pipe
@ -57,20 +67,25 @@
:atom Atom :atom Atom
* idle noeat * idle noeat
"a-zA-Z0-9" atom "a-zA-Z0-9_" atom
:is_edoc Comment :modattr ModAttr
* is_edoc * idle
"\"" string_dq_1 "a-zA-Z0-9_" modattr
"\n" idle " " maybe_edoc
:string_dq_1 Comment :maybe_edoc Idle
* is_edoc * idle
" " maybe_edoc
"\"" string_dq_1 recolor=-1
:string_dq_1 String
* double_quoted recolor=-1
"\"" string_dq_2 "\"" string_dq_2
:string_dq_2 Comment :string_dq_2 Comment
* is_edoc * idle
"\"" docstr_dq "\"" docstr_dq recolor=-3
:docstr_dq Comment :docstr_dq Comment
* docstr_dq * docstr_dq
@ -84,6 +99,8 @@
* docstr_dq * docstr_dq
"\"" idle "\"" idle
:brace Brace :brace Brace
* idle noeat * idle noeat
@ -139,6 +156,7 @@
"defcallback" start_def "defcallback" start_def
"import" start_mod_def "import" start_mod_def
"require" start_mod_def "require" start_mod_def
"test" start_def
"use" start_mod_def "use" start_mod_def
"alias" start_mod_def "alias" start_mod_def
"end" kw "end" kw
@ -241,4 +259,4 @@ done
:moddef ModDef :moddef ModDef
* moddef * moddef
" " idle recolor=-1 " " idle recolor=-1
"\n" idle "\n" idle

View File

@ -1016,11 +1016,9 @@
-syntax elixir -syntax elixir
-pound_comment -pound_comment
-text_delimiters do=end -text_delimiters do=end
-linums
*.exs *.exs
-autoindent -autoindent
-syntax elixir -syntax elixir
-pound_comment -pound_comment
-text_delimiters do=end -text_delimiters do=end
-linums