diff options
Diffstat (limited to 'syntax')
| -rw-r--r-- | syntax/elixir.vim | 4 | ||||
| -rw-r--r-- | syntax/typescript.vim | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/syntax/elixir.vim b/syntax/elixir.vim index 89440f7f..9ad39e4a 100644 --- a/syntax/elixir.vim +++ b/syntax/elixir.vim @@ -43,12 +43,12 @@ syn match elixirOperator '\.\.\|\.' syn match elixirOperator "\^\^\^\|\^" syn match elixirOperator '\\\\\|::\|\*\|/\|\~\~\~\|@' +syn match elixirAlias '\([a-z]\)\@<![A-Z]\w*\%(\.[A-Z]\w*\)*' + syn match elixirAtom '\(:\)\@<!:\%([a-zA-Z_]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)' syn match elixirAtom '\(:\)\@<!:\%(<=>\|&&\?\|%\(()\|\[\]\|{}\)\|++\?\|--\?\|||\?\|!\|//\|[%&`/|]\)' syn match elixirAtom "\%([a-zA-Z_]\w*[?!]\?\):\(:\)\@!" -syn match elixirAlias '\([a-z]\)\@<![A-Z]\w*' - syn keyword elixirBoolean true false nil syn match elixirVariable '@[a-z]\w*' diff --git a/syntax/typescript.vim b/syntax/typescript.vim index ac2e3aeb..08f42383 100644 --- a/syntax/typescript.vim +++ b/syntax/typescript.vim @@ -128,7 +128,7 @@ syntax keyword typescriptBranch break continue yield await syntax keyword typescriptLabel case default async readonly syntax keyword typescriptStatement return with -syntax keyword typescriptGlobalObjects Array Boolean Date Function Infinity Math Number NaN Object Packages RegExp String Symbol netscape +syntax keyword typescriptGlobalObjects Array Boolean Date Function Infinity JSON Math Number NaN Object Packages RegExp String Symbol netscape syntax keyword typescriptExceptions try catch throw finally Error EvalError RangeError ReferenceError SyntaxError TypeError URIError @@ -210,7 +210,7 @@ syn match typescriptBraces "[{}\[\]]" syn match typescriptParens "[()]" syn match typescriptOpSymbols "=\{1,3}\|!==\|!=\|<\|>\|>=\|<=\|++\|+=\|--\|-=" syn match typescriptEndColons "[;,]" -syn match typescriptLogicSymbols "\(&&\)\|\(||\)" +syn match typescriptLogicSymbols "\(&&\)\|\(||\)\|\(!\)" " typescriptFold Function {{{ |