This commit is contained in:
Adam Stankiewicz 2019-04-23 11:32:40 +02:00
parent a55b6aa3aa
commit 4d18a5e5dd
23 changed files with 477 additions and 241 deletions

View File

@ -140,7 +140,7 @@ If you need full functionality of any plugin, please use it directly with your p
- [qmake](https://github.com/artoj/qmake-syntax-vim) (syntax) - [qmake](https://github.com/artoj/qmake-syntax-vim) (syntax)
- [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin) - [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin)
- [r-lang](https://github.com/vim-scripts/R.vim) (syntax, ftplugin) - [r-lang](https://github.com/vim-scripts/R.vim) (syntax, ftplugin)
- [racket](https://github.com/wlangstroth/vim-racket) (syntax, indent, autoload, ftplugin) - [racket](https://github.com/wlangstroth/vim-racket) (syntax, indent, ftplugin)
- [ragel](https://github.com/jneen/ragel.vim) (syntax) - [ragel](https://github.com/jneen/ragel.vim) (syntax)
- [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin) - [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin)
- [reason](https://github.com/reasonml-editor/vim-reason-plus) (syntax, indent) - [reason](https://github.com/reasonml-editor/vim-reason-plus) (syntax, indent)
@ -150,7 +150,7 @@ If you need full functionality of any plugin, please use it directly with your p
- [rust](https://github.com/rust-lang/rust.vim) (syntax, indent, compiler, autoload, ftplugin) - [rust](https://github.com/rust-lang/rust.vim) (syntax, indent, compiler, autoload, ftplugin)
- [sbt](https://github.com/derekwyatt/vim-sbt) (syntax) - [sbt](https://github.com/derekwyatt/vim-sbt) (syntax)
- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin) - [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin)
- [scss](https://github.com/cakebaker/scss-syntax.vim) (syntax, autoload, ftplugin) - [scss](https://github.com/cakebaker/scss-syntax.vim) (syntax, indent, ftplugin)
- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin) - [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin)
- [slime](https://github.com/slime-lang/vim-slime-syntax) (syntax, indent) - [slime](https://github.com/slime-lang/vim-slime-syntax) (syntax, indent)
- [smt2](https://github.com/bohlender/vim-smt2) (syntax, autoload, ftplugin) - [smt2](https://github.com/bohlender/vim-smt2) (syntax, autoload, ftplugin)

View File

@ -136,7 +136,13 @@ function! elm#util#GoToModule(name)
endfunction endfunction
function! s:findLocalModule(rel_path, root) function! s:findLocalModule(rel_path, root)
let l:package_json = a:root . '/elm-package.json' let l:old_match = findfile('elm-package.json', a:root . ';')
let l:new_match = findfile('elm.json', a:root . ';')
if !empty(l:new_match)
let l:package_json = l:new_match
elseif !empty(l:old_match)
let l:package_json = l:old_match
endif
if exists('*json_decode') if exists('*json_decode')
let l:package = json_decode(readfile(l:package_json)) let l:package = json_decode(readfile(l:package_json))
let l:source_roots = l:package['source-directories'] let l:source_roots = l:package['source-directories']

View File

@ -52,7 +52,7 @@ function! go#config#TermMode() abort
endfunction endfunction
function! go#config#TermEnabled() abort function! go#config#TermEnabled() abort
return get(g:, 'go_term_enabled', 0) return has('nvim') && get(g:, 'go_term_enabled', 0)
endfunction endfunction
function! go#config#SetTermEnabled(value) abort function! go#config#SetTermEnabled(value) abort
@ -214,6 +214,10 @@ function! go#config#DebugCommands() abort
return g:go_debug_commands return g:go_debug_commands
endfunction endfunction
function! go#config#DebugLogOutput() abort
return get(g:, 'go_debug_log_output', 'debugger, rpc')
endfunction
function! go#config#LspLog() abort function! go#config#LspLog() abort
" make sure g:go_lsp_log is set so that it can be added to easily. " make sure g:go_lsp_log is set so that it can be added to easily.
let g:go_lsp_log = get(g:, 'go_lsp_log', []) let g:go_lsp_log = get(g:, 'go_lsp_log', [])

View File

@ -1,7 +0,0 @@
if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
finish
endif
if !exists("g:raco_command")
let g:raco_command = system("which raco")
endif

View File

@ -149,6 +149,7 @@ function! s:RunRustfmt(command, tmpname, fail_silently)
call delete(l:stderr_tmpname) call delete(l:stderr_tmpname)
let l:open_lwindow = 0
if v:shell_error == 0 if v:shell_error == 0
" remove undo point caused via BufWritePre " remove undo point caused via BufWritePre
try | silent undojoin | catch | endtry try | silent undojoin | catch | endtry
@ -169,7 +170,7 @@ function! s:RunRustfmt(command, tmpname, fail_silently)
if s:got_fmt_error if s:got_fmt_error
let s:got_fmt_error = 0 let s:got_fmt_error = 0
call setloclist(0, []) call setloclist(0, [])
lwindow let l:open_lwindow = 1
endif endif
elseif g:rustfmt_fail_silently == 0 && a:fail_silently == 0 elseif g:rustfmt_fail_silently == 0 && a:fail_silently == 0
" otherwise get the errors and put them in the location list " otherwise get the errors and put them in the location list
@ -201,7 +202,7 @@ function! s:RunRustfmt(command, tmpname, fail_silently)
endif endif
let s:got_fmt_error = 1 let s:got_fmt_error = 1
lwindow let l:open_lwindow = 1
endif endif
" Restore the current directory if needed " Restore the current directory if needed
@ -213,6 +214,11 @@ function! s:RunRustfmt(command, tmpname, fail_silently)
endif endif
endif endif
" Open lwindow after we have changed back to the previous directory
if l:open_lwindow == 1
lwindow
endif
silent! loadview silent! loadview
endfunction endfunction

View File

@ -1,41 +0,0 @@
if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
finish
endif
" usage:
" set indentexpr=scss_indent#GetIndent(v:lnum)
fun! scss_indent#GetIndent(lnum)
" { -> increase indent
" } -> decrease indent
if a:lnum == 1
" start at 0 indentation
return 0
endif
" try to find last line ending with { or }
" ignoring // comments
let regex = '\([{}]\)\%(\/\/.*\)\?$'
let nr = search(regex, 'bnW')
if nr > 0
let last = indent(nr)
let m = matchlist(getline(nr), regex)
let m_curr = matchlist(getline(a:lnum), regex)
echoe string(m).string(m_curr)
if !empty(m_curr) && m_curr[1] == '}' && m[1] == '{'
" last was open, current is close, use same indent
return last
elseif !empty(m_curr) && m_curr[1] == '}' && m[1] == '}'
" } line and last line was }: decrease
return last - &sw
endif
if m[1] == '{'
" line after {: increase indent
return last + &sw
else
" line after } or { - same indent
return last
endif
else
return 0
endif
endfun

View File

@ -1069,7 +1069,7 @@ endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
augroup filetypedetect augroup filetypedetect
" racket, from racket.vim in wlangstroth/vim-racket " racket, from racket.vim in wlangstroth/vim-racket
au BufRead,BufNewFile *.rkt,*.rktl set filetype=racket au BufRead,BufNewFile *.rkt,*.rktl setf racket
augroup end augroup end
endif endif

View File

@ -24,7 +24,10 @@ if !exists("b:eelixir_subtype")
let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+') let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
endif endif
if b:eelixir_subtype == '' if b:eelixir_subtype == ''
let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.eelixir\)\+$','',''),'\.\zs\w\+$') let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
endif
if b:eelixir_subtype == ''
let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
endif endif
if b:eelixir_subtype == 'ex' if b:eelixir_subtype == 'ex'
let b:eelixir_subtype = 'elixir' let b:eelixir_subtype = 'elixir'

View File

@ -32,7 +32,7 @@ let &l:path =
\ &g:path \ &g:path
\ ], ',') \ ], ',')
setlocal includeexpr=elixir#util#get_filename(v:fname) setlocal includeexpr=elixir#util#get_filename(v:fname)
setlocal suffixesadd=.ex,.exs,.eex,.erl,.xrl,.yrl,.hrl setlocal suffixesadd=.ex,.exs,.eex,.leex,.erl,.xrl,.yrl,.hrl
let &l:define = 'def\(macro\|guard\|delegate\)\=p\=' let &l:define = 'def\(macro\|guard\|delegate\)\=p\='

93
indent/scss.vim Normal file
View File

@ -0,0 +1,93 @@
if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
finish
endif
" Vim indent file
" Language : SCSS (Sassy CSS)
" Maintainer : Daniel Hofstetter (daniel.hofstetter@42dh.com)
" URL : https://github.com/cakebaker/scss-syntax.vim
" Last Change : 2019-08-04
" Based on : css.vim by Nikolai Weibull, Oleg Zubchenko
" Modified by : ObserverOfTime
if exists('b:did_indent') | finish | endif
let b:did_indent = 1
setlocal indentexpr=GetSCSSIndent()
setlocal indentkeys=0{,0},0(,0),!^F,o,O
setlocal nosmartindent
let b:undo_indent = 'setl smartindent< indentkeys< indentexpr<'
if exists('*GetSCSSIndent') | finish | endif
let s:keepcpo= &cpoptions
set cpoptions&vim
function s:prevnonblanknoncomment(lnum)
let l:lnum = a:lnum
while l:lnum > 1
let l:lnum = prevnonblank(l:lnum)
let l:line = getline(l:lnum)
if l:line =~? '\*/'
while l:lnum > 1 && l:line !~? '/\*'
let l:lnum -= 1
endwhile
if l:line =~? '^\s*/\*'
let l:lnum -= 1
else
break
endif
else
break
endif
endwhile
return l:lnum
endfunction
function s:count_chars(lnum, count_open, chars)
let l:n_open = 0
let l:n_close = 0
let l:line = getline(a:lnum)
let l:pattern = '['. a:chars .']'
let l:i = match(l:line, l:pattern)
let l:noi = 'scss\%(Comment\|StringQ\{1,2}\)'
while l:i != -1
if synIDattr(synID(a:lnum, l:i + 1, 0), 'name') !~? l:noi
if l:line[l:i] ==# a:chars[0]
let l:n_open += 1
elseif l:line[l:i] ==# a:chars[1]
if l:n_open > 0
let l:n_open -= 1
else
let l:n_close += 1
endif
endif
endif
let l:i = match(l:line, l:pattern, l:i + 1)
endwhile
return a:count_open ? l:n_open : l:n_close
endfunction
function GetSCSSIndent()
let l:line = getline(v:lnum)
if l:line =~? '^\s*\*'
return cindent(v:lnum)
endif
let l:pnum = s:prevnonblanknoncomment(v:lnum - 1)
if l:pnum == 0
return 0
endif
return indent(l:pnum)
\ + s:count_chars(l:pnum, 1, '{}') * shiftwidth()
\ - s:count_chars(v:lnum, 0, '{}') * shiftwidth()
\ + s:count_chars(l:pnum, 1, '()') * shiftwidth()
\ - s:count_chars(v:lnum, 0, '()') * shiftwidth()
endfunction
let &cpoptions = s:keepcpo
unlet s:keepcpo
" vim:set et ts=2 sw=2:

View File

@ -21,7 +21,7 @@ else
endif endif
syn keyword carpSyntax def defn let do if while ref address set! the syn keyword carpSyntax def defn let do if while ref address set! the
syn keyword carpSyntax defmacro defdynamic quote cons list array fn syn keyword carpSyntax defmacro defdynamic defndynamic quote cons list array fn
syn keyword carpSyntax expand deftype register system-include register-type syn keyword carpSyntax expand deftype register system-include register-type
syn keyword carpSyntax defmodule copy use module defalias definterface eval syn keyword carpSyntax defmodule copy use module defalias definterface eval
syn keyword carpSyntax expand instantiate type info help quit env build run syn keyword carpSyntax expand instantiate type info help quit env build run

View File

@ -4,14 +4,14 @@ endif
" Vim syntax file " Vim syntax file
" Program: CMake - Cross-Platform Makefile Generator " Program: CMake - Cross-Platform Makefile Generator
" Version: cmake version 3.13.20181220-g0495c " Version: cmake version 3.14.20190402-g56ae2
" Language: CMake " Language: CMake
" Author: Andy Cedilnik <andy.cedilnik@kitware.com>, " Author: Andy Cedilnik <andy.cedilnik@kitware.com>,
" Nicholas Hutchinson <nshutchinson@gmail.com>, " Nicholas Hutchinson <nshutchinson@gmail.com>,
" Patrick Boettcher <patrick.boettcher@posteo.de> " Patrick Boettcher <patrick.boettcher@posteo.de>
" Maintainer: Dimitri Merejkowsky <d.merej@gmail.com> " Maintainer: Dimitri Merejkowsky <d.merej@gmail.com>
" Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com> " Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
" Last Change: 2018 Dec 20 " Last Change: 2019 Apr 15
" "
" Licence: The CMake license applies to this file. See " Licence: The CMake license applies to this file. See
" https://cmake.org/licensing " https://cmake.org/licensing
@ -35,7 +35,7 @@ syn region cmakeGeneratorExpression start="$<" end=">" contained oneline contain
syn region cmakeString start='"' end='"' contained contains=cmakeTodo,cmakeVariableValue,cmakeEscaped syn region cmakeString start='"' end='"' contained contains=cmakeTodo,cmakeVariableValue,cmakeEscaped
syn region cmakeVariableValue start="${" end="}" contained oneline contains=cmakeVariable,cmakeTodo syn region cmakeVariableValue start="${" end="}" contained oneline contains=cmakeVariable,cmakeTodo,cmakeVariableValue
syn region cmakeEnvironment start="$ENV{" end="}" contained oneline contains=cmakeTodo syn region cmakeEnvironment start="$ENV{" end="}" contained oneline contains=cmakeTodo
@ -79,14 +79,17 @@ syn keyword cmakeProperty contained
\ AUTOMOC \ AUTOMOC
\ AUTOMOC_COMPILER_PREDEFINES \ AUTOMOC_COMPILER_PREDEFINES
\ AUTOMOC_DEPEND_FILTERS \ AUTOMOC_DEPEND_FILTERS
\ AUTOMOC_EXECUTABLE
\ AUTOMOC_MACRO_NAMES \ AUTOMOC_MACRO_NAMES
\ AUTOMOC_MOC_OPTIONS \ AUTOMOC_MOC_OPTIONS
\ AUTOMOC_SOURCE_GROUP \ AUTOMOC_SOURCE_GROUP
\ AUTOMOC_TARGETS_FOLDER \ AUTOMOC_TARGETS_FOLDER
\ AUTORCC \ AUTORCC
\ AUTORCC_EXECUTABLE
\ AUTORCC_OPTIONS \ AUTORCC_OPTIONS
\ AUTORCC_SOURCE_GROUP \ AUTORCC_SOURCE_GROUP
\ AUTOUIC \ AUTOUIC
\ AUTOUIC_EXECUTABLE
\ AUTOUIC_OPTIONS \ AUTOUIC_OPTIONS
\ AUTOUIC_SEARCH_PATHS \ AUTOUIC_SEARCH_PATHS
\ BINARY_DIR \ BINARY_DIR
@ -102,6 +105,7 @@ syn keyword cmakeProperty contained
\ CMAKE_CONFIGURE_DEPENDS \ CMAKE_CONFIGURE_DEPENDS
\ CMAKE_CXX_KNOWN_FEATURES \ CMAKE_CXX_KNOWN_FEATURES
\ CMAKE_C_KNOWN_FEATURES \ CMAKE_C_KNOWN_FEATURES
\ CMAKE_ROLE
\ COMMON_LANGUAGE_RUNTIME \ COMMON_LANGUAGE_RUNTIME
\ COMPATIBLE_INTERFACE_BOOL \ COMPATIBLE_INTERFACE_BOOL
\ COMPATIBLE_INTERFACE_NUMBER_MAX \ COMPATIBLE_INTERFACE_NUMBER_MAX
@ -171,6 +175,8 @@ syn keyword cmakeProperty contained
\ GENERATED \ GENERATED
\ GENERATOR_FILE_NAME \ GENERATOR_FILE_NAME
\ GENERATOR_IS_MULTI_CONFIG \ GENERATOR_IS_MULTI_CONFIG
\ GHS_INTEGRITY_APP
\ GHS_NO_SOURCE_GROUP_FILE
\ GLOBAL_DEPENDS_DEBUG_MODE \ GLOBAL_DEPENDS_DEBUG_MODE
\ GLOBAL_DEPENDS_NO_CYCLES \ GLOBAL_DEPENDS_NO_CYCLES
\ GNUtoMS \ GNUtoMS
@ -328,6 +334,7 @@ syn keyword cmakeProperty contained
\ VS_IOT_STARTUP_TASK \ VS_IOT_STARTUP_TASK
\ VS_KEYWORD \ VS_KEYWORD
\ VS_MOBILE_EXTENSIONS_VERSION \ VS_MOBILE_EXTENSIONS_VERSION
\ VS_NO_SOLUTION_DEPLOY
\ VS_RESOURCE_GENERATOR \ VS_RESOURCE_GENERATOR
\ VS_SCC_AUXPATH \ VS_SCC_AUXPATH
\ VS_SCC_LOCALPATH \ VS_SCC_LOCALPATH
@ -359,11 +366,13 @@ syn keyword cmakeProperty contained
\ XCODE_EMIT_EFFECTIVE_PLATFORM_NAME \ XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
\ XCODE_EXPLICIT_FILE_TYPE \ XCODE_EXPLICIT_FILE_TYPE
\ XCODE_FILE_ATTRIBUTES \ XCODE_FILE_ATTRIBUTES
\ XCODE_GENERATE_SCHEME
\ XCODE_LAST_KNOWN_FILE_TYPE \ XCODE_LAST_KNOWN_FILE_TYPE
\ XCODE_PRODUCT_TYPE \ XCODE_PRODUCT_TYPE
\ XCODE_SCHEME_ADDRESS_SANITIZER \ XCODE_SCHEME_ADDRESS_SANITIZER
\ XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN \ XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN
\ XCODE_SCHEME_ARGUMENTS \ XCODE_SCHEME_ARGUMENTS
\ XCODE_SCHEME_DEBUG_AS_ROOT
\ XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER \ XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER
\ XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS \ XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS
\ XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE \ XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE
@ -455,10 +464,6 @@ syn keyword cmakeVariable contained
\ CMAKE_ASM_FLAGS_RELEASE_INIT \ CMAKE_ASM_FLAGS_RELEASE_INIT
\ CMAKE_ASM_FLAGS_RELWITHDEBINFO \ CMAKE_ASM_FLAGS_RELWITHDEBINFO
\ CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_ASM_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_ASM_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_ASM_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_ASM_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_ASM_IGNORE_EXTENSIONS \ CMAKE_ASM_IGNORE_EXTENSIONS
\ CMAKE_ASM_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_ASM_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_ASM_IMPLICIT_LINK_DIRECTORIES \ CMAKE_ASM_IMPLICIT_LINK_DIRECTORIES
@ -509,10 +514,6 @@ syn keyword cmakeVariable contained
\ CMAKE_ASM_MASM_FLAGS_RELEASE_INIT \ CMAKE_ASM_MASM_FLAGS_RELEASE_INIT
\ CMAKE_ASM_MASM_FLAGS_RELWITHDEBINFO \ CMAKE_ASM_MASM_FLAGS_RELWITHDEBINFO
\ CMAKE_ASM_MASM_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_ASM_MASM_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_ASM_MASM_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_ASM_MASM_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_ASM_MASM_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_ASM_MASM_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_ASM_MASM_IGNORE_EXTENSIONS \ CMAKE_ASM_MASM_IGNORE_EXTENSIONS
\ CMAKE_ASM_MASM_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_ASM_MASM_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_ASM_MASM_IMPLICIT_LINK_DIRECTORIES \ CMAKE_ASM_MASM_IMPLICIT_LINK_DIRECTORIES
@ -572,10 +573,6 @@ syn keyword cmakeVariable contained
\ CMAKE_ASM_NASM_FLAGS_RELEASE_INIT \ CMAKE_ASM_NASM_FLAGS_RELEASE_INIT
\ CMAKE_ASM_NASM_FLAGS_RELWITHDEBINFO \ CMAKE_ASM_NASM_FLAGS_RELWITHDEBINFO
\ CMAKE_ASM_NASM_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_ASM_NASM_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_ASM_NASM_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_ASM_NASM_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_ASM_NASM_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_ASM_NASM_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_ASM_NASM_IGNORE_EXTENSIONS \ CMAKE_ASM_NASM_IGNORE_EXTENSIONS
\ CMAKE_ASM_NASM_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_ASM_NASM_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_ASM_NASM_IMPLICIT_LINK_DIRECTORIES \ CMAKE_ASM_NASM_IMPLICIT_LINK_DIRECTORIES
@ -687,10 +684,6 @@ syn keyword cmakeVariable contained
\ CMAKE_CSharp_FLAGS_RELEASE_INIT \ CMAKE_CSharp_FLAGS_RELEASE_INIT
\ CMAKE_CSharp_FLAGS_RELWITHDEBINFO \ CMAKE_CSharp_FLAGS_RELWITHDEBINFO
\ CMAKE_CSharp_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_CSharp_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_CSharp_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_CSharp_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_CSharp_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_CSharp_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_CSharp_IGNORE_EXTENSIONS \ CMAKE_CSharp_IGNORE_EXTENSIONS
\ CMAKE_CSharp_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_CSharp_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_CSharp_IMPLICIT_LINK_DIRECTORIES \ CMAKE_CSharp_IMPLICIT_LINK_DIRECTORIES
@ -752,10 +745,6 @@ syn keyword cmakeVariable contained
\ CMAKE_CUDA_FLAGS_RELEASE_INIT \ CMAKE_CUDA_FLAGS_RELEASE_INIT
\ CMAKE_CUDA_FLAGS_RELWITHDEBINFO \ CMAKE_CUDA_FLAGS_RELWITHDEBINFO
\ CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_CUDA_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_CUDA_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_CUDA_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_CUDA_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_CUDA_HOST_COMPILER \ CMAKE_CUDA_HOST_COMPILER
\ CMAKE_CUDA_IGNORE_EXTENSIONS \ CMAKE_CUDA_IGNORE_EXTENSIONS
\ CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
@ -827,10 +816,6 @@ syn keyword cmakeVariable contained
\ CMAKE_CXX_FLAGS_RELEASE_INIT \ CMAKE_CXX_FLAGS_RELEASE_INIT
\ CMAKE_CXX_FLAGS_RELWITHDEBINFO \ CMAKE_CXX_FLAGS_RELWITHDEBINFO
\ CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_CXX_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_CXX_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_CXX_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_CXX_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_CXX_IGNORE_EXTENSIONS \ CMAKE_CXX_IGNORE_EXTENSIONS
\ CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES \ CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
@ -893,10 +878,6 @@ syn keyword cmakeVariable contained
\ CMAKE_C_FLAGS_RELEASE_INIT \ CMAKE_C_FLAGS_RELEASE_INIT
\ CMAKE_C_FLAGS_RELWITHDEBINFO \ CMAKE_C_FLAGS_RELWITHDEBINFO
\ CMAKE_C_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_C_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_C_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_C_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_C_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_C_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_C_IGNORE_EXTENSIONS \ CMAKE_C_IGNORE_EXTENSIONS
\ CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_C_IMPLICIT_LINK_DIRECTORIES \ CMAKE_C_IMPLICIT_LINK_DIRECTORIES
@ -940,6 +921,7 @@ syn keyword cmakeVariable contained
\ CMAKE_EXE_LINKER_FLAGS_INIT \ CMAKE_EXE_LINKER_FLAGS_INIT
\ CMAKE_EXPORT_COMPILE_COMMANDS \ CMAKE_EXPORT_COMPILE_COMMANDS
\ CMAKE_EXPORT_NO_PACKAGE_REGISTRY \ CMAKE_EXPORT_NO_PACKAGE_REGISTRY
\ CMAKE_EXPORT_PACKAGE_REGISTRY
\ CMAKE_EXTRA_GENERATOR \ CMAKE_EXTRA_GENERATOR
\ CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES \ CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES
\ CMAKE_FIND_APPBUNDLE \ CMAKE_FIND_APPBUNDLE
@ -951,6 +933,7 @@ syn keyword cmakeVariable contained
\ CMAKE_FIND_PACKAGE_NAME \ CMAKE_FIND_PACKAGE_NAME
\ CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY \ CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
\ CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY \ CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY
\ CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS
\ CMAKE_FIND_PACKAGE_SORT_DIRECTION \ CMAKE_FIND_PACKAGE_SORT_DIRECTION
\ CMAKE_FIND_PACKAGE_SORT_ORDER \ CMAKE_FIND_PACKAGE_SORT_ORDER
\ CMAKE_FIND_PACKAGE_WARN_NO_MODULE \ CMAKE_FIND_PACKAGE_WARN_NO_MODULE
@ -999,10 +982,6 @@ syn keyword cmakeVariable contained
\ CMAKE_Fortran_FLAGS_RELWITHDEBINFO \ CMAKE_Fortran_FLAGS_RELWITHDEBINFO
\ CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_Fortran_FORMAT \ CMAKE_Fortran_FORMAT
\ CMAKE_Fortran_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_Fortran_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_Fortran_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_Fortran_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_Fortran_IGNORE_EXTENSIONS \ CMAKE_Fortran_IGNORE_EXTENSIONS
\ CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES \ CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES
@ -1033,6 +1012,7 @@ syn keyword cmakeVariable contained
\ CMAKE_GENERATOR_INSTANCE \ CMAKE_GENERATOR_INSTANCE
\ CMAKE_GENERATOR_PLATFORM \ CMAKE_GENERATOR_PLATFORM
\ CMAKE_GENERATOR_TOOLSET \ CMAKE_GENERATOR_TOOLSET
\ CMAKE_GHS_NO_SOURCE_GROUP_FILE
\ CMAKE_GLOBAL_AUTOGEN_TARGET \ CMAKE_GLOBAL_AUTOGEN_TARGET
\ CMAKE_GLOBAL_AUTOGEN_TARGET_NAME \ CMAKE_GLOBAL_AUTOGEN_TARGET_NAME
\ CMAKE_GLOBAL_AUTORCC_TARGET \ CMAKE_GLOBAL_AUTORCC_TARGET
@ -1106,10 +1086,6 @@ syn keyword cmakeVariable contained
\ CMAKE_Java_FLAGS_RELEASE_INIT \ CMAKE_Java_FLAGS_RELEASE_INIT
\ CMAKE_Java_FLAGS_RELWITHDEBINFO \ CMAKE_Java_FLAGS_RELWITHDEBINFO
\ CMAKE_Java_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_Java_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_Java_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_Java_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_Java_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_Java_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_Java_IGNORE_EXTENSIONS \ CMAKE_Java_IGNORE_EXTENSIONS
\ CMAKE_Java_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_Java_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_Java_IMPLICIT_LINK_DIRECTORIES \ CMAKE_Java_IMPLICIT_LINK_DIRECTORIES
@ -1152,6 +1128,7 @@ syn keyword cmakeVariable contained
\ CMAKE_MAJOR_VERSION \ CMAKE_MAJOR_VERSION
\ CMAKE_MAKE_PROGRAM \ CMAKE_MAKE_PROGRAM
\ CMAKE_MATCH_COUNT \ CMAKE_MATCH_COUNT
\ CMAKE_MAXIMUM_RECURSION_DEPTH
\ CMAKE_MFC_FLAG \ CMAKE_MFC_FLAG
\ CMAKE_MINIMUM_REQUIRED_VERSION \ CMAKE_MINIMUM_REQUIRED_VERSION
\ CMAKE_MINOR_VERSION \ CMAKE_MINOR_VERSION
@ -1177,6 +1154,7 @@ syn keyword cmakeVariable contained
\ CMAKE_PROGRAM_PATH \ CMAKE_PROGRAM_PATH
\ CMAKE_PROJECT_DESCRIPTION \ CMAKE_PROJECT_DESCRIPTION
\ CMAKE_PROJECT_HOMEPAGE_URL \ CMAKE_PROJECT_HOMEPAGE_URL
\ CMAKE_PROJECT_INCLUDE
\ CMAKE_PROJECT_NAME \ CMAKE_PROJECT_NAME
\ CMAKE_PROJECT_VERSION \ CMAKE_PROJECT_VERSION
\ CMAKE_PROJECT_VERSION_MAJOR \ CMAKE_PROJECT_VERSION_MAJOR
@ -1221,10 +1199,6 @@ syn keyword cmakeVariable contained
\ CMAKE_RC_FLAGS_RELEASE_INIT \ CMAKE_RC_FLAGS_RELEASE_INIT
\ CMAKE_RC_FLAGS_RELWITHDEBINFO \ CMAKE_RC_FLAGS_RELWITHDEBINFO
\ CMAKE_RC_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_RC_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_RC_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_RC_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_RC_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_RC_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_RC_IGNORE_EXTENSIONS \ CMAKE_RC_IGNORE_EXTENSIONS
\ CMAKE_RC_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_RC_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_RC_IMPLICIT_LINK_DIRECTORIES \ CMAKE_RC_IMPLICIT_LINK_DIRECTORIES
@ -1323,10 +1297,6 @@ syn keyword cmakeVariable contained
\ CMAKE_Swift_FLAGS_RELEASE_INIT \ CMAKE_Swift_FLAGS_RELEASE_INIT
\ CMAKE_Swift_FLAGS_RELWITHDEBINFO \ CMAKE_Swift_FLAGS_RELWITHDEBINFO
\ CMAKE_Swift_FLAGS_RELWITHDEBINFO_INIT \ CMAKE_Swift_FLAGS_RELWITHDEBINFO_INIT
\ CMAKE_Swift_GHS_KERNEL_FLAGS_DEBUG
\ CMAKE_Swift_GHS_KERNEL_FLAGS_MINSIZEREL
\ CMAKE_Swift_GHS_KERNEL_FLAGS_RELEASE
\ CMAKE_Swift_GHS_KERNEL_FLAGS_RELWITHDEBINFO
\ CMAKE_Swift_IGNORE_EXTENSIONS \ CMAKE_Swift_IGNORE_EXTENSIONS
\ CMAKE_Swift_IMPLICIT_INCLUDE_DIRECTORIES \ CMAKE_Swift_IMPLICIT_INCLUDE_DIRECTORIES
\ CMAKE_Swift_IMPLICIT_LINK_DIRECTORIES \ CMAKE_Swift_IMPLICIT_LINK_DIRECTORIES
@ -1449,7 +1419,7 @@ syn keyword cmakeVariable contained
\ CTEST_CUSTOM_POST_TEST \ CTEST_CUSTOM_POST_TEST
\ CTEST_CUSTOM_PRE_MEMCHECK \ CTEST_CUSTOM_PRE_MEMCHECK
\ CTEST_CUSTOM_PRE_TEST \ CTEST_CUSTOM_PRE_TEST
\ CTEST_CUSTOM_TEST_IGNORE \ CTEST_CUSTOM_TESTS_IGNORE
\ CTEST_CUSTOM_WARNING_EXCEPTION \ CTEST_CUSTOM_WARNING_EXCEPTION
\ CTEST_CUSTOM_WARNING_MATCH \ CTEST_CUSTOM_WARNING_MATCH
\ CTEST_CVS_CHECKOUT \ CTEST_CVS_CHECKOUT
@ -1483,6 +1453,7 @@ syn keyword cmakeVariable contained
\ CTEST_SCP_COMMAND \ CTEST_SCP_COMMAND
\ CTEST_SITE \ CTEST_SITE
\ CTEST_SOURCE_DIRECTORY \ CTEST_SOURCE_DIRECTORY
\ CTEST_SUBMIT_URL
\ CTEST_SVN_COMMAND \ CTEST_SVN_COMMAND
\ CTEST_SVN_OPTIONS \ CTEST_SVN_OPTIONS
\ CTEST_SVN_UPDATE_OPTIONS \ CTEST_SVN_UPDATE_OPTIONS
@ -1497,6 +1468,7 @@ syn keyword cmakeVariable contained
\ ENV \ ENV
\ EXECUTABLE_OUTPUT_PATH \ EXECUTABLE_OUTPUT_PATH
\ GHS-MULTI \ GHS-MULTI
\ IOS
\ LIBRARY_OUTPUT_PATH \ LIBRARY_OUTPUT_PATH
\ MINGW \ MINGW
\ MSVC \ MSVC
@ -1512,6 +1484,7 @@ syn keyword cmakeVariable contained
\ MSVC_IDE \ MSVC_IDE
\ MSVC_TOOLSET_VERSION \ MSVC_TOOLSET_VERSION
\ MSVC_VERSION \ MSVC_VERSION
\ MSYS
\ PROJECT_BINARY_DIR \ PROJECT_BINARY_DIR
\ PROJECT_DESCRIPTION \ PROJECT_DESCRIPTION
\ PROJECT_HOMEPAGE_URL \ PROJECT_HOMEPAGE_URL
@ -1592,6 +1565,7 @@ syn keyword cmakeKWExternalProject contained
\ LOG_DOWNLOAD \ LOG_DOWNLOAD
\ LOG_INSTALL \ LOG_INSTALL
\ LOG_MERGED_STDOUTERR \ LOG_MERGED_STDOUTERR
\ LOG_OUTPUT_ON_FAILURE
\ LOG_PATCH \ LOG_PATCH
\ LOG_TEST \ LOG_TEST
\ LOG_UPDATE \ LOG_UPDATE
@ -1645,6 +1619,7 @@ syn keyword cmakeKWadd_compile_options contained
\ COMPILE_OPTIONS \ COMPILE_OPTIONS
\ SHELL \ SHELL
\ UNIX_COMMAND \ UNIX_COMMAND
\ WX
syn keyword cmakeKWadd_custom_command contained syn keyword cmakeKWadd_custom_command contained
\ APPEND \ APPEND
@ -1767,6 +1742,7 @@ syn keyword cmakeKWadd_test contained
\ CONFIGURATIONS \ CONFIGURATIONS
\ FAIL_REGULAR_EXPRESSION \ FAIL_REGULAR_EXPRESSION
\ NAME \ NAME
\ OFF
\ PASS_REGULAR_EXPRESSION \ PASS_REGULAR_EXPRESSION
\ TARGET_FILE \ TARGET_FILE
\ WILL_FAIL \ WILL_FAIL
@ -1818,6 +1794,7 @@ syn keyword cmakeKWcmake_parse_arguments contained
\ MY_INSTALL_CONFIGURATIONS \ MY_INSTALL_CONFIGURATIONS
\ MY_INSTALL_DESTINATION \ MY_INSTALL_DESTINATION
\ MY_INSTALL_FAST \ MY_INSTALL_FAST
\ MY_INSTALL_KEYWORDS_MISSING_VALUES
\ MY_INSTALL_OPTIONAL \ MY_INSTALL_OPTIONAL
\ MY_INSTALL_RENAME \ MY_INSTALL_RENAME
\ MY_INSTALL_TARGETS \ MY_INSTALL_TARGETS
@ -1828,6 +1805,7 @@ syn keyword cmakeKWcmake_parse_arguments contained
\ TARGETS \ TARGETS
\ TRUE \ TRUE
\ UNDEFINED \ UNDEFINED
\ _KEYWORDS_MISSING_VALUES
\ _UNPARSED_ARGUMENTS \ _UNPARSED_ARGUMENTS
syn keyword cmakeKWcmake_policy contained syn keyword cmakeKWcmake_policy contained
@ -1926,6 +1904,7 @@ syn keyword cmakeKWctest_start contained
syn keyword cmakeKWctest_submit contained syn keyword cmakeKWctest_submit contained
\ API \ API
\ BUILD_ID
\ CAPTURE_CMAKE_ERROR \ CAPTURE_CMAKE_ERROR
\ CDASH_UPLOAD \ CDASH_UPLOAD
\ CDASH_UPLOAD_TYPE \ CDASH_UPLOAD_TYPE
@ -1938,6 +1917,7 @@ syn keyword cmakeKWctest_submit contained
\ RETRY_COUNT \ RETRY_COUNT
\ RETRY_DELAY \ RETRY_DELAY
\ RETURN_VALUE \ RETURN_VALUE
\ SUBMIT_URL
syn keyword cmakeKWctest_test contained syn keyword cmakeKWctest_test contained
\ APPEND \ APPEND
@ -1993,6 +1973,9 @@ syn keyword cmakeKWenable_language contained
\ CUDA \ CUDA
\ OPTIONAL \ OPTIONAL
syn keyword cmakeKWenable_testing contained
\ BUILD_TESTING
syn keyword cmakeKWexec_program contained syn keyword cmakeKWexec_program contained
\ ARGS \ ARGS
\ OUTPUT_VARIABLE \ OUTPUT_VARIABLE
@ -2055,6 +2038,8 @@ syn keyword cmakeKWfile contained
\ CONFIGURE_DEPENDS \ CONFIGURE_DEPENDS
\ CONTENT \ CONTENT
\ COPY \ COPY
\ COPY_ON_ERROR
\ CREATE_LINK
\ DESTINATION \ DESTINATION
\ DIRECTORY_PERMISSIONS \ DIRECTORY_PERMISSIONS
\ DOWNLOAD \ DOWNLOAD
@ -2108,12 +2093,14 @@ syn keyword cmakeKWfile contained
\ REMOVE_RECURSE \ REMOVE_RECURSE
\ RENAME \ RENAME
\ REQUIRED \ REQUIRED
\ RESULT
\ RESULT_VARIABLE \ RESULT_VARIABLE
\ SHOW_PROGRESS \ SHOW_PROGRESS
\ SIZE \ SIZE
\ SSL \ SSL
\ STATUS \ STATUS
\ STRINGS \ STRINGS
\ SYMBOLIC
\ TIMESTAMP \ TIMESTAMP
\ TLS_CAINFO \ TLS_CAINFO
\ TLS_VERIFY \ TLS_VERIFY
@ -2295,8 +2282,10 @@ syn keyword cmakeKWget_filename_component contained
\ BASE_DIR \ BASE_DIR
\ DIRECTORY \ DIRECTORY
\ EXT \ EXT
\ LAST_EXT
\ NAME \ NAME
\ NAME_WE \ NAME_WE
\ NAME_WLE
\ PATH \ PATH
\ PROGRAM \ PROGRAM
\ PROGRAM_ARGS \ PROGRAM_ARGS
@ -2432,6 +2421,7 @@ syn keyword cmakeKWinstall contained
\ EXPORT \ EXPORT
\ EXPORT_ANDROID_MK \ EXPORT_ANDROID_MK
\ EXPORT_LINK_INTERFACE_LIBRARIES \ EXPORT_LINK_INTERFACE_LIBRARIES
\ EXPORT_NAME
\ FILES \ FILES
\ FILES_MATCHING \ FILES_MATCHING
\ FILE_PERMISSIONS \ FILE_PERMISSIONS
@ -2466,6 +2456,7 @@ syn keyword cmakeKWinstall contained
\ PRE_INSTALL_SCRIPT \ PRE_INSTALL_SCRIPT
\ PRIVATE_HEADER \ PRIVATE_HEADER
\ PROGRAMS \ PROGRAMS
\ PROPERTIES
\ PUBLIC_HEADER \ PUBLIC_HEADER
\ REGEX \ REGEX
\ RENAME \ RENAME
@ -2479,6 +2470,7 @@ syn keyword cmakeKWinstall contained
\ SETUID \ SETUID
\ SHAREDSTATE \ SHAREDSTATE
\ SOVERSION \ SOVERSION
\ STATIC
\ SYSCONF \ SYSCONF
\ TARGETS \ TARGETS
\ TRUE \ TRUE
@ -2533,6 +2525,8 @@ syn keyword cmakeKWlist contained
\ ORDER \ ORDER
\ OUTPUT_VARIABLE \ OUTPUT_VARIABLE
\ PARENT_SCOPE \ PARENT_SCOPE
\ POP_BACK
\ POP_FRONT
\ PREPEND \ PREPEND
\ REGEX \ REGEX
\ REMOVE_AT \ REMOVE_AT
@ -2613,6 +2607,12 @@ syn keyword cmakeKWproject contained
\ _VERSION_PATCH \ _VERSION_PATCH
\ _VERSION_TWEAK \ _VERSION_TWEAK
syn keyword cmakeKWqt_wrap_cpp contained
\ AUTOMOC
syn keyword cmakeKWqt_wrap_ui contained
\ AUTOUIC
syn keyword cmakeKWremove contained syn keyword cmakeKWremove contained
\ VALUE \ VALUE
\ VAR \ VAR
@ -2635,6 +2635,7 @@ syn keyword cmakeKWset contained
\ STRINGS \ STRINGS
syn keyword cmakeKWset_directory_properties contained syn keyword cmakeKWset_directory_properties contained
\ DIRECTORY
\ PROPERTIES \ PROPERTIES
syn keyword cmakeKWset_property contained syn keyword cmakeKWset_property contained
@ -2652,6 +2653,7 @@ syn keyword cmakeKWset_property contained
syn keyword cmakeKWset_source_files_properties contained syn keyword cmakeKWset_source_files_properties contained
\ PROPERTIES \ PROPERTIES
\ SOURCE
syn keyword cmakeKWset_target_properties contained syn keyword cmakeKWset_target_properties contained
\ PROPERTIES \ PROPERTIES
@ -2659,6 +2661,7 @@ syn keyword cmakeKWset_target_properties contained
syn keyword cmakeKWset_tests_properties contained syn keyword cmakeKWset_tests_properties contained
\ PROPERTIES \ PROPERTIES
\ TEST
syn keyword cmakeKWsource_group contained syn keyword cmakeKWsource_group contained
\ FILES \ FILES
@ -2845,17 +2848,20 @@ syn keyword cmakeKWtry_compile contained
\ DEFINED \ DEFINED
\ DLINK_LIBRARIES \ DLINK_LIBRARIES
\ DVAR \ DVAR
\ EXECUTABLE
\ FALSE \ FALSE
\ GHS
\ INCLUDE_DIRECTORIES \ INCLUDE_DIRECTORIES
\ LANG \ LANG
\ LINK_DIRECTORIES \ LINK_DIRECTORIES
\ LINK_LIBRARIES \ LINK_LIBRARIES
\ LINK_OPTIONS \ LINK_OPTIONS
\ MULTI
\ NOT \ NOT
\ OUTPUT_VARIABLE \ OUTPUT_VARIABLE
\ PRIVATE \ PRIVATE
\ RESULT_VAR
\ SOURCES \ SOURCES
\ STATIC_LIBRARY
\ STATIC_LIBRARY_OPTIONS \ STATIC_LIBRARY_OPTIONS
\ TRUE \ TRUE
\ TYPE \ TYPE
@ -2869,7 +2875,6 @@ syn keyword cmakeKWtry_run contained
\ CMAKE_FLAGS \ CMAKE_FLAGS
\ COMPILE_DEFINITIONS \ COMPILE_DEFINITIONS
\ COMPILE_OUTPUT_VARIABLE \ COMPILE_OUTPUT_VARIABLE
\ COMPILE_RESULT_VAR
\ DLINK_LIBRARIES \ DLINK_LIBRARIES
\ DVAR \ DVAR
\ FAILED_TO_RUN \ FAILED_TO_RUN
@ -2879,7 +2884,6 @@ syn keyword cmakeKWtry_run contained
\ LINK_LIBRARIES \ LINK_LIBRARIES
\ LINK_OPTIONS \ LINK_OPTIONS
\ RUN_OUTPUT_VARIABLE \ RUN_OUTPUT_VARIABLE
\ RUN_RESULT_VAR
\ TRUE \ TRUE
\ TYPE \ TYPE
\ VALUE \ VALUE
@ -2924,7 +2928,8 @@ syn keyword cmakeGeneratorExpressions contained
\ COMPILING_CXX \ COMPILING_CXX
\ CONFIG \ CONFIG
\ CONFIGURATION \ CONFIGURATION
\ CUDA \ CUDA_COMPILER_ID
\ CUDA_COMPILER_VERSION
\ CUSTOM_KEYS \ CUSTOM_KEYS
\ CXX_COMPILER_ID \ CXX_COMPILER_ID
\ CXX_COMPILER_VERSION \ CXX_COMPILER_VERSION
@ -2953,7 +2958,6 @@ syn keyword cmakeGeneratorExpressions contained
\ LOWER_CASE \ LOWER_CASE
\ MAKE_C_IDENTIFIER \ MAKE_C_IDENTIFIER
\ MAP_IMPORTED_CONFIG_ \ MAP_IMPORTED_CONFIG_
\ MSYS
\ NO \ NO
\ NOT \ NOT
\ OBJECT_LIBRARY \ OBJECT_LIBRARY
@ -2964,6 +2968,7 @@ syn keyword cmakeGeneratorExpressions contained
\ PDB_OUTPUT_DIRECTORY \ PDB_OUTPUT_DIRECTORY
\ PDB_OUTPUT_DIRECTORY_ \ PDB_OUTPUT_DIRECTORY_
\ PLATFORM_ID \ PLATFORM_ID
\ POSIX
\ PRIVATE \ PRIVATE
\ PUBLIC \ PUBLIC
\ SDK \ SDK
@ -3189,6 +3194,7 @@ hi def link cmakeKWctest_update ModeMsg
hi def link cmakeKWctest_upload ModeMsg hi def link cmakeKWctest_upload ModeMsg
hi def link cmakeKWdefine_property ModeMsg hi def link cmakeKWdefine_property ModeMsg
hi def link cmakeKWenable_language ModeMsg hi def link cmakeKWenable_language ModeMsg
hi def link cmakeKWenable_testing ModeMsg
hi def link cmakeKWexec_program ModeMsg hi def link cmakeKWexec_program ModeMsg
hi def link cmakeKWexecute_process ModeMsg hi def link cmakeKWexecute_process ModeMsg
hi def link cmakeKWexport ModeMsg hi def link cmakeKWexport ModeMsg
@ -3228,6 +3234,8 @@ hi def link cmakeKWmath ModeMsg
hi def link cmakeKWmessage ModeMsg hi def link cmakeKWmessage ModeMsg
hi def link cmakeKWoption ModeMsg hi def link cmakeKWoption ModeMsg
hi def link cmakeKWproject ModeMsg hi def link cmakeKWproject ModeMsg
hi def link cmakeKWqt_wrap_cpp ModeMsg
hi def link cmakeKWqt_wrap_ui ModeMsg
hi def link cmakeKWremove ModeMsg hi def link cmakeKWremove ModeMsg
hi def link cmakeKWseparate_arguments ModeMsg hi def link cmakeKWseparate_arguments ModeMsg
hi def link cmakeKWset ModeMsg hi def link cmakeKWset ModeMsg

View File

@ -24,7 +24,10 @@ if !exists("b:eelixir_subtype")
let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+') let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
endif endif
if b:eelixir_subtype == '' if b:eelixir_subtype == ''
let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.eelixir\)\+$','',''),'\.\zs\w\+$') let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
endif
if b:eelixir_subtype == ''
let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
endif endif
if b:eelixir_subtype == 'ex' if b:eelixir_subtype == 'ex'
let b:eelixir_subtype = 'elixir' let b:eelixir_subtype = 'elixir'

View File

@ -109,6 +109,12 @@ syn region elixirSigil matchgroup=elixirSigilDelimiter start="\~\l\/"
syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z("""\)+ end=+^\s*\z1+ skip=+\\"+ fold syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z("""\)+ end=+^\s*\z1+ skip=+\\"+ fold
syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z('''\)+ end=+^\s*\z1+ skip=+\\'+ fold syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z('''\)+ end=+^\s*\z1+ skip=+\\'+ fold
" LiveView Sigils surrounded with ~L"""
syntax include @HTML syntax/html.vim
syntax region elixirLiveViewSigil matchgroup=elixirSigilDelimiter keepend start=+\~L\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
" Documentation " Documentation
if exists('g:elixir_use_markdown_for_docs') && g:elixir_use_markdown_for_docs if exists('g:elixir_use_markdown_for_docs') && g:elixir_use_markdown_for_docs
syn include @markdown syntax/markdown.vim syn include @markdown syntax/markdown.vim
@ -127,9 +133,9 @@ syn region elixirDocString matchgroup=elixirDocSigilDelimiter start="\%(@\w*doc
syn region elixirDocString matchgroup=elixirDocSigilDelimiter start="\%(@\w*doc\s\+\)\@<=\~[Ss]\[" end="\]" skip="\\\\\|\\\]" contains=@elixirDocStringContained fold keepend syn region elixirDocString matchgroup=elixirDocSigilDelimiter start="\%(@\w*doc\s\+\)\@<=\~[Ss]\[" end="\]" skip="\\\\\|\\\]" contains=@elixirDocStringContained fold keepend
syn region elixirDocString matchgroup=elixirDocSigilDelimiter start="\%(@\w*doc\s\+\)\@<=\~[Ss](" end=")" skip="\\\\\|\\)" contains=@elixirDocStringContained fold keepend syn region elixirDocString matchgroup=elixirDocSigilDelimiter start="\%(@\w*doc\s\+\)\@<=\~[Ss](" end=")" skip="\\\\\|\\)" contains=@elixirDocStringContained fold keepend
syn region elixirDocString matchgroup=elixirDocStringDelimiter start=+\%(@\w*doc\s\+\)\@<=\z("\)+ end=+\z1+ skip=+\\\\\|\\\z1+ contains=@elixirDocStringContained keepend syn region elixirDocString matchgroup=elixirDocStringDelimiter start=+\%(@\w*doc\s\+\)\@<=\z("\)+ end=+\z1+ skip=+\\\\\|\\\z1+ contains=@elixirDocStringContained keepend
syn region elixirDocString matchgroup=elixirDocStringDelimiter start=+\%(@\w*doc\s\+\)\@<=\z("""\)+ end=+\z1+ contains=@elixirDocStringContained fold keepend syn region elixirDocString matchgroup=elixirDocStringDelimiter start=+\%(@\w*doc\s\+\)\@<=\z("""\)+ end=+^\s*\z1+ contains=@elixirDocStringContained fold keepend
syn region elixirDocString matchgroup=elixirDocSigilDelimiter start=+\%(@\w*doc\s\+\)\@<=\~[Ss]\z('''\)+ end=+\z1+ skip=+\\'+ contains=@elixirDocStringContained fold keepend syn region elixirDocString matchgroup=elixirDocSigilDelimiter start=+\%(@\w*doc\s\+\)\@<=\~[Ss]\z('''\)+ end=+^\s*\z1+ contains=@elixirDocStringContained fold keepend
syn region elixirDocString matchgroup=elixirDocSigilDelimiter start=+\%(@\w*doc\s\+\)\@<=\~[Ss]\z("""\)+ end=+\z1+ skip=+\\"+ contains=@elixirDocStringContained fold keepend syn region elixirDocString matchgroup=elixirDocSigilDelimiter start=+\%(@\w*doc\s\+\)\@<=\~[Ss]\z("""\)+ end=+^\s*\z1+ contains=@elixirDocStringContained fold keepend
" Defines " Defines
syn match elixirDefine '\<def\>\(:\)\@!' nextgroup=elixirFunctionDeclaration skipwhite skipnl syn match elixirDefine '\<def\>\(:\)\@!' nextgroup=elixirFunctionDeclaration skipwhite skipnl

View File

@ -46,6 +46,7 @@ syn match elmFloat "\(\<\d\+\.\d\+\>\)"
" Identifiers " Identifiers
syn match elmTopLevelDecl "^\s*[a-zA-Z][a-zA-z0-9_]*\('\)*\s\+:\(\r\n\|\r\|\n\|\s\)\+" contains=elmOperator syn match elmTopLevelDecl "^\s*[a-zA-Z][a-zA-z0-9_]*\('\)*\s\+:\(\r\n\|\r\|\n\|\s\)\+" contains=elmOperator
syn match elmFuncName /^\l\w*/
" Folding " Folding
syn region elmTopLevelTypedef start="type" end="\n\(\n\n\)\@=" contains=ALL fold syn region elmTopLevelTypedef start="type" end="\n\(\n\n\)\@=" contains=ALL fold
@ -54,6 +55,7 @@ syn region elmCaseBlock matchgroup=elmCaseBlockDefinition start="^\z\(\s\+\)\<ca
syn region elmCaseItemBlock start="^\z\(\s\+\).\+->$" end="^\z1\@!\W\@=" end="\(\n\n\z1\@!\)\@=" end="\(\n\z1\S\)\@=" contains=ALL fold syn region elmCaseItemBlock start="^\z\(\s\+\).\+->$" end="^\z1\@!\W\@=" end="\(\n\n\z1\@!\)\@=" end="\(\n\z1\S\)\@=" contains=ALL fold
syn region elmLetBlock matchgroup=elmLetBlockDefinition start="\<let\>" end="\<in\>" contains=ALL fold syn region elmLetBlock matchgroup=elmLetBlockDefinition start="\<let\>" end="\<in\>" contains=ALL fold
hi def link elmFuncName Function
hi def link elmCaseBlockDefinition Conditional hi def link elmCaseBlockDefinition Conditional
hi def link elmCaseBlockItemDefinition Conditional hi def link elmCaseBlockItemDefinition Conditional
hi def link elmLetBlockDefinition TypeDef hi def link elmLetBlockDefinition TypeDef

View File

@ -58,7 +58,7 @@ syn match i3ConfigInitialize /^\s*set\s\+.*$/ contains=i3ConfigVariable,i3Config
" Gaps " Gaps
syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle contained syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle contained
syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,number,i3ConfigVariable syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,number,i3ConfigVariable
syn keyword i3ConfigSmartGapKeyword on inverse_outer contained syn keyword i3ConfigSmartGapKeyword on inverse_outer contained
syn match i3ConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\)\s\?$/ contains=i3ConfigSmartGapKeyword syn match i3ConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\)\s\?$/ contains=i3ConfigSmartGapKeyword
syn keyword i3ConfigSmartBorderKeyword on no_gaps contained syn keyword i3ConfigSmartBorderKeyword on no_gaps contained

