Update some syntaxes + test on rust 1.23

This commit is contained in:
Vincent Prouillet 2018-01-22 21:20:55 +01:00
parent a44dd5f49a
commit 4e7538c821
8 changed files with 17 additions and 20 deletions

View file

@ -22,7 +22,7 @@ matrix:
rust: nightly rust: nightly
# The earliest stable Rust version that works # The earliest stable Rust version that works
- env: TARGET=x86_64-unknown-linux-gnu - env: TARGET=x86_64-unknown-linux-gnu
rust: 1.20.0 rust: 1.23.0
before_install: set -e before_install: set -e

View file

@ -19,6 +19,7 @@ For example: `date = "2001-10-10"` becomes `date = 2001-10-10`
- `gutenberg serve` now reloads site on `config.toml` changes: you will need to F5 to see them though - `gutenberg serve` now reloads site on `config.toml` changes: you will need to F5 to see them though
- Add a `trans` global function that will get return the translation of the given key for the given lang, defaulting - Add a `trans` global function that will get return the translation of the given key for the given lang, defaulting
to `config.default_language` if not given to `config.default_language` if not given
- `gutenberg serve` cleans after itself and deletes the output directory on CTRL+C
## 0.2.2 (2017-11-01) ## 0.2.2 (2017-11-01)

View file

@ -25,7 +25,7 @@ contexts:
captures: captures:
1: keyword.operator.other.elixir 1: keyword.operator.other.elixir
2: keyword.control.elixir 2: keyword.control.elixir
3: punctuation.definition.parameters.elixir 3: punctuation.section.function.elixir
pop: true pop: true
- include: core_syntax - include: core_syntax
- include: core_syntax - include: core_syntax
@ -37,7 +37,7 @@ contexts:
captures: captures:
1: keyword.operator.other.elixir 1: keyword.operator.other.elixir
2: keyword.control.elixir 2: keyword.control.elixir
3: punctuation.definition.parameters.elixir 3: punctuation.section.function.elixir
pop: true pop: true
- include: core_syntax - include: core_syntax
core_syntax: core_syntax:
@ -78,7 +78,7 @@ contexts:
captures: captures:
1: keyword.control.module.elixir 1: keyword.control.module.elixir
2: entity.name.function.public.elixir 2: entity.name.function.public.elixir
4: punctuation.definition.parameters.elixir 4: punctuation.section.function.elixir
push: push:
- meta_scope: meta.function.public.elixir - meta_scope: meta.function.public.elixir
- match: (\bdo:)|(\bdo\b)|(?=\s+(def|defmacro)\b) - match: (\bdo:)|(\bdo\b)|(?=\s+(def|defmacro)\b)
@ -100,7 +100,7 @@ contexts:
captures: captures:
1: keyword.control.module.elixir 1: keyword.control.module.elixir
2: entity.name.function.private.elixir 2: entity.name.function.private.elixir
4: punctuation.definition.parameters.elixir 4: punctuation.section.function.elixir
push: push:
- meta_scope: meta.function.private.elixir - meta_scope: meta.function.private.elixir
- match: (\bdo:)|(\bdo\b)|(?=\s+(defp|defmacrop)\b) - match: (\bdo:)|(\bdo\b)|(?=\s+(defp|defmacrop)\b)
@ -157,18 +157,6 @@ contexts:
pop: true pop: true
- include: interpolated_elixir - include: interpolated_elixir
- include: escaped_char - include: escaped_char
- match: (::)
captures:
0: punctuation.binary.elixir
push:
- match: (,|>>|$)
captures:
0: punctuation.binary.elixir
pop: true
- match: '\b[a-z]\w*\b'
scope: support.type.binary.elixir
- match: '\b(0x[0-9A-Fa-f](?>_?[0-9A-Fa-f])*|\d(?>_?\d)*(\.(?![^[:space:][:digit:]])(?>_?\d)*)?([eE][-+]?\d(?>_?\d)*)?|0b[01]+|0o[0-7]+)\b'
scope: constant.numeric.elixir
- match: '(?<!\.)\b(do|end|case|bc|lc|for|if|cond|unless|try|receive|fn|defmodule|defp?|defprotocol|defimpl|defrecord|defstruct|defmacrop?|defdelegate|defcallback|defmacrocallback|defexception|defoverridable|exit|after|rescue|catch|else|raise|throw|import|require|alias|use|quote|unquote|super|with)\b(?![?!:])' - match: '(?<!\.)\b(do|end|case|bc|lc|for|if|cond|unless|try|receive|fn|defmodule|defp?|defprotocol|defimpl|defrecord|defstruct|defmacrop?|defdelegate|defcallback|defmacrocallback|defexception|defoverridable|exit|after|rescue|catch|else|raise|throw|import|require|alias|use|quote|unquote|super|with)\b(?![?!:])'
scope: keyword.control.elixir scope: keyword.control.elixir
- match: (?<!\.)\b(and|not|or|when|xor|in)\b - match: (?<!\.)\b(and|not|or|when|xor|in)\b
@ -433,6 +421,14 @@ contexts:
the negative lookbehind prevents against matching the negative lookbehind prevents against matching
p(42.tainted?) p(42.tainted?)
scope: constant.numeric.elixir scope: constant.numeric.elixir
- match: \+\+|\-\-|<\|>
scope: keyword.operator.concatenation.elixir
- match: \|\>|<~>|<>|<<<|>>>|~>>|<<~|~>|<~|<\|>
scope: keyword.operator.sigils_1.elixir
- match: "&&&|&&"
scope: keyword.operator.sigils_2.elixir
- match: <\-|\\\\
scope: keyword.operator.sigils_3.elixir
- match: "===?|!==?|<=?|>=?" - match: "===?|!==?|<=?|>=?"
scope: keyword.operator.comparison.elixir scope: keyword.operator.comparison.elixir
- match: (\|\|\||&&&|^^^|<<<|>>>|~~~) - match: (\|\|\||&&&|^^^|<<<|>>>|~~~)

@ -1 +1 @@
Subproject commit 1bb01edcaf676b7f1155989051222db9b16178c5 Subproject commit 6f2e53603a62663463f95079b308a1c9adbabeec

@ -1 +1 @@
Subproject commit 38ae482c7930845c25a6bfcbb48bc338e156b5f9 Subproject commit 581805e47c7af5ab0a880aaef5b27f8c1ccc29aa

@ -1 +1 @@
Subproject commit cd7815a5592cd322f3da7b4af43c5fd03dd8c2ef Subproject commit df5a27523dd37ebe67ba4c7d36ea162dae95b2c3

Binary file not shown.

Binary file not shown.