Skip to content

Couple of improvements and fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 21, 2019
Merged

Couple of improvements and fixes #2

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29899c4
Elixir: also apply syntax to files with elixirc and iex in hashbang.
azizk Mar 19, 2019
47b1f89
Elixir: fix: module names can only have ASCII letters.
azizk Mar 19, 2019
099085a
Elixir: fix: don't highlight as module name if used as map/kwlist key.
azizk Mar 19, 2019
7dd0671
Elixir: reduce regex length by grouping is_* function names.
azizk Mar 19, 2019
0110e18
Elixir: fix: atoms can also begin with a Unicode character or undersc…
azizk Mar 19, 2019
781e17f
Elixir: fix: function names can begin with a Unicode character or und…
azizk Mar 19, 2019
94e8dd9
Elixir: added id_begin variable; fixed matching function names.
azizk Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Elixir.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ name: Elixir
file_extensions:
- ex
- exs
first_line_match: ^#!/.*\belixir
first_line_match: ^#!/.*\b(?:elixirc?|iex)
scope: source.elixir

variables:
module_name: '\b[A-Z]\w*\b'
module_name: '\b[A-Z][a-zA-Z0-9_]*\b'
Copy link
Collaborator

@princemaple princemaple Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\w is exactly that

iex(3)> "0" =~ ~r/\w/
true

Copy link
Collaborator Author

@azizk azizk Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not quite, because it also matches Unicode characters like "á". The compiler rejects those and only allows ASCII characters in module names. "\w" is a nice shorthand but it does more than ASCII letters.

Copy link
Collaborator

@princemaple princemaple Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

id_begin: '[[:alpha:]_]'

contexts:
main:
Expand Down Expand Up @@ -59,7 +60,7 @@ contexts:
- match: ',|\)|$'
pop: true
- include: main
- match: \b(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_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\b
- match: \b(is_(?:atom|binary|bitstring|boolean|float|function|integer|list|map|nil|number|pid|port|record|reference|tuple|exception)|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\b
Copy link
Collaborator

@princemaple princemaple Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

scope: keyword.guard.elixir

numeric:
Expand Down Expand Up @@ -335,13 +336,13 @@ contexts:
pop: true
- match: '{{module_name}}'
scope: entity.name.protocol.elixir
- match: '^\s*(def|defmacro)\s+([a-zA-Z_]\w*(?:!|\?)?)(?:(\()|\s*)'
- match: '^\s*(def|defmacro)\s+({{id_begin}}\w*(?:!|\?)?)(?:(\()|\s*)'
captures:
1: keyword.control.module.elixir
2: entity.name.function.public.elixir
3: punctuation.definition.parameters.elixir
push: function_body
- match: '^\s*(defp|defmacrop)\s+([a-zA-Z_]\w*(?:!|\?)?)(?:(\()|\s*)'
- match: '^\s*(defp|defmacrop)\s+({{id_begin}}\w*(?:!|\?)?)(?:(\()|\s*)'
captures:
1: keyword.control.module.elixir
2: entity.name.function.private.elixir
Expand Down Expand Up @@ -440,7 +441,7 @@ contexts:
- match: (?<!\.)\b(and|not|or|when|xor|in)\b
comment: as above, just doesn't need a 'end' and does a logic operation
scope: keyword.operator.elixir
- match: '{{module_name}}'
- match: '{{module_name}}(?!:)'
Copy link
Collaborator

@princemaple princemaple Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when would you do that?

Copy link
Collaborator Author

@azizk azizk Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you have a map or list containing keys starting with a capital letter: [A: 0, B: 1]

Copy link
Collaborator

@princemaple princemaple Mar 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems rare, but OK :)

scope: entity.name.class.elixir
- match: '\b(nil|true|false)\b(?![?!])'
scope: constant.language.elixir
Expand Down Expand Up @@ -480,12 +481,12 @@ contexts:
pop: true
- include: interpolated_elixir
- include: escaped_char
- match: '(?<!:)(:)(?>[a-zA-Z_][\w@]*(?>[?!]|=(?![>=]))?|\<\>|===?|!==?|<<>>|<<<|>>>|~~~|::|<\-|\|>|=>|=~|=|/|\\\\|\*\*?|\.\.?\.?|>=?|<=?|&&?&?|\+\+?|\-\-?|\|\|?\|?|\!|@|\%?\{\}|%|\[\]|\^(\^\^)?)'
- match: '(?<!:)(:)(?>{{id_begin}}[\w@]*(?>[?!]|=(?![>=]))?|\<\>|===?|!==?|<<>>|<<<|>>>|~~~|::|<\-|\|>|=>|=~|=|/|\\\\|\*\*?|\.\.?\.?|>=?|<=?|&&?&?|\+\+?|\-\-?|\|\|?\|?|\!|@|\%?\{\}|%|\[\]|\^(\^\^)?)'
comment: symbols
scope: constant.other.symbol.elixir
captures:
1: punctuation.definition.constant.elixir
- match: '(?>[a-zA-Z_][\w@]*(?>[?!])?)(:)(?!:)'
- match: '(?>{{id_begin}}[\w@]*(?>[?!])?)(:)(?!:)'
comment: symbols
scope: constant.other.keywords.elixir
captures:
Expand Down