View File

@ -153,14 +153,16 @@ syntax region jsFinallyBlock contained matchgroup=jsFinallyBraces s
syntax region jsSwitchBlock contained matchgroup=jsSwitchBraces start=/{/ end=/}/ contains=@jsAll,jsBlock,jsSwitchCase extend fold syntax region jsSwitchBlock contained matchgroup=jsSwitchBraces start=/{/ end=/}/ contains=@jsAll,jsBlock,jsSwitchCase extend fold
syntax region jsRepeatBlock contained matchgroup=jsRepeatBraces start=/{/ end=/}/ contains=@jsAll,jsBlock extend fold syntax region jsRepeatBlock contained matchgroup=jsRepeatBraces start=/{/ end=/}/ contains=@jsAll,jsBlock extend fold
syntax region jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/ end=/}/ contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold syntax region jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/ end=/}/ contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
syntax region jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold syntax region jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsDestructuringNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
syntax region jsObject contained matchgroup=jsObjectBraces start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold syntax region jsObject contained matchgroup=jsObjectBraces start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
syntax region jsBlock matchgroup=jsBraces start=/{/ end=/}/ contains=@jsAll,jsSpreadExpression extend fold syntax region jsBlock matchgroup=jsBraces start=/{/ end=/}/ contains=@jsAll,jsSpreadExpression extend fold
syntax region jsModuleGroup contained matchgroup=jsModuleBraces start=/{/ end=/}/ contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold syntax region jsModuleGroup contained matchgroup=jsModuleBraces start=/{/ end=/}/ contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
syntax region jsSpreadExpression contained matchgroup=jsSpreadOperator start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression syntax region jsSpreadExpression contained matchgroup=jsSpreadOperator start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
syntax region jsRestExpression contained matchgroup=jsRestOperator start=/\.\.\./ end=/[,)]\@=/ syntax region jsRestExpression contained matchgroup=jsRestOperator start=/\.\.\./ end=/[,)]\@=/
syntax region jsTernaryIf matchgroup=jsTernaryIfOperator start=/?:\@!/ end=/\%(:\|}\@=\)/ contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression syntax region jsTernaryIf matchgroup=jsTernaryIfOperator start=/?:\@!/ end=/\%(:\|}\@=\)/ contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
" These must occur here or they will be override by jsTernaryIf
syntax match jsOperator /?\.\ze\_D/ syntax match jsOperator /?\.\ze\_D/
syntax match jsOperator /??/ skipwhite skipempty nextgroup=@jsExpression
syntax match jsGenerator contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup syntax match jsGenerator contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
syntax match jsFuncName contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup syntax match jsFuncName contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup

View File

@ -2,48 +2,64 @@ if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json5') != -1
finish finish
endif endif
" Syntax setup {{{1 " Modified from the original taken from https://github.com/gutenye/json5.vim
" Syntax setup
if exists('b:current_syntax') && b:current_syntax == 'json5' if exists('b:current_syntax') && b:current_syntax == 'json5'
finish finish
endif endif
" Syntax: Strings {{{1 " Numbers
syn region json5String start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=json5Escape syn match json5Number "[-+]\=\%(0\|[1-9]\d*\)\%(\.\d*\)\=\%([eE][-+]\=\d\+\)\="
syn region json5String start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=json5Escape syn match json5Number "[-+]\=\%(\.\d\+\)\%([eE][-+]\=\d\+\)\="
syn match json5Number "[-+]\=0[xX]\x*"
syn match json5Number "[-+]\=Infinity\|NaN"
" Syntax: Escape sequences " An integer part of 0 followed by other digits is not allowed
syn match json5Escape "\\["\\/bfnrt]" contained syn match json5NumError "[-+]\=0\d\(\d\|\.\)*"
" A hexadecimal number cannot have a fractional part
syn match json5NumError "[-+]\=0x\x*\.\x*"
" Strings
syn region json5String start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=json5Escape,@Spell
syn region json5String start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=json5Escape,@Spell
" Escape sequences
syn match json5Escape "\\['\"\\bfnrtv]" contained
syn match json5Escape "\\u\x\{4}" contained syn match json5Escape "\\u\x\{4}" contained
" Syntax: Numbers {{{1 " Boolean
syn match json5Number "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>"
syn keyword json5Number Infinity -Infinity
" Syntax: An integer part of 0 followed by other digits is not allowed.
syn match json5NumError "-\=\<0\d\.\d*\>"
" Syntax: Boolean {{{1
syn keyword json5Boolean true false syn keyword json5Boolean true false
" Syntax: Null {{{1 " Null
syn keyword json5Null null syn keyword json5Null null
" Syntax: Braces {{{1 " Delimiters and Operators
syn match json5Delimiter ","
syn match json5Operator ":"
" Braces
syn match json5Braces "[{}\[\]]" syn match json5Braces "[{}\[\]]"
syn match json5ObjAssign /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/
" Syntax: Comment {{{1 " Keys
syn region json5LineComment start=+\/\/+ end=+$+ keepend syn match json5Key /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/ contains=@Spell
syn region json5LineComment start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend fold syn match json5Key /"\([^"]\|\\"\)\{-}"\ze\s*:/ contains=json5Escape,@Spell
syn region json5Comment start="/\*" end="\*/" fold
" Define the default highlighting. {{{1 " Comment
syn region json5LineComment start=+\/\/+ end=+$+ keepend contains=@Spell
syn region json5LineComment start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend fold contains=@Spell
syn region json5Comment start="/\*" end="\*/" fold contains=@Spell
" Define the default highlighting
hi def link json5String String hi def link json5String String
hi def link json5ObjAssign Identifier hi def link json5Key Identifier
hi def link json5Escape Special hi def link json5Escape Special
hi def link json5Number Number hi def link json5Number Number
hi def link json5Braces Operator hi def link json5Delimiter Delimiter
hi def link json5Null Function hi def link json5Operator Operator
hi def link json5Braces Delimiter
hi def link json5Null Keyword
hi def link json5Boolean Boolean hi def link json5Boolean Boolean
hi def link json5LineComment Comment hi def link json5LineComment Comment
hi def link json5Comment Comment hi def link json5Comment Comment
@ -53,4 +69,3 @@ if !exists('b:current_syntax')
let b:current_syntax = 'json5' let b:current_syntax = 'json5'
endif endif
" vim: fdm=marker

View File

@ -66,16 +66,16 @@ let s:nonidS_chars = "[:space:])\\U5D}" . s:nonid_chars
" the following excludes '!' since it can be used as an identifier, " the following excludes '!' since it can be used as an identifier,
" and '$' since it can be used in interpolations " and '$' since it can be used in interpolations
" note that \U2D is '-' " note that \U2D is '-'
let s:uniop_chars = "+\\U2D~¬√∛∜" let s:uniop_chars = "+\\U2D~¬√∛∜"
let s:binop_chars = "=+\\U2D*/\\%÷^&|⊻<>≤≥≡≠≢∈∉⋅×∪∩⊆⊈⊂⊄⊊←→∋∌⊕⊖⊞⊟∘∧⊗⊘↑↓∨⊠±" let s:binop_chars = "=+\\U2D*/\\%÷^&|⊻<>≤≥≡≠≢∈∉⋅×∪∩⊆⊈⊂⊄⊊←→∋∌⊕⊖⊞⊟∘∧⊗⊘↑↓∨⊠±⟂⋆"
" the following is a list of all remainig valid operator chars, " the following is a list of all remainig valid operator chars,
" but it's more efficient when expressed with ranges (see below) " but it's more efficient when expressed with ranges (see below)
" let s:binop_chars_extra = "↔↚↛↠↣↦↮⇎⇏⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌←→" . " let s:binop_chars_extra = "↔↚↛↠↣↦↮⇎⇏⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌←→" .
" \ "∝∊∍∥∦∷∺∻∽∾≁≃≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≔≕≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩴⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣" . " \ "∝∊∍∥∦∷∺∻∽∾≁≃≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≔≕≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩴⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣" .
" \ "⊔∓∔∸≂≏⊎⊽⋎⋓⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣" . " \ "⊔∓∔∸≂≏⊎⊽⋎⋓⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣" .
" \ "⊙⊚⊛⊡⊓∗∙∤⅋≀⊼⋄⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗" . " \ "⊙⊚⊛⊡⊓∗∙∤⅋≀⊼⋄⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗" .
" \ "⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯↑↓" " \ "⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯↑↓"
" same as above, but with character ranges, for performance " same as above, but with character ranges, for performance

View File

@ -103,7 +103,7 @@ syn match htmlH2 /^.\+\n-\+$/ contains=mkdLink,mkdInlineURL,@Spell
syn match mkdLineBreak / \+$/ syn match mkdLineBreak / \+$/
syn region mkdBlockquote start=/^\s*>/ end=/$/ contains=mkdLink,mkdInlineURL,mkdLineBreak,@Spell syn region mkdBlockquote start=/^\s*>/ end=/$/ contains=mkdLink,mkdInlineURL,mkdLineBreak,@Spell
execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/`/' . s:concealcode execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/`/' . s:concealcode
execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!``/ skip=/[^`]`[^`]/ end=/\(\([^\\]\|^\)\\\)\@<!``/' . s:concealcode execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!``/ skip=/[^`]`[^`]/ end=/``/' . s:concealcode
execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(`\{3,}\)[^`]*$/ end=/^\s*\z1`*\s*$/' . s:concealcode execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(`\{3,}\)[^`]*$/ end=/^\s*\z1`*\s*$/' . s:concealcode
execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!\~\~/ end=/\(\([^\\]\|^\)\\\)\@<!\~\~/' . s:concealcode execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!\~\~/ end=/\(\([^\\]\|^\)\\\)\@<!\~\~/' . s:concealcode
execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(\~\{3,}\)\s*[0-9A-Za-z_+-]*\s*$/ end=/^\s*\z1\~*\s*$/' . s:concealcode execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(\~\{3,}\)\s*[0-9A-Za-z_+-]*\s*$/ end=/^\s*\z1\~*\s*$/' . s:concealcode

View File

@ -69,7 +69,7 @@ endfunction
com! -nargs=* SynFold call s:run_syntax_fold(<q-args>) com! -nargs=* SynFold call s:run_syntax_fold(<q-args>)
" Not-Top Cluster {{{1 " Not-Top Cluster {{{1
syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyParentheses
" Whitespace Errors {{{1 " Whitespace Errors {{{1
if exists("ruby_space_errors") if exists("ruby_space_errors")
@ -82,19 +82,38 @@ if exists("ruby_space_errors")
endif endif
" Operators {{{1 " Operators {{{1
if exists("ruby_operators")
syn match rubyEnglishBooleanOperator "\<\%(and\|or\|not\)\>"
if exists("ruby_operators") || exists("ruby_pseudo_operators")
syn match rubyDotOperator "\.\|&\." syn match rubyDotOperator "\.\|&\."
syn match rubyTernaryOperator "\%(\w\|[^\x00-\x7F]\)\@1<!?\|:" syn match rubyTernaryOperator "\%(\w\|[^\x00-\x7F]\)\@1<!?\|:"
syn match rubyArithmeticOperator "\*\*\|[*/%+]\|->\@!" syn match rubyArithmeticOperator "\*\*\|[*/%+]\|->\@!"
syn match rubyComparisonOperator "<=>\|<=\|\%(<\|\<class\s\+\u\w*\s*\)\@<!<<\@!\|>=\|[-=]\@1<!>" syn match rubyComparisonOperator "<=>\|<=\|<\|>=\|[-=]\@1<!>"
syn match rubyBitwiseOperator "[~^|]\|&\.\@!\|\%(class\s*\)\@<!<<\|>>" syn match rubyBitwiseOperator "[~^|]\|&\.\@!\|<<\|>>"
syn match rubyBooleanOperator "\%(\w\|[^\x00-\x7F]\)\@1<!!\|&&\|||" syn match rubyBooleanOperator "\%(\w\|[^\x00-\x7F]\)\@1<!!\|&&\|||"
syn match rubyRangeOperator "\.\.\.\=" syn match rubyRangeOperator "\.\.\.\="
syn match rubyAssignmentOperator "=>\@!\|-=\|/=\|\*\*=\|\*=\|&&=\|&=\|||=\||=\|%=\|+=\|>>=\|<<=\|\^=" syn match rubyAssignmentOperator "=>\@!\|-=\|/=\|\*\*=\|\*=\|&&=\|&=\|||=\||=\|%=\|+=\|>>=\|<<=\|\^="
syn match rubyAssignmentOperator "=>\@!" containedin=rubyBlockParameterList " TODO: this is inelegant
syn match rubyEqualityOperator "===\|==\|!=\|!\~\|=\~" syn match rubyEqualityOperator "===\|==\|!=\|!\~\|=\~"
syn match rubyScopeOperator "::"
syn region rubyBracketOperator matchgroup=rubyOperator start="\%(\%(\w\|[^\x00-\x7F]\)[?!]\=\|[]})]\)\@2<=\[" end="]" contains=ALLBUT,@rubyNotTop syn region rubyBracketOperator matchgroup=rubyOperator start="\%(\%(\w\|[^\x00-\x7F]\)[?!]\=\|[]})]\)\@2<=\[" end="]" contains=ALLBUT,@rubyNotTop
syn match rubyScopeOperator "::"
syn match rubySuperClassOperator "<" contained
syn match rubyEigenClassOperator "<<" contained
syn match rubyLambdaOperator "->"
syn match rubySplatOperator "\%([[{(|,=]\_s*\)\@<=\*"
syn match rubySplatOperator "\%(^\|\s\)\@1<=\*\%(\h\|[^\x00-\x7F]\|[:$@[]\)\@="
syn match rubyDoubleSplatOperator "\%([{(|,]\_s*\)\@<=\*\*"
syn match rubyDoubleSplatOperator "\s\@1<=\*\*\%(\h\|[^\x00-\x7F]\|[:$@{]\)\@="
syn match rubyProcOperator "\%([[(|,]\_s*\)\@<=&"
syn match rubyProcOperator "\s\@1<=&\%(\h\|[^\x00-\x7F]\|[:$@]\|->\)\@="
syn cluster rubyProperOperator contains=rubyTernaryOperator,rubyArithmeticOperator,rubyComparisonOperator,rubyBitwiseOperator,rubyBooleanOperator,rubyRangeOperator,rubyAssignmentOperator,rubyEqualityOperator,rubyDefinedOperator,rubyEnglishBooleanOperator
syn cluster rubyClassOperator contains=rubyEigenClassOperator,rubySuperClassOperator
syn cluster rubyPseudoOperator contains=rubyDotOperator,rubyScopeOperator,rubyEigenClassOperator,rubySuperClassOperator,rubyLambdaOperator,rubySplatOperator,rubyDoubleSplatOperator,rubyProcOperator
syn cluster rubyOperator contains=ruby.*Operator syn cluster rubyOperator contains=ruby.*Operator
endif endif
@ -160,9 +179,6 @@ syn match rubyFloat "\%(\%(\w\|[^\x00-\x7F]\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-
syn match rubyFloat "\%(\%(\w\|[^\x00-\x7F]\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-9]\d*\%(_\d\+\)*\)\%(\.\d\+\%(_\d\+\)*\)\=\%([eE][-+]\=\d\+\%(_\d\+\)*\)i\=\>" display syn match rubyFloat "\%(\%(\w\|[^\x00-\x7F]\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-9]\d*\%(_\d\+\)*\)\%(\.\d\+\%(_\d\+\)*\)\=\%([eE][-+]\=\d\+\%(_\d\+\)*\)i\=\>" display
" Identifiers {{{1 " Identifiers {{{1
syn match rubyLocalVariableOrMethod "\<[_[:lower:]][_[:alnum:]]*[?!]\=" contains=NONE display transparent
syn match rubyBlockArgument "&[_[:lower:]][_[:alnum:]]" contains=NONE display transparent
syn match rubyClassName "\%(\%(^\|[^.]\)\.\s*\)\@<!\<[[:upper:]]\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!" contained syn match rubyClassName "\%(\%(^\|[^.]\)\.\s*\)\@<!\<[[:upper:]]\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!" contained
syn match rubyModuleName "\%(\%(^\|[^.]\)\.\s*\)\@<!\<[[:upper:]]\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!" contained syn match rubyModuleName "\%(\%(^\|[^.]\)\.\s*\)\@<!\<[[:upper:]]\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!" contained
syn match rubyConstant "\%(\%(^\|[^.]\)\.\s*\)\@<!\<[[:upper:]]\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!" syn match rubyConstant "\%(\%(^\|[^.]\)\.\s*\)\@<!\<[[:upper:]]\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!"
@ -180,8 +196,8 @@ SynFold ':' syn region rubySymbol matchgroup=rubySymbolDelimiter start="[]})\"':
syn match rubyCapitalizedMethod "\%(\%(^\|[^.]\)\.\s*\)\@<!\<\u\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@=" syn match rubyCapitalizedMethod "\%(\%(^\|[^.]\)\.\s*\)\@<!\<\u\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@="
syn match rubyBlockParameter "\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*" contained syn region rubyParentheses start="(" end=")" contains=ALLBUT,@rubyNotTop containedin=rubyBlockParameterList
syn region rubyBlockParameterList start="\%(\%(\<do\>\|{\)\_s*\)\@32<=|" end="|" oneline display contains=rubyBlockParameter syn region rubyBlockParameterList start="\%(\%(\<do\>\|{\)\_s*\)\@32<=|" end="|" contains=ALLBUT,@rubyNotTop,@rubyProperOperator
if exists('ruby_global_variable_error') if exists('ruby_global_variable_error')
syn match rubyGlobalVariableError "$[^A-Za-z_]" display syn match rubyGlobalVariableError "$[^A-Za-z_]" display
@ -283,9 +299,9 @@ SynFold '%' syn region rubySymbol matchgroup=rubyPercentSymbolDelimiter start="%
SynFold '%' syn region rubySymbol matchgroup=rubyPercentSymbolDelimiter start="%i(" end=")" skip="\\\\\|\\)" contains=rubyBackslashEscape,rubySpaceEscape,rubyParenthesisEscape,rubyNestedParentheses SynFold '%' syn region rubySymbol matchgroup=rubyPercentSymbolDelimiter start="%i(" end=")" skip="\\\\\|\\)" contains=rubyBackslashEscape,rubySpaceEscape,rubyParenthesisEscape,rubyNestedParentheses
" Generalized Double Quoted Strings, Array of Strings, Array of Symbols and Shell Command Output {{{1 " Generalized Double Quoted Strings, Array of Strings, Array of Symbols and Shell Command Output {{{1
" Note: %= is not matched here as the beginning of a double quoted string SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="\%(\%(\w\|[^\x00-\x7F]\|]\)\s*\)\@<!%=" end="=" skip="\\\\\|\\=" contains=@rubyStringSpecial nextgroup=@rubyModifier skipwhite
SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial nextgroup=@rubyModifier skipwhite SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial nextgroup=@rubyModifier skipwhite
SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial nextgroup=@rubyModifier skipwhite
SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\={" end="}" skip="\\\\\|\\}" contains=@rubyStringSpecial,rubyNestedCurlyBraces SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\={" end="}" skip="\\\\\|\\}" contains=@rubyStringSpecial,rubyNestedCurlyBraces
SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\=<" end=">" skip="\\\\\|\\>" contains=@rubyStringSpecial,rubyNestedAngleBrackets SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\=<" end=">" skip="\\\\\|\\>" contains=@rubyStringSpecial,rubyNestedAngleBrackets
SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\=\[" end="\]" skip="\\\\\|\\\]" contains=@rubyStringSpecial,rubyNestedSquareBrackets SynFold '%' syn region rubyString matchgroup=rubyPercentStringDelimiter start="%[QWx]\=\[" end="\]" skip="\\\\\|\\\]" contains=@rubyStringSpecial,rubyNestedSquareBrackets
@ -300,6 +316,7 @@ SynFold '%' syn region rubySymbol matchgroup=rubyPercentSymbolDelimiter start="%
" Here Documents {{{1 " Here Documents {{{1
syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs\%(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)+ end=+$+ oneline contains=ALLBUT,@rubyNotTop syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs\%(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs"\%([^"]*\)"+ end=+$+ oneline contains=ALLBUT,@rubyNotTop syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs"\%([^"]*\)"+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs'\%([^']*\)'+ end=+$+ oneline contains=ALLBUT,@rubyNotTop syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs'\%([^']*\)'+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs`\%([^`]*\)`+ end=+$+ oneline contains=ALLBUT,@rubyNotTop syn region rubyHeredocStart matchgroup=rubyHeredocDelimiter start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([]})"'`]\)\s\|\w\)\@<!<<[-~]\=\zs`\%([^`]*\)`+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
@ -318,24 +335,23 @@ SynFold '<<' syn region rubyString start=+\%(\%(class\|::\|\.\@1<!\.\)\_s*\|\%([
syn match rubyAliasDeclaration "[^[:space:];#.()]\+" contained contains=rubySymbol,@rubyGlobalVariable nextgroup=rubyAliasDeclaration2 skipwhite syn match rubyAliasDeclaration "[^[:space:];#.()]\+" contained contains=rubySymbol,@rubyGlobalVariable nextgroup=rubyAliasDeclaration2 skipwhite
syn match rubyAliasDeclaration2 "[^[:space:];#.()]\+" contained contains=rubySymbol,@rubyGlobalVariable syn match rubyAliasDeclaration2 "[^[:space:];#.()]\+" contained contains=rubySymbol,@rubyGlobalVariable
syn match rubyMethodDeclaration "[^[:space:];#(]\+" contained contains=rubyConstant,rubyBoolean,rubyPseudoVariable,rubyInstanceVariable,rubyClassVariable,rubyGlobalVariable syn match rubyMethodDeclaration "[^[:space:];#(]\+" contained contains=rubyConstant,rubyBoolean,rubyPseudoVariable,rubyInstanceVariable,rubyClassVariable,rubyGlobalVariable
syn match rubyClassDeclaration "[^[:space:];#<]\+" contained contains=rubyClassName,rubyOperator syn match rubyClassDeclaration "[^[:space:];#<]\+" contained contains=rubyClassName,rubyScopeOperator nextgroup=rubySuperClassOperator skipwhite skipnl
syn match rubyModuleDeclaration "[^[:space:];#<]\+" contained contains=rubyModuleName,rubyOperator syn match rubyModuleDeclaration "[^[:space:];#<]\+" contained contains=rubyModuleName,rubyScopeOperator
syn match rubyMethodName "\<\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%([[:alnum:]_.:?!=]\|[^\x00-\x7F]\)\@!" contained containedin=rubyMethodDeclaration syn match rubyMethodName "\<\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%([[:alnum:]_.:?!=]\|[^\x00-\x7F]\)\@!" contained containedin=rubyMethodDeclaration
syn match rubyMethodName "\%(\s\|^\)\@1<=\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%(\s\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2 syn match rubyMethodName "\%(\s\|^\)\@1<=\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%(\s\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2
syn match rubyMethodName "\%([[:space:].]\|^\)\@1<=\%(\[\]=\=\|\*\*\|[-+!~]@\=\|[*/%|&^~]\|<<\|>>\|[<>]=\=\|<=>\|===\|[=!]=\|[=!]\~\|!\|`\)\%([[:space:];#(]\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration syn match rubyMethodName "\%([[:space:].]\|^\)\@1<=\%(\[\]=\=\|\*\*\|[-+!~]@\=\|[*/%|&^~]\|<<\|>>\|[<>]=\=\|<=>\|===\|[=!]=\|[=!]\~\|!\|`\)\%([[:space:];#(]\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration
syn cluster rubyDeclaration contains=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration,rubyModuleDeclaration,rubyClassDeclaration,rubyMethodName,rubyBlockParameter syn cluster rubyDeclaration contains=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration,rubyModuleDeclaration,rubyClassDeclaration,rubyMethodName
" Keywords {{{1 " Keywords {{{1
" Note: the following keywords have already been defined: " TODO: reorganise
" begin case class def do end for if module unless until while syn match rubyControl "\%#=1\<\%(break\|in\|next\|redo\|retry\|return\)\>"
syn match rubyControl "\<\%(and\|break\|in\|next\|not\|or\|redo\|retry\|return\)\>" syn match rubyKeyword "\%#=1\<\%(super\|yield\)\>"
syn match rubyKeyword "\<\%(super\|yield\)\>" syn match rubyBoolean "\%#=1\<\%(true\|false\)\>[?!]\@!"
syn match rubyBoolean "\<\%(true\|false\)\>[?!]\@!" syn match rubyPseudoVariable "\%#=1\<\(self\|nil\)\>[?!]\@!"
syn match rubyPseudoVariable "\<\(self\|nil\)\>[?!]\@!" syn match rubyPseudoVariable "\%#=1\<__\%(ENCODING\|dir\|FILE\|LINE\|callee\|method\)__\>"
syn match rubyPseudoVariable "\<__\%(ENCODING\|dir\|FILE\|LINE\|callee\|method\)__\>" syn match rubyBeginEnd "\%#=1\<\%(BEGIN\|END\)\>"
syn match rubyBeginEnd "\<\%(BEGIN\|END\)\>"
" Expensive Mode {{{1 " Expensive Mode {{{1
" Match 'end' with the appropriate opening keyword for syntax based folding " Match 'end' with the appropriate opening keyword for syntax based folding
@ -344,12 +360,12 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
syn match rubyDefine "\<alias\>" nextgroup=rubyAliasDeclaration skipwhite skipnl syn match rubyDefine "\<alias\>" nextgroup=rubyAliasDeclaration skipwhite skipnl
syn match rubyDefine "\<def\>" nextgroup=rubyMethodDeclaration skipwhite skipnl syn match rubyDefine "\<def\>" nextgroup=rubyMethodDeclaration skipwhite skipnl
syn match rubyDefine "\<undef\>" nextgroup=rubyMethodName skipwhite skipnl syn match rubyDefine "\<undef\>" nextgroup=rubyMethodName skipwhite skipnl
syn match rubyClass "\<class\>" nextgroup=rubyClassDeclaration skipwhite skipnl syn match rubyClass "\<class\>" nextgroup=rubyClassDeclaration,rubyEigenClassOperator skipwhite skipnl
syn match rubyModule "\<module\>" nextgroup=rubyModuleDeclaration skipwhite skipnl syn match rubyModule "\<module\>" nextgroup=rubyModuleDeclaration skipwhite skipnl
SynFold 'def' syn region rubyMethodBlock start="\<def\>" matchgroup=rubyDefine end="\%(\<def\_s\+\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'def' syn region rubyMethodBlock start="\<def\>" matchgroup=rubyDefine skip="\<end:\|\%(\<def\_s\+\)\@<=end\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
SynFold 'class' syn region rubyClassBlock start="\<class\>" matchgroup=rubyClass end="\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'class' syn region rubyClassBlock start="\<class\>" matchgroup=rubyClass skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop
SynFold 'module' syn region rubyModuleBlock start="\<module\>" matchgroup=rubyModule end="\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'module' syn region rubyModuleBlock start="\<module\>" matchgroup=rubyModule skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop
" modifiers " modifiers
syn match rubyLineContinuation "\\$" nextgroup=@rubyModifier skipwhite skipnl syn match rubyLineContinuation "\\$" nextgroup=@rubyModifier skipwhite skipnl
@ -359,29 +375,29 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
syn cluster rubyModifier contains=rubyConditionalModifier,rubyRepeatModifier,rubyRescueModifier syn cluster rubyModifier contains=rubyConditionalModifier,rubyRepeatModifier,rubyRescueModifier
SynFold 'do' syn region rubyDoBlock matchgroup=rubyControl start="\<do\>" end="\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'do' syn region rubyDoBlock matchgroup=rubyControl start="\<do\>" skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop
" curly bracket block or hash literal " curly bracket block or hash literal
SynFold '{' syn region rubyCurlyBlock matchgroup=rubyCurlyBlockDelimiter start="{" end="}" contains=ALLBUT,@rubyNotTop SynFold '{' syn region rubyCurlyBlock matchgroup=rubyCurlyBlockDelimiter start="{" end="}" contains=ALLBUT,@rubyNotTop
SynFold '[' syn region rubyArrayLiteral matchgroup=rubyArrayDelimiter start="\%(\%(\w\|[^\x00-\x7F]\)[?!]\=\|[]})]\)\@2<!\[" end="]" contains=ALLBUT,@rubyNotTop SynFold '[' syn region rubyArrayLiteral matchgroup=rubyArrayDelimiter start="\%(\%(\w\|[^\x00-\x7F]\)[?!]\=\|[]})]\)\@2<!\[" end="]" contains=ALLBUT,@rubyNotTop
" statements without 'do' " statements without 'do'
SynFold 'begin' syn region rubyBlockExpression matchgroup=rubyControl start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'begin' syn region rubyBlockExpression matchgroup=rubyControl start="\<begin\>" skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop
SynFold 'case' syn region rubyCaseExpression matchgroup=rubyConditional start="\<case\>" end="\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'case' syn region rubyCaseExpression matchgroup=rubyConditional start="\<case\>" skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop
SynFold 'if' syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\<then\s\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" end="\%(\%(\%(\.\@1<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop SynFold 'if' syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\<then\s\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop
syn match rubyConditional "\<\%(then\|else\|when\)\>" contained containedin=rubyCaseExpression syn match rubyConditional "\<\%(then\|else\|when\)\>" contained containedin=rubyCaseExpression
syn match rubyConditional "\<\%(then\|else\|elsif\)\>" contained containedin=rubyConditionalExpression syn match rubyConditional "\<\%(then\|else\|elsif\)\>" contained containedin=rubyConditionalExpression
syn match rubyExceptionHandler "\<\%(\%(\%(;\|^\)\s*\)\@<=rescue\|else\|ensure\)\>" contained containedin=rubyBlockExpression,rubyDoBlock syn match rubyExceptionHandler "\<\%(\%(\%(;\|^\)\s*\)\@<=rescue\|else\|ensure\)\>" contained containedin=rubyBlockExpression,rubyDoBlock
syn match rubyExceptionHandler1 "\<\%(\%(\%(;\|^\)\s*\)\@<=rescue\|else\|ensure\)\>" contained containedin=rubyModuleBlock,rubyClassBlock,rubyMethodBlock syn match rubyExceptionHandler2 "\<\%(\%(\%(;\|^\)\s*\)\@<=rescue\|else\|ensure\)\>" contained containedin=rubyModuleBlock,rubyClassBlock,rubyMethodBlock
syn cluster rubyExceptionHandler contains=rubyExceptionHandler,rubyExceptionHandler1 syn cluster rubyExceptionHandler contains=rubyExceptionHandler,rubyExceptionHandler2
" statements with optional 'do' " statements with optional 'do'
syn region rubyOptionalDoLine matchgroup=rubyRepeat start="\<for\>" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![!?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyOptionalDo end="\<do\>" end="\ze\%(;\|$\)" oneline contains=ALLBUT,@rubyNotTop syn region rubyOptionalDoLine matchgroup=rubyRepeat start="\<for\>" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![!?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyOptionalDo end="\<do\>" end="\ze\%(;\|$\)" oneline contains=ALLBUT,@rubyNotTop
SynFold 'for' syn region rubyRepeatExpression start="\<for\>" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![!?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine SynFold 'for' syn region rubyRepeatExpression start="\<for\>" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![!?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine
if !exists("ruby_minlines") if !exists("ruby_minlines")
let ruby_minlines = 500 let ruby_minlines = 500
@ -398,19 +414,20 @@ endif
" Special Methods {{{1 " Special Methods {{{1
if !exists("ruby_no_special_methods") if !exists("ruby_no_special_methods")
syn match rubyAccess "\<\%(public\|protected\|private\)\>" syn match rubyAccess "\<\%(public\|protected\|private\)\>" " use re=2
syn match rubyAccess "\<\%(public_class_method\|private_class_method\)\>" syn match rubyAccess "\%#=1\<\%(public\|private\)_class_method\>"
syn match rubyAccess "\<\%(public_constant\|private_constant\)\>" syn match rubyAccess "\%#=1\<\%(public\|private\)_constant\>"
syn match rubyAccess "\<module_function\>" syn match rubyAccess "\%#=1\<module_function\>"
syn match rubyAttribute "\%(\%(^\|;\)\s*\)\@<=attr\>\(\s*[.=]\)\@!" " attr is a common variable name syn match rubyAttribute "\%#=1\%(\%(^\|;\)\s*\)\@<=attr\>\(\s*[.=]\)\@!" " attr is a common variable name
syn match rubyAttribute "\<\%(attr_accessor\|attr_reader\|attr_writer\)\>" syn match rubyAttribute "\%#=1\<attr_\%(accessor\|reader\|writer\)\>"
syn match rubyControl "\<\%(abort\|at_exit\|exit\|fork\|loop\|trap\)\>" syn match rubyControl "\%#=1\<\%(abort\|at_exit\|exit\|fork\|loop\|trap\)\>"
syn match rubyEval "\<\%(eval\|class_eval\|instance_eval\|module_eval\)\>" syn match rubyEval "\%#=1\<eval\>"
syn match rubyException "\<\%(raise\|fail\|catch\|throw\)\>" syn match rubyEval "\%#=1\<\%(class\|instance\|module\)_eval\>"
syn match rubyInclude "\<\%(autoload\|gem\|load\|require\|require_relative\)\>" syn match rubyException "\%#=1\<\%(raise\|fail\|catch\|throw\)\>"
syn match rubyKeyword "\<\%(callcc\|caller\|lambda\|proc\)\>" syn match rubyInclude "\%#=1\<\%(autoload\|gem\|load\|require\%(_relative\)\=\)\>"
syn match rubyMacro "\<\%(extend\|include\|prepend\|refine\|using\)\>" syn match rubyKeyword "\%#=1\<\%(callcc\|caller\|lambda\|proc\)\>"
syn match rubyMacro "\<\%(alias_method\|define_method\|define_singleton_method\|remove_method\|undef_method\)\>" syn match rubyMacro "\%#=1\<\%(extend\|include\|prepend\|refine\|using\)\>"
syn match rubyMacro "\%#=1\<\%(alias\|define\|define_singleton\|remove\|undef\)_method\>"
endif endif
" Comments and Documentation {{{1 " Comments and Documentation {{{1
@ -436,21 +453,20 @@ syn match rubyUselessLineContinuation "\%([.:,;{([<>~\*%&^|+=-]\|%(\%(\w\|[^\x00
syn match rubyUselessLineContinuation "\\$" nextgroup=rubyUselessLineContinuation skipwhite skipempty contained syn match rubyUselessLineContinuation "\\$" nextgroup=rubyUselessLineContinuation skipwhite skipempty contained
" Keyword Nobbling {{{1 " Keyword Nobbling {{{1
" prevent methods with keyword names (and possible ?! suffixes) being highlighted as keywords when called " prevent methods with keyword names being highlighted as keywords when called
syn match rubyKeywordAsMethod "\%(\%(\.\@1<!\.\)\|&\.\|::\)\_s*\%([_[:lower:]][_[:alnum:]]*\|\%(BEGIN\|END\)\>\)" transparent contains=rubyDotOperator,rubyScopeOperator syn match rubyKeywordAsMethod "\%(\%(\.\@1<!\.\)\|&\.\|::\)\_s*\%([_[:lower:]][_[:alnum:]]*\|\%(BEGIN\|END\)\>\)" transparent contains=rubyDotOperator,rubyScopeOperator
syn match rubyKeywordAsMethod "\<[_[:lower:]][_[:alnum:]]*[?!]" transparent contains=NONE
" Bang/Predicate Special Methods and Operators {{{1 " Bang and Predicate Methods and Operators {{{1
syn match rubyBangPredicateMethod "\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]"
if !exists("ruby_no_special_methods") if !exists("ruby_no_special_methods")
syn match rubyControl "\<exit!" display syn match rubyControl "\%#=1\<exit!" display
endif endif
syn match rubyOperator "\<defined?" display syn match rubyDefinedOperator "\%#=1\<defined?" display
" More Symbols {{{1 " 1.9-style Hash Keys and Keyword Parameters {{{1
syn match rubySymbol "\%([{(,]\_s*\)\@<=\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!=]\=::\@!"he=e-1 syn match rubySymbol "\%([{(|,]\_s*\)\@<=\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]\=::\@!"he=e-1
syn match rubySymbol "[]})\"':]\@1<!\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],]\@="he=e-1 syn match rubySymbol "[]})\"':]\@1<!\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],;]\@="he=e-1
syn match rubySymbol "\%([{(,]\_s*\)\@<=[[:space:],{]\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!=]\=::\@!"hs=s+1,he=e-1
syn match rubySymbol "[[:space:],{(]\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],]\@="hs=s+1,he=e-1
" __END__ Directive {{{1 " __END__ Directive {{{1
SynFold '__END__' syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$" SynFold '__END__' syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$"
@ -458,7 +474,7 @@ SynFold '__END__' syn region rubyData matchgroup=rubyDataDirective start="^__END
" Default Highlighting {{{1 " Default Highlighting {{{1
hi def link rubyClass rubyDefine hi def link rubyClass rubyDefine
hi def link rubyModule rubyDefine hi def link rubyModule rubyDefine
hi def link rubyExceptionHandler1 rubyDefine hi def link rubyExceptionHandler2 rubyDefine
hi def link rubyDefine Define hi def link rubyDefine Define
hi def link rubyAccess rubyMacro hi def link rubyAccess rubyMacro
hi def link rubyAttribute rubyMacro hi def link rubyAttribute rubyMacro
@ -497,21 +513,35 @@ hi def link rubySymbol Constant
hi def link rubyKeyword Keyword hi def link rubyKeyword Keyword
hi def link rubyOperator Operator hi def link rubyOperator Operator
hi def link rubyDotOperator Operator hi def link rubyDefinedOperator rubyOperator
hi def link rubyTernaryOperator Operator hi def link rubyEnglishBooleanOperator rubyOperator
hi def link rubyArithmeticOperator Operator if exists("ruby_operators")
hi def link rubyComparisonOperator Operator hi def link rubyTernaryOperator rubyOperator
hi def link rubyBitwiseOperator Operator hi def link rubyArithmeticOperator rubyOperator
hi def link rubyBooleanOperator Operator hi def link rubyComparisonOperator rubyOperator
hi def link rubyRangeOperator Operator hi def link rubyBitwiseOperator rubyOperator
hi def link rubyAssignmentOperator Operator hi def link rubyBooleanOperator rubyOperator
hi def link rubyEqualityOperator Operator hi def link rubyRangeOperator rubyOperator
hi def link rubyScopeOperator Operator hi def link rubyAssignmentOperator rubyOperator
hi def link rubyEqualityOperator rubyOperator
endif
if exists("ruby_pseudo_operators")
hi def link rubyPseudoOperator Special
hi def link rubyDotOperator rubyPseudoOperator
hi def link rubyScopeOperator rubyPseudoOperator
hi def link rubySuperClassOperator rubyPseudoOperator
hi def link rubyEigenClassOperator rubyPseudoOperator
hi def link rubyLambdaOperator rubyPseudoOperator
hi def link rubyDoubleSplatOperator rubyPseudoOperator
hi def link rubySplatOperator rubyPseudoOperator
hi def link rubyProcOperator rubyPseudoOperator
endif
hi def link rubyBeginEnd Statement hi def link rubyBeginEnd Statement
hi def link rubyEval Statement hi def link rubyEval Statement
hi def link rubyPseudoVariable Constant hi def link rubyPseudoVariable Constant
hi def link rubyCapitalizedMethod rubyLocalVariableOrMethod hi def link rubyCapitalizedMethod NONE
hi def link rubyComment Comment hi def link rubyComment Comment
hi def link rubyEncoding Constant hi def link rubyEncoding Constant

View File

@ -21,15 +21,21 @@ syn keyword terraValueBool true false on off yes no
""" data """ data
syn keyword terraDataTypeBI syn keyword terraDataTypeBI
\ alicloud_account \ alicloud_account
\ alicloud_actiontrails
\ alicloud_api_gateway_apis \ alicloud_api_gateway_apis
\ alicloud_api_gateway_apps \ alicloud_api_gateway_apps
\ alicloud_api_gateway_groups \ alicloud_api_gateway_groups
\ alicloud_cas_certificates
\ alicloud_cen_bandwidth_limits \ alicloud_cen_bandwidth_limits
\ alicloud_cen_bandwidth_packages \ alicloud_cen_bandwidth_packages
\ alicloud_cen_instances \ alicloud_cen_instances
\ alicloud_cen_region_route_entries \ alicloud_cen_region_route_entries
\ alicloud_cen_route_entries \ alicloud_cen_route_entries
\ alicloud_common_bandwidth_packages
\ alicloud_cr_namespaces
\ alicloud_cr_repos
\ alicloud_cs_kubernetes_clusters \ alicloud_cs_kubernetes_clusters
\ alicloud_cs_managed_kubernetes_clusters
\ alicloud_db_instances \ alicloud_db_instances
\ alicloud_disks \ alicloud_disks
\ alicloud_dns_domain_groups \ alicloud_dns_domain_groups
@ -37,11 +43,13 @@ syn keyword terraDataTypeBI
\ alicloud_dns_domains \ alicloud_dns_domains
\ alicloud_dns_groups \ alicloud_dns_groups
\ alicloud_dns_records \ alicloud_dns_records
\ alicloud_drds_instances
\ alicloud_eips \ alicloud_eips
\ alicloud_elasticsearch_instances \ alicloud_elasticsearch_instances
\ alicloud_fc_functions \ alicloud_fc_functions
\ alicloud_fc_services \ alicloud_fc_services
\ alicloud_fc_triggers \ alicloud_fc_triggers
\ alicloud_forward_entries
\ alicloud_images \ alicloud_images
\ alicloud_instance_types \ alicloud_instance_types
\ alicloud_instances \ alicloud_instances
@ -52,6 +60,11 @@ syn keyword terraDataTypeBI
\ alicloud_mns_topic_subscriptions \ alicloud_mns_topic_subscriptions
\ alicloud_mns_topics \ alicloud_mns_topics
\ alicloud_mongo_instances \ alicloud_mongo_instances
\ alicloud_nas_access_groups
\ alicloud_nas_access_rules
\ alicloud_nas_file_systems
\ alicloud_nas_mount_targets
\ alicloud_nat_gateways
\ alicloud_network_interfaces \ alicloud_network_interfaces
\ alicloud_oss_bucket_objects \ alicloud_oss_bucket_objects
\ alicloud_oss_buckets \ alicloud_oss_buckets
@ -64,6 +77,8 @@ syn keyword terraDataTypeBI
\ alicloud_ram_roles \ alicloud_ram_roles
\ alicloud_ram_users \ alicloud_ram_users
\ alicloud_regions \ alicloud_regions
\ alicloud_route_entries
\ alicloud_route_tables
\ alicloud_router_interfaces \ alicloud_router_interfaces
\ alicloud_security_group_rules \ alicloud_security_group_rules
\ alicloud_security_groups \ alicloud_security_groups
@ -75,6 +90,7 @@ syn keyword terraDataTypeBI
\ alicloud_slb_server_certificates \ alicloud_slb_server_certificates
\ alicloud_slb_server_groups \ alicloud_slb_server_groups
\ alicloud_slbs \ alicloud_slbs
\ alicloud_snat_entries
\ alicloud_vpcs \ alicloud_vpcs
\ alicloud_vpn_connections \ alicloud_vpn_connections
\ alicloud_vpn_customer_gateways \ alicloud_vpn_customer_gateways
@ -125,6 +141,7 @@ syn keyword terraDataTypeBI
\ aws_ec2_transit_gateway \ aws_ec2_transit_gateway
\ aws_ec2_transit_gateway_route_table \ aws_ec2_transit_gateway_route_table
\ aws_ec2_transit_gateway_vpc_attachment \ aws_ec2_transit_gateway_vpc_attachment
\ aws_ec2_transit_gateway_vpn_attachment
\ aws_ecr_repository \ aws_ecr_repository
\ aws_ecs_cluster \ aws_ecs_cluster
\ aws_ecs_container_definition \ aws_ecs_container_definition
@ -201,6 +218,7 @@ syn keyword terraDataTypeBI
\ aws_storagegateway_local_disk \ aws_storagegateway_local_disk
\ aws_subnet \ aws_subnet
\ aws_subnet_ids \ aws_subnet_ids
\ aws_transfer_server
\ aws_vpc \ aws_vpc
\ aws_vpc_dhcp_options \ aws_vpc_dhcp_options
\ aws_vpc_endpoint \ aws_vpc_endpoint
@ -211,6 +229,7 @@ syn keyword terraDataTypeBI
\ aws_workspaces_bundle \ aws_workspaces_bundle
\ azuread_user \ azuread_user
\ azurerm_api_management \ azurerm_api_management
\ azurerm_api_management_api
\ azurerm_api_management_group \ azurerm_api_management_group
\ azurerm_api_management_product \ azurerm_api_management_product
\ azurerm_api_management_user \ azurerm_api_management_user
@ -393,6 +412,7 @@ syn keyword terraDataTypeBI
\ google_container_registry_repository \ google_container_registry_repository
\ google_dns_managed_zone \ google_dns_managed_zone
\ google_folder \ google_folder
\ google_folder_organization_policy
\ google_iam_policy \ google_iam_policy
\ google_iam_role \ google_iam_role
\ google_kms_crypto_key \ google_kms_crypto_key
@ -401,6 +421,7 @@ syn keyword terraDataTypeBI
\ google_netblock_ip_ranges \ google_netblock_ip_ranges
\ google_organization \ google_organization
\ google_project \ google_project
\ google_project_organization_policy
\ google_project_services \ google_project_services
\ google_projects \ google_projects
\ google_service_account \ google_service_account
@ -409,6 +430,7 @@ syn keyword terraDataTypeBI
\ google_storage_object_signed_url \ google_storage_object_signed_url
\ google_storage_project_service_account \ google_storage_project_service_account
\ google_storage_transfer_project_service_account \ google_storage_transfer_project_service_account
\ google_tpu_tensorflow_versions
\ grafana_data_source \ grafana_data_source
\ hcloud_datacenter \ hcloud_datacenter
\ hcloud_datacenters \ hcloud_datacenters
@ -423,6 +445,7 @@ syn keyword terraDataTypeBI
\ heroku_app \ heroku_app
\ heroku_space \ heroku_space
\ heroku_space_peering_info \ heroku_space_peering_info
\ heroku_team
\ http \ http
\ huaweicloud_antiddos_v1 \ huaweicloud_antiddos_v1
\ huaweicloud_cce_cluster_v3 \ huaweicloud_cce_cluster_v3
@ -622,6 +645,8 @@ syn keyword terraDataTypeBI
\ oci_database_autonomous_database_wallet \ oci_database_autonomous_database_wallet
\ oci_database_autonomous_databases \ oci_database_autonomous_databases
\ oci_database_backups \ oci_database_backups
\ oci_database_data_guard_association
\ oci_database_data_guard_associations
\ oci_database_database \ oci_database_database
\ oci_database_databases \ oci_database_databases
\ oci_database_db_home \ oci_database_db_home
@ -730,6 +755,11 @@ syn keyword terraDataTypeBI
\ oci_ons_subscriptions \ oci_ons_subscriptions
\ oci_streaming_stream \ oci_streaming_stream
\ oci_streaming_streams \ oci_streaming_streams
\ oci_waas_certificate
\ oci_waas_certificates
\ oci_waas_edge_subnets
\ oci_waas_waas_policies
\ oci_waas_waas_policy
\ oneandone_instance_size \ oneandone_instance_size
\ opc_compute_image_list_entry \ opc_compute_image_list_entry
\ opc_compute_ip_address_reservation \ opc_compute_ip_address_reservation
@ -764,6 +794,7 @@ syn keyword terraDataTypeBI
\ openstack_networking_secgroup_v2 \ openstack_networking_secgroup_v2
\ openstack_networking_subnet_v2 \ openstack_networking_subnet_v2
\ openstack_networking_subnetpool_v2 \ openstack_networking_subnetpool_v2
\ openstack_networking_trunk_v2
\ openstack_sharedfilesystem_availability_zones_v2 \ openstack_sharedfilesystem_availability_zones_v2
\ openstack_sharedfilesystem_share_v2 \ openstack_sharedfilesystem_share_v2
\ openstack_sharedfilesystem_sharenetwork_v2 \ openstack_sharedfilesystem_sharenetwork_v2
@ -913,9 +944,14 @@ syn keyword terraDataTypeBI
\ triton_image \ triton_image
\ triton_network \ triton_network
\ triton_package \ triton_package
\ ucloud_disks
\ ucloud_eips \ ucloud_eips
\ ucloud_images \ ucloud_images
\ ucloud_instances \ ucloud_instances
\ ucloud_lb_attachments
\ ucloud_lb_listeners
\ ucloud_lb_rules
\ ucloud_lbs
\ ucloud_projects \ ucloud_projects
\ ucloud_zones \ ucloud_zones
\ vault_approle_auth_backend_role_id \ vault_approle_auth_backend_role_id
@ -957,11 +993,13 @@ syn keyword terraDataTypeBI
syn keyword terraResourceTypeBI syn keyword terraResourceTypeBI
\ acme_certificate \ acme_certificate
\ acme_registration \ acme_registration
\ alicloud_actiontrail
\ alicloud_api_gateway_api \ alicloud_api_gateway_api
\ alicloud_api_gateway_app \ alicloud_api_gateway_app
\ alicloud_api_gateway_app_attachment \ alicloud_api_gateway_app_attachment
\ alicloud_api_gateway_group \ alicloud_api_gateway_group
\ alicloud_api_gateway_vpc_access \ alicloud_api_gateway_vpc_access
\ alicloud_cas_certificate
\ alicloud_cdn_domain \ alicloud_cdn_domain
\ alicloud_cdn_domain_config \ alicloud_cdn_domain_config
\ alicloud_cdn_domain_new \ alicloud_cdn_domain_new
@ -970,12 +1008,14 @@ syn keyword terraResourceTypeBI
\ alicloud_cen_bandwidth_package_attachment \ alicloud_cen_bandwidth_package_attachment
\ alicloud_cen_instance \ alicloud_cen_instance
\ alicloud_cen_instance_attachment \ alicloud_cen_instance_attachment
\ alicloud_cen_instance_grant
\ alicloud_cen_route_entry \ alicloud_cen_route_entry
\ alicloud_cms_alarm \ alicloud_cms_alarm
\ alicloud_common_bandwidth_package \ alicloud_common_bandwidth_package
\ alicloud_common_bandwidth_package_attachment \ alicloud_common_bandwidth_package_attachment
\ alicloud_container_cluster \ alicloud_container_cluster
\ alicloud_cr_namespace \ alicloud_cr_namespace
\ alicloud_cr_repo
\ alicloud_cs_application \ alicloud_cs_application
\ alicloud_cs_kubernetes \ alicloud_cs_kubernetes
\ alicloud_cs_managed_kubernetes \ alicloud_cs_managed_kubernetes
@ -991,6 +1031,7 @@ syn keyword terraResourceTypeBI
\ alicloud_db_instance \ alicloud_db_instance
\ alicloud_db_read_write_splitting_connection \ alicloud_db_read_write_splitting_connection
\ alicloud_db_readonly_instance \ alicloud_db_readonly_instance
\ alicloud_ddoscoo_instance
\ alicloud_disk \ alicloud_disk
\ alicloud_disk_attachment \ alicloud_disk_attachment
\ alicloud_dns \ alicloud_dns
@ -1028,6 +1069,7 @@ syn keyword terraResourceTypeBI
\ alicloud_mns_queue \ alicloud_mns_queue
\ alicloud_mns_topic \ alicloud_mns_topic
\ alicloud_mns_topic_subscription \ alicloud_mns_topic_subscription
\ alicloud_mongodb_instance
\ alicloud_nas_access_group \ alicloud_nas_access_group
\ alicloud_nas_access_rule \ alicloud_nas_access_rule
\ alicloud_nas_file_system \ alicloud_nas_file_system
@ -1126,9 +1168,11 @@ syn keyword terraResourceTypeBI
\ aws_appmesh_route \ aws_appmesh_route
\ aws_appmesh_virtual_node \ aws_appmesh_virtual_node
\ aws_appmesh_virtual_router \ aws_appmesh_virtual_router
\ aws_appmesh_virtual_service
\ aws_appsync_api_key \ aws_appsync_api_key
\ aws_appsync_datasource \ aws_appsync_datasource
\ aws_appsync_graphql_api \ aws_appsync_graphql_api
\ aws_appsync_resolver
\ aws_athena_database \ aws_athena_database
\ aws_athena_named_query \ aws_athena_named_query
\ aws_autoscaling_attachment \ aws_autoscaling_attachment
@ -1137,6 +1181,7 @@ syn keyword terraResourceTypeBI
\ aws_autoscaling_notification \ aws_autoscaling_notification
\ aws_autoscaling_policy \ aws_autoscaling_policy
\ aws_autoscaling_schedule \ aws_autoscaling_schedule
\ aws_backup_plan
\ aws_backup_vault \ aws_backup_vault
\ aws_batch_compute_environment \ aws_batch_compute_environment
\ aws_batch_job_definition \ aws_batch_job_definition
@ -1144,6 +1189,8 @@ syn keyword terraResourceTypeBI
\ aws_budgets_budget \ aws_budgets_budget
\ aws_cloud9_environment_ec2 \ aws_cloud9_environment_ec2
\ aws_cloudformation_stack \ aws_cloudformation_stack
\ aws_cloudformation_stack_set
\ aws_cloudformation_stack_set_instance
\ aws_cloudfront_distribution \ aws_cloudfront_distribution
\ aws_cloudfront_origin_access_identity \ aws_cloudfront_origin_access_identity
\ aws_cloudfront_public_key \ aws_cloudfront_public_key
@ -1289,6 +1336,7 @@ syn keyword terraResourceTypeBI
\ aws_glacier_vault \ aws_glacier_vault
\ aws_glacier_vault_lock \ aws_glacier_vault_lock
\ aws_globalaccelerator_accelerator \ aws_globalaccelerator_accelerator
\ aws_globalaccelerator_listener
\ aws_glue_catalog_database \ aws_glue_catalog_database
\ aws_glue_catalog_table \ aws_glue_catalog_table
\ aws_glue_classifier \ aws_glue_classifier
@ -1298,6 +1346,7 @@ syn keyword terraResourceTypeBI
\ aws_glue_security_configuration \ aws_glue_security_configuration
\ aws_glue_trigger \ aws_glue_trigger
\ aws_guardduty_detector \ aws_guardduty_detector
\ aws_guardduty_invite_accepter
\ aws_guardduty_ipset \ aws_guardduty_ipset
\ aws_guardduty_member \ aws_guardduty_member
\ aws_guardduty_threatintelset \ aws_guardduty_threatintelset
@ -1342,6 +1391,8 @@ syn keyword terraResourceTypeBI
\ aws_kinesis_firehose_delivery_stream \ aws_kinesis_firehose_delivery_stream
\ aws_kinesis_stream \ aws_kinesis_stream
\ aws_kms_alias \ aws_kms_alias
\ aws_kms_ciphertext
\ aws_kms_external_key
\ aws_kms_grant \ aws_kms_grant
\ aws_kms_key \ aws_kms_key
\ aws_lambda_alias \ aws_lambda_alias
@ -1444,6 +1495,8 @@ syn keyword terraResourceTypeBI
\ aws_route53_query_log \ aws_route53_query_log
\ aws_route53_record \ aws_route53_record
\ aws_route53_resolver_endpoint \ aws_route53_resolver_endpoint
\ aws_route53_resolver_rule
\ aws_route53_resolver_rule_association
\ aws_route53_zone \ aws_route53_zone
\ aws_route53_zone_association \ aws_route53_zone_association
\ aws_route_table \ aws_route_table
@ -1456,6 +1509,7 @@ syn keyword terraResourceTypeBI
\ aws_s3_bucket_object \ aws_s3_bucket_object
\ aws_s3_bucket_policy \ aws_s3_bucket_policy
\ aws_s3_bucket_public_access_block \ aws_s3_bucket_public_access_block
\ aws_sagemaker_endpoint_configuration
\ aws_sagemaker_model \ aws_sagemaker_model
\ aws_sagemaker_notebook_instance \ aws_sagemaker_notebook_instance
\ aws_secretsmanager_secret \ aws_secretsmanager_secret
@ -1585,11 +1639,19 @@ syn keyword terraResourceTypeBI
\ azuread_service_principal_password \ azuread_service_principal_password
\ azuread_user \ azuread_user
\ azurerm_api_management \ azurerm_api_management
\ azurerm_api_management_api
\ azurerm_api_management_api_operation
\ azurerm_api_management_authorization_server
\ azurerm_api_management_certificate
\ azurerm_api_management_group \ azurerm_api_management_group
\ azurerm_api_management_group_user \ azurerm_api_management_group_user
\ azurerm_api_management_logger
\ azurerm_api_management_openid_connect_provider
\ azurerm_api_management_product \ azurerm_api_management_product
\ azurerm_api_management_product_api
\ azurerm_api_management_product_group \ azurerm_api_management_product_group
\ azurerm_api_management_property \ azurerm_api_management_property
\ azurerm_api_management_subscription
\ azurerm_api_management_user \ azurerm_api_management_user
\ azurerm_app_service \ azurerm_app_service
\ azurerm_app_service_active_slot \ azurerm_app_service_active_slot
@ -1829,6 +1891,7 @@ syn keyword terraResourceTypeBI
\ bigip_ltm_pool_attachment \ bigip_ltm_pool_attachment
\ bigip_ltm_profile_fasthttp \ bigip_ltm_profile_fasthttp
\ bigip_ltm_profile_fastl4 \ bigip_ltm_profile_fastl4
\ bigip_ltm_profile_http
\ bigip_ltm_profile_http2 \ bigip_ltm_profile_http2
\ bigip_ltm_profile_httpcompress \ bigip_ltm_profile_httpcompress
\ bigip_ltm_profile_oneconnect \ bigip_ltm_profile_oneconnect
@ -1850,12 +1913,13 @@ syn keyword terraResourceTypeBI
\ bitbucket_default_reviewers \ bitbucket_default_reviewers
\ bitbucket_hook \ bitbucket_hook
\ bitbucket_repository \ bitbucket_repository
\ brightbox_api_client
\ brightbox_cloudip \ brightbox_cloudip
\ brightbox_container
\ brightbox_database_server \ brightbox_database_server
\ brightbox_firewall_policy \ brightbox_firewall_policy
\ brightbox_firewall_rule \ brightbox_firewall_rule
\ brightbox_load_balancer \ brightbox_load_balancer
\ brightbox_orbit_container
\ brightbox_server \ brightbox_server
\ brightbox_server_group \ brightbox_server_group
\ chef_acl \ chef_acl
@ -1938,6 +2002,7 @@ syn keyword terraResourceTypeBI
\ cobbler_snippet \ cobbler_snippet
\ cobbler_system \ cobbler_system
\ consul_agent_service \ consul_agent_service
\ consul_autopilot_config
\ consul_catalog_entry \ consul_catalog_entry
\ consul_intention \ consul_intention
\ consul_key_prefix \ consul_key_prefix
@ -1955,6 +2020,7 @@ syn keyword terraResourceTypeBI
\ datadog_timeboard \ datadog_timeboard
\ datadog_user \ datadog_user
\ digitalocean_certificate \ digitalocean_certificate
\ digitalocean_database_cluster
\ digitalocean_domain \ digitalocean_domain
\ digitalocean_droplet \ digitalocean_droplet
\ digitalocean_droplet_snapshot \ digitalocean_droplet_snapshot
@ -2280,10 +2346,12 @@ syn keyword terraResourceTypeBI
\ heroku_addon \ heroku_addon
\ heroku_addon_attachment \ heroku_addon_attachment
\ heroku_app \ heroku_app
\ heroku_app_config_association
\ heroku_app_feature \ heroku_app_feature
\ heroku_app_release \ heroku_app_release
\ heroku_build \ heroku_build
\ heroku_cert \ heroku_cert
\ heroku_config
\ heroku_domain \ heroku_domain
\ heroku_drain \ heroku_drain
\ heroku_formation \ heroku_formation
@ -2397,6 +2465,30 @@ syn keyword terraResourceTypeBI
\ influxdb_continuous_query \ influxdb_continuous_query
\ influxdb_database \ influxdb_database
\ influxdb_user \ influxdb_user
\ jdcloud_availability_group
\ jdcloud_disk
\ jdcloud_disk_attachment
\ jdcloud_eip
\ jdcloud_eip_association
\ jdcloud_instance
\ jdcloud_instance_template
\ jdcloud_key_pairs
\ jdcloud_network_acl
\ jdcloud_network_interface
\ jdcloud_network_interface_attachment
\ jdcloud_network_security_group
\ jdcloud_network_security_group_rules
\ jdcloud_oss_bucket
\ jdcloud_oss_bucket_upload
\ jdcloud_rds_account
\ jdcloud_rds_database
\ jdcloud_rds_instance
\ jdcloud_rds_privilege
\ jdcloud_route_table
\ jdcloud_route_table_association
\ jdcloud_route_table_rules
\ jdcloud_subnet
\ jdcloud_vpc
\ kubernetes_cluster_role \ kubernetes_cluster_role
\ kubernetes_cluster_role_binding \ kubernetes_cluster_role_binding
\ kubernetes_config_map \ kubernetes_config_map
@ -2469,6 +2561,8 @@ syn keyword terraResourceTypeBI
\ newrelic_infra_alert_condition \ newrelic_infra_alert_condition
\ newrelic_nrql_alert_condition \ newrelic_nrql_alert_condition
\ newrelic_synthetics_alert_condition \ newrelic_synthetics_alert_condition
\ newrelic_synthetics_monitor
\ newrelic_synthetics_monitor_script
\ nomad_acl_policy \ nomad_acl_policy
\ nomad_acl_token \ nomad_acl_token
\ nomad_job \ nomad_job
@ -2605,6 +2699,7 @@ syn keyword terraResourceTypeBI
\ oci_database_autonomous_database \ oci_database_autonomous_database
\ oci_database_autonomous_database_backup \ oci_database_autonomous_database_backup
\ oci_database_backup \ oci_database_backup
\ oci_database_data_guard_association
\ oci_database_db_home \ oci_database_db_home
\ oci_database_db_system \ oci_database_db_system
\ oci_database_exadata_iorm_config \ oci_database_exadata_iorm_config
@ -2666,6 +2761,8 @@ syn keyword terraResourceTypeBI
\ oci_ons_notification_topic \ oci_ons_notification_topic
\ oci_ons_subscription \ oci_ons_subscription
\ oci_streaming_stream \ oci_streaming_stream
\ oci_waas_certificate
\ oci_waas_waas_policy
\ oneandone_baremetal \ oneandone_baremetal
\ oneandone_block_storage \ oneandone_block_storage
\ oneandone_firewall_policy \ oneandone_firewall_policy
@ -2894,9 +2991,11 @@ syn keyword terraResourceTypeBI
\ ovh_vrack_cloudproject \ ovh_vrack_cloudproject
\ ovh_vrack_publiccloud_attachment \ ovh_vrack_publiccloud_attachment
\ packet_bgp_session \ packet_bgp_session
\ packet_connect
\ packet_device \ packet_device
\ packet_ip_attachment \ packet_ip_attachment
\ packet_organization \ packet_organization
\ packet_port_vlan_attachment
\ packet_project \ packet_project
\ packet_project_ssh_key \ packet_project_ssh_key
\ packet_reserved_ip_block \ packet_reserved_ip_block
@ -3057,6 +3156,7 @@ syn keyword terraResourceTypeBI
\ random_shuffle \ random_shuffle
\ random_string \ random_string
\ random_uuid \ random_uuid
\ resource_group_name
\ rightscale_credential \ rightscale_credential
\ rightscale_cwf_process \ rightscale_cwf_process
\ rightscale_deployment \ rightscale_deployment
@ -3259,6 +3359,8 @@ syn keyword terraResourceTypeBI
\ vault_gcp_auth_backend \ vault_gcp_auth_backend
\ vault_gcp_auth_backend_role \ vault_gcp_auth_backend_role
\ vault_gcp_secret_backend \ vault_gcp_secret_backend
\ vault_gcp_secret_roleset
\ vault_generic_endpoint
\ vault_generic_secret \ vault_generic_secret
\ vault_github_auth_backend \ vault_github_auth_backend
\ vault_github_team \ vault_github_team
@ -3267,6 +3369,7 @@ syn keyword terraResourceTypeBI
\ vault_identity_entity_alias \ vault_identity_entity_alias
\ vault_identity_group \ vault_identity_group
\ vault_identity_group_alias \ vault_identity_group_alias
\ vault_identity_group_policies
\ vault_jwt_auth_backend \ vault_jwt_auth_backend
\ vault_jwt_auth_backend_role \ vault_jwt_auth_backend_role
\ vault_kubernetes_auth_backend_config \ vault_kubernetes_auth_backend_config
@ -3294,6 +3397,7 @@ syn keyword terraResourceTypeBI
\ vault_rgp_policy \ vault_rgp_policy
\ vault_ssh_secret_backend_ca \ vault_ssh_secret_backend_ca
\ vault_ssh_secret_backend_role \ vault_ssh_secret_backend_role
\ vault_token
\ vault_token_auth_backend_role \ vault_token_auth_backend_role
\ vcd_catalog \ vcd_catalog
\ vcd_catalog_item \ vcd_catalog_item
@ -3301,6 +3405,7 @@ syn keyword terraResourceTypeBI
\ vcd_dnat \ vcd_dnat
\ vcd_edgegateway_vpn \ vcd_edgegateway_vpn
\ vcd_firewall_rules \ vcd_firewall_rules
\ vcd_independent_disk
\ vcd_inserted_media \ vcd_inserted_media
\ vcd_network_direct \ vcd_network_direct
\ vcd_network_isolated \ vcd_network_isolated
@ -3308,6 +3413,7 @@ syn keyword terraResourceTypeBI
\ vcd_org \ vcd_org
\ vcd_snat \ vcd_snat
\ vcd_vapp \ vcd_vapp
\ vcd_vapp_network
\ vcd_vapp_vm \ vcd_vapp_vm
\ vsphere_compute_cluster \ vsphere_compute_cluster
\ vsphere_compute_cluster_host_group \ vsphere_compute_cluster_host_group

View File

@ -176,7 +176,7 @@ if exists("typescript_enable_domhtmlcss")
syntax keyword typescriptCssStyles contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout syntax keyword typescriptCssStyles contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout
syntax keyword typescriptCssStyles contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop syntax keyword typescriptCssStyles contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop
syntax keyword typescriptCssStyles contained listStyle listStyleImage listStylePosition listStyleType syntax keyword typescriptCssStyles contained listStyle listStyleImage listStylePosition listStyleType
syntax keyword typescriptCssStyles contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat syntax keyword typescriptCssStyles contained background backgroundAttachment backgroundColor backgroundImage backgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
syntax keyword typescriptCssStyles contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType syntax keyword typescriptCssStyles contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType
syntax keyword typescriptCssStyles contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText syntax keyword typescriptCssStyles contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText
syntax keyword typescriptCssStyles contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor syntax keyword typescriptCssStyles contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor