Update

README.md

@@ -26,14 +26,13 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 ## Language packs
 
 - [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, indent, ftdetect)
-- [blade](https://github.com/xsbeats/vim-blade) (syntax, indent, ftdetect)
+- [blade](https://github.com/xsbeats/vim-blade) (syntax, ftdetect)
 - [c++11](https://github.com/octol/vim-cpp-enhanced-highlight) (syntax)
 - [c/c++](https://github.com/vim-jp/cpp-vim) (syntax)
 - [c-extensions](https://github.com/kergoth/aftersyntaxc.vim) (syntax)
 - [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin, ftdetect)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
 - [css](https://github.com/JulesWang/css.vim) (syntax)
-- [csv](https://github.com/chrisbra/csv.vim) (syntax, ftplugin, ftdetect)
 - [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin, ftdetect)
 - [dockerfile](https://github.com/honza/dockerfile.vim) (syntax, ftdetect)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, ftplugin, ftdetect)
@@ -82,11 +81,12 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 - [typescript](https://github.com/leafgarland/typescript-vim) (syntax, compiler, ftplugin, ftdetect)
 - [vbnet](https://github.com/vim-scripts/vbnet.vim) (syntax)
 - [thrift](https://github.com/solarnz/thrift.vim) (syntax, ftdetect)
-- [toml](https://github.com/cespare/vim-toml) (syntax, ftdetect)
+- [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin, ftdetect)
 - [twig](https://github.com/beyondwords/vim-twig) (syntax, ftplugin, ftdetect)
 - [xls](https://github.com/vim-scripts/XSLT-syntax) (syntax)
-- [vala](https://github.com/tkztmk/vim-vala) (syntax, indent, ftdetect)
 - [yard](https://github.com/sheerun/vim-yardoc) (syntax)
+- [vala](https://github.com/tkztmk/vim-vala) (syntax, indent, ftdetect)
+- [vm](https://github.com/lepture/vim-velocity) (syntax, indent, ftdetect)
 - [css-color](https://github.com/ap/vim-css-color) (autoload, syntax)
 
 ## Contributing

after/syntax/c.vim

@@ -289,282 +289,3 @@ hi def link cBoolean Boolean
 "hi def link cDelimiter Delimiter
 " foldmethod=syntax fix, courtesy of Ivan Freitas
 "hi def link cBraces Delimiter
-" Vim syntax file
-" Language:	C Additions
-" Maintainer:	Mikhail Wolfson <mywolfson@gmail.com>
-" URL: http://web.mit.edu/wolfsonm
-" Last Change:	2010 Dec. 3
-" Version: 0.4
-"
-" Changelog:
-"   0.4 - updates and fixes to cDelimiter to fix break with foldmethod=syntax,
-"         entirely suggested and solved by Ivan Freitas
-"         <ivansichfreitas@gmail.com>
-"   0.3 - updates and fixes to cUserFunctionPointer, thanks to 
-"         Alexei <lxmzhv@gmail.com>
-"   0.2 - change [] to operator
-"   0.1 - initial upload, modification from vimscript#1201, Extended c.vim
-
-
-" Common ANSI-standard functions
-syn keyword cAnsiFunction	MULU_ DIVU_ MODU_ MUL_ DIV_ MOD_
-syn keyword cAnsiFunction	main typeof
-syn keyword cAnsiFunction	open close read write lseek dup dup2
-syn keyword cAnsiFunction	fcntl ioctl
-syn keyword cAnsiFunction	wctrans towctrans towupper
-syn keyword cAnsiFunction	towlower wctype iswctype
-syn keyword cAnsiFunction	iswxdigit iswupper iswspace
-syn keyword cAnsiFunction	iswpunct iswprint iswlower
-syn keyword cAnsiFunction	iswgraph iswdigit iswcntrl
-syn keyword cAnsiFunction	iswalpha iswalnum wcsrtombs
-syn keyword cAnsiFunction	mbsrtowcs wcrtomb mbrtowc
-syn keyword cAnsiFunction	mbrlen mbsinit wctob
-syn keyword cAnsiFunction	btowc wcsfxtime wcsftime
-syn keyword cAnsiFunction	wmemset wmemmove wmemcpy
-syn keyword cAnsiFunction	wmemcmp wmemchr wcstok
-syn keyword cAnsiFunction	wcsstr wcsspn wcsrchr
-syn keyword cAnsiFunction	wcspbrk wcslen wcscspn
-syn keyword cAnsiFunction	wcschr wcsxfrm wcsncmp
-syn keyword cAnsiFunction	wcscoll wcscmp wcsncat
-syn keyword cAnsiFunction	wcscat wcsncpy wcscpy
-syn keyword cAnsiFunction	wcstoull wcstoul wcstoll
-syn keyword cAnsiFunction	wcstol wcstold wcstof
-syn keyword cAnsiFunction	wcstod ungetwc putwchar
-syn keyword cAnsiFunction	putwc getwchar getwc
-syn keyword cAnsiFunction	fwide fputws fputwc
-syn keyword cAnsiFunction	fgetws fgetwc wscanf
-syn keyword cAnsiFunction	wprintf vwscanf vwprintf
-syn keyword cAnsiFunction	vswscanf vswprintf vfwscanf
-syn keyword cAnsiFunction	vfwprintf swscanf swprintf
-syn keyword cAnsiFunction	fwscanf fwprintf zonetime
-syn keyword cAnsiFunction	strfxtime strftime localtime
-syn keyword cAnsiFunction	gmtime ctime asctime
-syn keyword cAnsiFunction	time mkxtime mktime
-syn keyword cAnsiFunction	difftime clock strlen
-syn keyword cAnsiFunction	strerror memset strtok
-syn keyword cAnsiFunction	strstr strspn strrchr
-syn keyword cAnsiFunction	strpbrk strcspn strchr
-syn keyword cAnsiFunction	memchr strxfrm strncmp
-syn keyword cAnsiFunction	strcoll strcmp memcmp
-syn keyword cAnsiFunction	strncat strcat strncpy
-syn keyword cAnsiFunction	strcpy memmove memcpy
-syn keyword cAnsiFunction	wcstombs mbstowcs wctomb
-syn keyword cAnsiFunction	mbtowc mblen lldiv
-syn keyword cAnsiFunction	ldiv div llabs
-syn keyword cAnsiFunction	labs abs qsort
-syn keyword cAnsiFunction	bsearch system getenv
-syn keyword cAnsiFunction	exit atexit abort
-syn keyword cAnsiFunction	realloc malloc free
-syn keyword cAnsiFunction	calloc srand rand
-syn keyword cAnsiFunction	strtoull strtoul strtoll
-syn keyword cAnsiFunction	strtol strtold strtof
-syn keyword cAnsiFunction	strtod atoll atol
-syn keyword cAnsiFunction	atoi atof perror
-syn keyword cAnsiFunction	ferror feof clearerr
-syn keyword cAnsiFunction	rewind ftell fsetpos
-syn keyword cAnsiFunction	fseek fgetpos fwrite
-syn keyword cAnsiFunction	fread ungetc puts
-syn keyword cAnsiFunction	putchar putc gets
-syn keyword cAnsiFunction	getchar getc fputs
-syn keyword cAnsiFunction	fputc fgets fgetc
-syn keyword cAnsiFunction	vsscanf vsprintf vsnprintf
-syn keyword cAnsiFunction	vscanf vprintf vfscanf
-syn keyword cAnsiFunction	vfprintf sscanf sprintf
-syn keyword cAnsiFunction	snprintf scanf printf
-syn keyword cAnsiFunction	fscanf fprintf setvbuf
-syn keyword cAnsiFunction	setbuf freopen fopen
-syn keyword cAnsiFunction	fflush fclose tmpnam
-syn keyword cAnsiFunction	tmpfile rename remove
-syn keyword cAnsiFunction	offsetof va_start va_end
-syn keyword cAnsiFunction	va_copy va_arg raise signal
-syn keyword cAnsiFunction	longjmp setjmp isunordered
-syn keyword cAnsiFunction	islessgreater islessequal isless
-syn keyword cAnsiFunction	isgreaterequal isgreater fmal
-syn keyword cAnsiFunction	fmaf fma fminl
-syn keyword cAnsiFunction	fminf fmin fmaxl
-syn keyword cAnsiFunction	fmaxf fmax fdiml
-syn keyword cAnsiFunction	fdimf fdim nextafterxl
-syn keyword cAnsiFunction	nextafterxf nextafterx nextafterl
-syn keyword cAnsiFunction	nextafterf nextafter nanl
-syn keyword cAnsiFunction	nanf nan copysignl
-syn keyword cAnsiFunction	copysignf copysign remquol
-syn keyword cAnsiFunction	remquof remquo remainderl
-syn keyword cAnsiFunction	remainderf remainder fmodl
-syn keyword cAnsiFunction	fmodf fmod truncl
-syn keyword cAnsiFunction	truncf trunc llroundl
-syn keyword cAnsiFunction	llroundf llround lroundl
-syn keyword cAnsiFunction	lroundf lround roundl
-syn keyword cAnsiFunction	roundf round llrintl
-syn keyword cAnsiFunction	llrintf llrint lrintl
-syn keyword cAnsiFunction	lrintf lrint rintl
-syn keyword cAnsiFunction	rintf rint nearbyintl
-syn keyword cAnsiFunction	nearbyintf nearbyint floorl
-syn keyword cAnsiFunction	floorf floor ceill
-syn keyword cAnsiFunction	ceilf ceil tgammal
-syn keyword cAnsiFunction	tgammaf tgamma lgammal
-syn keyword cAnsiFunction	lgammaf lgamma erfcl
-syn keyword cAnsiFunction	erfcf erfc erfl
-syn keyword cAnsiFunction	erff erf sqrtl
-syn keyword cAnsiFunction	sqrtf sqrt powl
-syn keyword cAnsiFunction	powf pow hypotl
-syn keyword cAnsiFunction	hypotf hypot fabsl
-syn keyword cAnsiFunction	fabsf fabs cbrtl
-syn keyword cAnsiFunction	cbrtf cbrt scalblnl
-syn keyword cAnsiFunction	scalblnf scalbln scalbnl
-syn keyword cAnsiFunction	scalbnf scalbn modfl
-syn keyword cAnsiFunction	modff modf logbl
-syn keyword cAnsiFunction	logbf logb log2l
-syn keyword cAnsiFunction	log2f log2 log1pl
-syn keyword cAnsiFunction	log1pf log1p log10l
-syn keyword cAnsiFunction	log10f log10 logl
-syn keyword cAnsiFunction	logf log ldexpl
-syn keyword cAnsiFunction	ldexpf ldexp ilogbl
-syn keyword cAnsiFunction	ilogbf ilogb frexpl
-syn keyword cAnsiFunction	frexpf frexp expm1l
-syn keyword cAnsiFunction	expm1f expm1 exp2l
-syn keyword cAnsiFunction	exp2f exp2 expl
-syn keyword cAnsiFunction	expf exp tanhl
-syn keyword cAnsiFunction	tanhf tanh sinhl
-syn keyword cAnsiFunction	sinhf sinh coshl
-syn keyword cAnsiFunction	coshf cosh atanhl
-syn keyword cAnsiFunction	atanhf atanh asinhl
-syn keyword cAnsiFunction	asinhf asinh acoshl
-syn keyword cAnsiFunction	acoshf acosh tanl
-syn keyword cAnsiFunction	tanf tan sinl
-syn keyword cAnsiFunction	sinf sin cosl
-syn keyword cAnsiFunction	cosf cos atan2l
-syn keyword cAnsiFunction	atan2f atan2 atanl
-syn keyword cAnsiFunction	atanf atan asinl
-syn keyword cAnsiFunction	asinf asin acosl
-syn keyword cAnsiFunction	acosf acos signbit
-syn keyword cAnsiFunction	isnormal isnan isinf
-syn keyword cAnsiFunction	isfinite fpclassify localeconv
-syn keyword cAnsiFunction	setlocale wcstoumax wcstoimax
-syn keyword cAnsiFunction	strtoumax strtoimax feupdateenv
-syn keyword cAnsiFunction	fesetenv feholdexcept fegetenv
-syn keyword cAnsiFunction	fesetround fegetround fetestexcept
-syn keyword cAnsiFunction	fesetexceptflag feraiseexcept fegetexceptflag
-syn keyword cAnsiFunction	feclearexcept toupper tolower
-syn keyword cAnsiFunction	isxdigit isupper isspace
-syn keyword cAnsiFunction	ispunct isprint islower
-syn keyword cAnsiFunction	isgraph isdigit iscntrl
-syn keyword cAnsiFunction	isalpha isalnum creall
-syn keyword cAnsiFunction	crealf creal cprojl
-syn keyword cAnsiFunction	cprojf cproj conjl
-syn keyword cAnsiFunction	conjf conj cimagl
-syn keyword cAnsiFunction	cimagf cimag cargl
-syn keyword cAnsiFunction	cargf carg csqrtl
-syn keyword cAnsiFunction	csqrtf csqrt cpowl
-syn keyword cAnsiFunction	cpowf cpow cabsl
-syn keyword cAnsiFunction	cabsf cabs clogl
-syn keyword cAnsiFunction	clogf clog cexpl
-syn keyword cAnsiFunction	cexpf cexp ctanhl
-syn keyword cAnsiFunction	ctanhf ctanh csinhl
-syn keyword cAnsiFunction	csinhf csinh ccoshl
-syn keyword cAnsiFunction	ccoshf ccosh catanhl
-syn keyword cAnsiFunction	catanhf catanh casinhl
-syn keyword cAnsiFunction	casinhf casinh cacoshl
-syn keyword cAnsiFunction	cacoshf cacosh ctanl
-syn keyword cAnsiFunction	ctanf ctan csinl
-syn keyword cAnsiFunction	csinf csin ccosl
-syn keyword cAnsiFunction	ccosf ccos catanl
-syn keyword cAnsiFunction	catanf catan casinl
-syn keyword cAnsiFunction	casinf casin cacosl
-syn keyword cAnsiFunction	cacosf cacos assert
-syn keyword cAnsiFunction	UINTMAX_C INTMAX_C UINT64_C
-syn keyword cAnsiFunction	UINT32_C UINT16_C UINT8_C
-syn keyword cAnsiFunction	INT64_C INT32_C INT16_C INT8_C
-
-" Common ANSI-standard Names
-syn keyword	cAnsiName	PRId8 PRIi16 PRIo32 PRIu64
-syn keyword	cAnsiName	PRId16 PRIi32 PRIo64 PRIuLEAST8
-syn keyword	cAnsiName	PRId32 PRIi64 PRIoLEAST8 PRIuLEAST16
-syn keyword	cAnsiName	PRId64 PRIiLEAST8 PRIoLEAST16 PRIuLEAST32
-syn keyword	cAnsiName	PRIdLEAST8 PRIiLEAST16 PRIoLEAST32 PRIuLEAST64
-syn keyword	cAnsiName	PRIdLEAST16 PRIiLEAST32 PRIoLEAST64 PRIuFAST8
-syn keyword	cAnsiName	PRIdLEAST32 PRIiLEAST64 PRIoFAST8 PRIuFAST16
-syn keyword	cAnsiName	PRIdLEAST64 PRIiFAST8 PRIoFAST16 PRIuFAST32
-syn keyword	cAnsiName	PRIdFAST8 PRIiFAST16 PRIoFAST32 PRIuFAST64
-syn keyword	cAnsiName	PRIdFAST16 PRIiFAST32 PRIoFAST64 PRIuMAX
-syn keyword	cAnsiName	PRIdFAST32 PRIiFAST64 PRIoMAX PRIuPTR
-syn keyword	cAnsiName	PRIdFAST64 PRIiMAX PRIoPTR PRIx8
-syn keyword	cAnsiName	PRIdMAX PRIiPTR PRIu8 PRIx16
-syn keyword	cAnsiName	PRIdPTR PRIo8 PRIu16 PRIx32
-syn keyword	cAnsiName	PRIi8 PRIo16 PRIu32 PRIx64
-
-syn keyword	cAnsiName	PRIxLEAST8 SCNd8 SCNiFAST32 SCNuLEAST32
-syn keyword	cAnsiName	PRIxLEAST16 SCNd16 SCNiFAST64 SCNuLEAST64
-syn keyword	cAnsiName	PRIxLEAST32 SCNd32 SCNiMAX SCNuFAST8
-syn keyword	cAnsiName	PRIxLEAST64 SCNd64 SCNiPTR SCNuFAST16
-syn keyword	cAnsiName	PRIxFAST8 SCNdLEAST8 SCNo8 SCNuFAST32
-syn keyword	cAnsiName	PRIxFAST16 SCNdLEAST16 SCNo16 SCNuFAST64
-syn keyword	cAnsiName	PRIxFAST32 SCNdLEAST32 SCNo32 SCNuMAX
-syn keyword	cAnsiName	PRIxFAST64 SCNdLEAST64 SCNo64 SCNuPTR
-syn keyword	cAnsiName	PRIxMAX SCNdFAST8 SCNoLEAST8 SCNx8
-syn keyword	cAnsiName	PRIxPTR SCNdFAST16 SCNoLEAST16 SCNx16
-syn keyword	cAnsiName	PRIX8 SCNdFAST32 SCNoLEAST32 SCNx32
-syn keyword	cAnsiName	PRIX16 SCNdFAST64 SCNoLEAST64 SCNx64
-syn keyword	cAnsiName	PRIX32 SCNdMAX SCNoFAST8 SCNxLEAST8
-syn keyword	cAnsiName	PRIX64 SCNdPTR SCNoFAST16 SCNxLEAST16
-syn keyword	cAnsiName	PRIXLEAST8 SCNi8 SCNoFAST32 SCNxLEAST32
-syn keyword	cAnsiName	PRIXLEAST16 SCNi16 SCNoFAST64 SCNxLEAST64
-syn keyword	cAnsiName	PRIXLEAST32 SCNi32 SCNoMAX SCNxFAST8
-syn keyword	cAnsiName	PRIXLEAST64 SCNi64 SCNoPTR SCNxFAST16
-syn keyword	cAnsiName	PRIXFAST8 SCNiLEAST8 SCNu8 SCNxFAST32
-syn keyword	cAnsiName	PRIXFAST16 SCNiLEAST16 SCNu16 SCNxFAST64
-syn keyword	cAnsiName	PRIXFAST32 SCNiLEAST32 SCNu32 SCNxMAX
-syn keyword	cAnsiName	PRIXFAST64 SCNiLEAST64 SCNu64 SCNxPTR
-syn keyword	cAnsiName	PRIXMAX SCNiFAST8 SCNuLEAST8
-syn keyword	cAnsiName	PRIXPTR SCNiFAST16 SCNuLEAST16
-
-syn keyword	cAnsiName	errno environ
-
-syn keyword	cAnsiName	STDC CX_LIMITED_RANGE
-syn keyword	cAnsiName	STDC FENV_ACCESS
-syn keyword	cAnsiName	STDC FP_CONTRACT
-
-syn keyword	cAnsiName	and bitor not_eq xor
-syn keyword	cAnsiName	and_eq compl or xor_eq
-syn keyword	cAnsiName	bitand not or_eq
-
-hi def link cAnsiFunction cFunction
-hi def link cAnsiName cIdentifier
-
-" Operators
-syn match cOperator	"\(<<\|>>\|[-+*/%&^|<>!=]\)="
-syn match cOperator	"<<\|>>\|&&\|||\|++\|--\|->"
-syn match cOperator	"[.!~*&%<>^|=,+-]"
-syn match cOperator	"/[^/*=]"me=e-1
-syn match cOperator	"/$"
-syn match cOperator "&&\|||"
-syn match cOperator	"[][]"
-
-" Preprocs
-syn keyword cDefined defined contained containedin=cDefine
-hi def link cDefined cDefine
-
-" Functions
-syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cType,cDelimiter,cDefine
-syn match cUserFunctionPointer "(\s*\*\s*\h\w*\s*)\(\s\|\n\)*(" contains=cDelimiter,cOperator
-
-hi def link cUserFunction cFunction
-hi def link cUserFunctionPointer cFunction
-
-" Delimiters
-syn match cDelimiter    "[();\\]"
-" foldmethod=syntax fix, courtesy of Ivan Freitas
-syn match cBraces display "[{}]"
-
-
-" Booleans
-syn keyword cBoolean true false TRUE FALSE
-
-
-" Links
-hi def link cFunction Function
-hi def link cIdentifier Identifier
-hi def link cDelimiter Delimiter
-" foldmethod=syntax fix, courtesy of Ivan Freitas
-hi def link cBraces Delimiter
-hi def link cBoolean Boolean
-

after/syntax/coffee.vim

@@ -1,20 +0,0 @@
-" This file describes a very basic syntax for TomDoc comments in a
-" CoffeeScript file.
-"
-" For more information on TomDoc, check it out here: http://tomdoc.org/
-"
-
-syn keyword tomdocKeywords Returns containedin=coffeeComment contained
-syn keyword tomdocKeywords Throws containedin=coffeeComment contained
-syn keyword tomdocKeywords Examples containedin=coffeeComment contained
-syn keyword tomdocKeywords Signature containedin=coffeeComment contained
-
-syn match tomdocArguments +\s*[A-Za-z0-9_\-&\*:]*\(\s*- \)+he=e-3 containedin=coffeeComment contained
-
-syn match tomdocDescriptions +\s*Public:+he=e-1 containedin=coffeeComment contained
-syn match tomdocDescriptions +\s*Internal:+he=e-1 containedin=coffeeComment contained
-syn match tomdocDescriptions +\s*Deprecated:+he=e-1 containedin=coffeeComment contained
-
-hi default link tomdocDescriptions String
-hi default link tomdocKeywords String
-hi default link tomdocArguments HELP

after/syntax/cpp.vim

@@ -170,7 +170,7 @@ syntax keyword cppSTLfunction back
 syntax keyword cppSTLfunction back_inserter
 syntax keyword cppSTLfunction bad
 syntax keyword cppSTLfunction beg
-syntax keyword cppSTLfunction begin
+"syntax keyword cppSTLfunction begin
 syntax keyword cppSTLfunction binary_compose
 syntax keyword cppSTLfunction binary_negate
 syntax keyword cppSTLfunction binary_search
@@ -204,7 +204,7 @@ syntax keyword cppSTLfunction difftime
 syntax keyword cppSTLfunction distance
 syntax keyword cppSTLfunction div
 syntax keyword cppSTLfunction empty
-syntax keyword cppSTLfunction end
+"syntax keyword cppSTLfunction end
 syntax keyword cppSTLfunction eof
 syntax keyword cppSTLfunction epsilon
 syntax keyword cppSTLfunction equal
@@ -417,7 +417,7 @@ syntax keyword cppSTLfunction signal
 syntax keyword cppSTLfunction signaling_NaN
 syntax keyword cppSTLfunction sin
 syntax keyword cppSTLfunction sinh
-syntax keyword cppSTLfunction size
+"syntax keyword cppSTLfunction size
 syntax keyword cppSTLfunction sort
 syntax keyword cppSTLfunction sort_heap
 syntax keyword cppSTLfunction splice
@@ -464,8 +464,8 @@ syntax keyword cppSTLfunction tan
 syntax keyword cppSTLfunction tanh
 syntax keyword cppSTLfunction tellg
 syntax keyword cppSTLfunction tellp
-syntax keyword cppSTLfunction test
-syntax keyword cppSTLfunction time
+"syntax keyword cppSTLfunction test
+"syntax keyword cppSTLfunction time
 syntax keyword cppSTLfunction tmpfile
 syntax keyword cppSTLfunction tmpnam
 syntax keyword cppSTLfunction tolower
@@ -760,6 +760,7 @@ syntax keyword cppSTLconstant WCHAR_MAX
 if !exists("cpp_no_cpp11")
     syntax keyword cppSTLtype nullptr_t max_align_t
     syntax keyword cppSTLtype type_index
+    syntax keyword cppSTLconstant nullptr
 
     " type_traits
     syntax keyword cppSTLtype is_void

after/syntax/css.vim

@@ -3,4 +3,4 @@
 
 if !( has('gui_running') || &t_Co==256 ) | finish | endif
 
-call css_color#init('css', 'cssMediaBlock,cssFunction,cssDefinition,cssAttrRegion,cssComment')
+call css_color#init('css', 'extended', 'cssMediaBlock,cssFunction,cssDefinition,cssAttrRegion,cssComment')

after/syntax/help.vim

@@ -1,6 +1,12 @@
-let b:current_syntax = ''
-unlet b:current_syntax
+" Extends standard help syntax with highlighting of Scala code.
+"
+" Place code between !sc! and !/sc! delimiters. These will be hidden if Vim is
+" built with conceal support.
+
+unlet! b:current_syntax
+
 syntax include @ScalaCode syntax/scala.vim
+
 if has('conceal')
   syntax region rgnScala matchgroup=Ignore concealends start='!sc!' end='!/sc!' contains=@ScalaCode
 else

after/syntax/less.vim

@@ -10,4 +10,4 @@ if !( has('gui_running') || &t_Co==256 ) | finish | endif
 " lessVariableValue      | lessDefinition | cssComment     | lessComment | https://github.com/groenewege/vim-less
 " lessVariableDefinition | cssDefinition  | cssComment     | lessComment | https://github.com/lunaru/vim-less
 
-call css_color#init('css', 'lessVariableValue,lessVariableDefinition,lessDefinition,lessCssAttribute,lessAttribute,cssDefinition,cssComment,lessCssComment,lessComment')
+call css_color#init('css', 'extended', 'lessVariableValue,lessVariableDefinition,lessDefinition,lessCssAttribute,lessAttribute,cssDefinition,cssComment,lessCssComment,lessComment')

after/syntax/lua.vim

@@ -0,0 +1,6 @@
+" Language:     Colorful CSS Color Preview
+" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
+
+if !( has('gui_running') || &t_Co==256 ) | finish | endif
+
+call css_color#init('hex', 'extended', 'luaComment,luaString')

after/syntax/moon.vim

@@ -0,0 +1,6 @@
+" Language:     Colorful CSS Color Preview
+" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
+
+if !( has('gui_running') || &t_Co==256 ) | finish | endif
+
+call css_color#init('hex', 'extended', 'moonComment,moonString')

after/syntax/ruby.vim

@@ -1,23 +1,3 @@
-" This file describes a very basic syntax for TomDoc comments in a Ruby file.
-"
-" For more information on TomDoc, check it out here: http://tomdoc.org/
-"
-
-syn keyword tomdocKeywords Returns containedin=rubyComment contained
-syn keyword tomdocKeywords Yields containedin=rubyComment contained
-syn keyword tomdocKeywords Raises containedin=rubyComment contained
-syn keyword tomdocKeywords Examples containedin=rubyComment contained
-syn keyword tomdocKeywords Signature containedin=rubyComment contained
-
-syn match tomdocArguments +\s*[A-Za-z0-9_\-&\*:]*\(\s*- \)+he=e-3 containedin=rubyComment contained
-
-syn match tomdocDescriptions +\s*Public:+he=e-1 containedin=rubyComment contained
-syn match tomdocDescriptions +\s*Internal:+he=e-1 containedin=rubyComment contained
-syn match tomdocDescriptions +\s*Deprecated:+he=e-1 containedin=rubyComment contained
-
-hi default link tomdocDescriptions String
-hi default link tomdocKeywords String
-hi default link tomdocArguments HELP
 " Ruby syntax extensions for highlighting YARD documentation.
 "
 " Author: Joel Holdbrooks <https://github.com/noprompt>

after/syntax/sass.vim

@@ -3,4 +3,4 @@
 
 if !( has('gui_running') || &t_Co==256 ) | finish | endif
 
-call css_color#init('css', 'sassCssAttribute,sassComment,sassCssComment')
+call css_color#init('css', 'extended', 'sassCssAttribute,sassComment,sassCssComment')

after/syntax/scss.vim

@@ -3,4 +3,4 @@
 
 if !( has('gui_running') || &t_Co==256 ) | finish | endif
 
-call css_color#init('css', 'scssAttribute,scssComment,scssVariableValue,sassCssAttribute,cssComment')
+call css_color#init('css', 'extended', 'scssAttribute,scssComment,scssVariableValue,sassCssAttribute,cssComment')

after/syntax/stylus.vim

@@ -3,4 +3,4 @@
 
 if !( has('gui_running') || &t_Co==256 ) | finish | endif
 
-call css_color#init('css', 'stylusCssAttribute,stylusComment,cssComment')
+call css_color#init('css', 'extended', 'stylusCssAttribute,stylusComment,cssComment')

after/syntax/vim.vim

@@ -3,4 +3,4 @@
 
 if !( has('gui_running') || &t_Co==256 ) | finish | endif
 
-call css_color#init('any', 'vimHiGuiRgb,vimComment,vimLineComment')
+call css_color#init('hex', 'none', 'vimHiGuiRgb,vimComment,vimLineComment')

autoload/css_color.vim

@@ -173,6 +173,8 @@ function! s:create_syn_match()
 		let s:pattern_color[pattern] = rgb_color
 	endif
 
+	let group = 'BG' . rgb_color
+
 	if ! has_key( b:has_color_hi, rgb_color )
 		" check GUI flag early here to avoid pure-overhead caching
 		let syn_bg = s:is_gui ? rgb_color : get( s:color_bg, rgb_color, '' )
@@ -189,11 +191,7 @@ function! s:create_syn_match()
 			let syn_fg = r*30 + g*59 + b*11 > 12000 ? s:black : s:white
 			let s:color_fg[rgb_color] = syn_fg
 		endif
-	endif
 
-	let group = 'BG' . rgb_color
-
-	if ! has_key( b:has_color_hi, rgb_color )
 		exe printf( s:hi_cmd, group, syn_bg, syn_fg )
 		let b:has_color_hi[rgb_color] = 1
 	endif
@@ -235,9 +233,9 @@ endfunction
 
 let s:_hexcolor   = '#\(\x\{3}\|\x\{6}\)\>' " submatch 1
 let s:_funcname   = '\(rgb\|hsl\)a\?' " submatch 2
-let s:_numval     = '\(\d\{1,3}%\?\)' " submatch 3,4,5
 let s:_ws_        = '\s*'
-let s:_listsep    = s:_ws_ . ',' . s:_ws_
+let s:_numval     = s:_ws_ . '\(\d\{1,3}%\?\)' " submatch 3,4,5
+let s:_listsep    = s:_ws_ . ','
 let s:_otherargs_ = '\%(,[^)]*\)\?'
 let s:_funcexpr   = s:_funcname . '[(]' . s:_numval . s:_listsep . s:_numval . s:_listsep . s:_numval . s:_ws_ . s:_otherargs_ . '[)]'
 let s:_csscolor   = s:_hexcolor . '\|' . s:_funcexpr
@@ -250,7 +248,7 @@ function! s:parse_css_screen()
 	call s:clear_matches()
 	call s:create_matches()
 endfunction
-function! s:parse_any_screen()
+function! s:parse_hex_screen()
 	call substitute( join( getline('w0','w$'), "\n" ), s:_hexcolor, '\=s:create_syn_match()', 'g' )
 	call s:clear_matches()
 	call s:create_matches()
@@ -258,7 +256,7 @@ endfunction
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-function! css_color#init(type, groups)
+function! css_color#init(type, keywords, groups)
 	exe 'syn cluster colorableGroup contains=' . a:groups
 
 	let b:has_color_hi    = {}
@@ -273,23 +271,58 @@ function! css_color#init(type, groups)
 
 	exe 'call s:parse_'.a:type.'_screen()'
 
-	if a:type != 'css' | return | endif
+	if a:keywords == 'none' | return | endif
+
+	syn case ignore
+
+	" W3C basic colors
 
 	hi BG000000 guibg=#000000 guifg=#FFFFFF ctermbg=16  ctermfg=231
+	hi BGc0c0c0 guibg=#C0C0C0 guifg=#000000 ctermbg=250 ctermfg=16
+	hi BG808080 guibg=#808080 guifg=#000000 ctermbg=244 ctermfg=16
+	hi BGffffff guibg=#FFFFFF guifg=#000000 ctermbg=231 ctermfg=16
+	hi BG800000 guibg=#800000 guifg=#FFFFFF ctermbg=88  ctermfg=231
+	hi BGff0000 guibg=#FF0000 guifg=#FFFFFF ctermbg=196 ctermfg=231
+	hi BG800080 guibg=#800080 guifg=#FFFFFF ctermbg=240 ctermfg=231
+	hi BGff00ff guibg=#FF00FF guifg=#FFFFFF ctermbg=13  ctermfg=231
+	hi BG008000 guibg=#008000 guifg=#FFFFFF ctermbg=2   ctermfg=231
+	hi BG00ff00 guibg=#00FF00 guifg=#000000 ctermbg=10  ctermfg=16
+	hi BG808000 guibg=#808000 guifg=#FFFFFF ctermbg=240 ctermfg=231
+	hi BGffff00 guibg=#FFFF00 guifg=#000000 ctermbg=11  ctermfg=16
 	hi BG000080 guibg=#000080 guifg=#FFFFFF ctermbg=235 ctermfg=231
+	hi BG0000ff guibg=#0000FF guifg=#FFFFFF ctermbg=4   ctermfg=231
+	hi BG008080 guibg=#008080 guifg=#FFFFFF ctermbg=30  ctermfg=231
+	hi BG00ffff guibg=#00FFFF guifg=#000000 ctermbg=51  ctermfg=16
+
+	syn keyword BG000000 black   contained containedin=@colorableGroup
+	syn keyword BGc0c0c0 silver  contained containedin=@colorableGroup
+	syn keyword BG808080 gray    contained containedin=@colorableGroup
+	syn match BGffffff "\c\<white\(-\)\@!\>" contained containedin=@colorableGroup
+	syn keyword BG800000 maroon  contained containedin=@colorableGroup
+	syn keyword BGff0000 red     contained containedin=@colorableGroup
+	syn keyword BG800080 purple  contained containedin=@colorableGroup
+	syn keyword BGff00ff fuchsia contained containedin=@colorableGroup
+	syn keyword BG008000 green   contained containedin=@colorableGroup
+	syn keyword BG00ff00 lime    contained containedin=@colorableGroup
+	syn keyword BG808000 olive   contained containedin=@colorableGroup
+	syn keyword BGffff00 yellow  contained containedin=@colorableGroup
+	syn keyword BG000080 navy    contained containedin=@colorableGroup
+	syn keyword BG0000ff blue    contained containedin=@colorableGroup
+	syn keyword BG008080 teal    contained containedin=@colorableGroup
+	syn keyword BG00ffff aqua    contained containedin=@colorableGroup
+
+	if a:keywords == 'basic' | return | endif
+
+	" W3C extended colors
+
 	hi BG00008b guibg=#00008B guifg=#FFFFFF ctermbg=4   ctermfg=231
 	hi BG0000cd guibg=#0000CD guifg=#FFFFFF ctermbg=4   ctermfg=231
-	hi BG0000ff guibg=#0000FF guifg=#FFFFFF ctermbg=4   ctermfg=231
 	hi BG006400 guibg=#006400 guifg=#FFFFFF ctermbg=235 ctermfg=231
-	hi BG008000 guibg=#008000 guifg=#FFFFFF ctermbg=2   ctermfg=231
-	hi BG008080 guibg=#008080 guifg=#FFFFFF ctermbg=30  ctermfg=231
 	hi BG008b8b guibg=#008B8B guifg=#FFFFFF ctermbg=30  ctermfg=231
 	hi BG00bfff guibg=#00BFFF guifg=#000000 ctermbg=6   ctermfg=16
 	hi BG00ced1 guibg=#00CED1 guifg=#000000 ctermbg=6   ctermfg=16
 	hi BG00fa9a guibg=#00FA9A guifg=#000000 ctermbg=6   ctermfg=16
-	hi BG00ff00 guibg=#00FF00 guifg=#000000 ctermbg=10  ctermfg=16
 	hi BG00ff7f guibg=#00FF7F guifg=#000000 ctermbg=6   ctermfg=16
-	hi BG00ffff guibg=#00FFFF guifg=#000000 ctermbg=51  ctermfg=16
 	hi BG191970 guibg=#191970 guifg=#FFFFFF ctermbg=237 ctermfg=231
 	hi BG1e90ff guibg=#1E90FF guifg=#000000 ctermbg=12  ctermfg=16
 	hi BG20b2aa guibg=#20B2AA guifg=#000000 ctermbg=37  ctermfg=16
@@ -317,10 +350,6 @@ function! css_color#init(type, groups)
 	hi BG7cfc00 guibg=#7CFC00 guifg=#000000 ctermbg=3   ctermfg=16
 	hi BG7fff00 guibg=#7FFF00 guifg=#000000 ctermbg=3   ctermfg=16
 	hi BG7fffd4 guibg=#7FFFD4 guifg=#000000 ctermbg=122 ctermfg=16
-	hi BG800000 guibg=#800000 guifg=#FFFFFF ctermbg=88  ctermfg=231
-	hi BG800080 guibg=#800080 guifg=#FFFFFF ctermbg=240 ctermfg=231
-	hi BG808000 guibg=#808000 guifg=#FFFFFF ctermbg=240 ctermfg=231
-	hi BG808080 guibg=#808080 guifg=#000000 ctermbg=244 ctermfg=16
 	hi BG87ceeb guibg=#87CEEB guifg=#000000 ctermbg=117 ctermfg=16
 	hi BG87cefa guibg=#87CEFA guifg=#000000 ctermbg=117 ctermfg=16
 	hi BG8a2be2 guibg=#8A2BE2 guifg=#FFFFFF ctermbg=12  ctermfg=231
@@ -347,7 +376,6 @@ function! css_color#init(type, groups)
 	hi BGba55d3 guibg=#BA55D3 guifg=#000000 ctermbg=5   ctermfg=16
 	hi BGbc8f8f guibg=#BC8F8F guifg=#000000 ctermbg=138 ctermfg=16
 	hi BGbdb76b guibg=#BDB76B guifg=#000000 ctermbg=247 ctermfg=16
-	hi BGc0c0c0 guibg=#C0C0C0 guifg=#000000 ctermbg=250 ctermfg=16
 	hi BGc71585 guibg=#C71585 guifg=#FFFFFF ctermbg=5   ctermfg=231
 	hi BGcd5c5c guibg=#CD5C5C guifg=#000000 ctermbg=167 ctermfg=16
 	hi BGcd853f guibg=#CD853F guifg=#000000 ctermbg=173 ctermfg=16
@@ -383,8 +411,6 @@ function! css_color#init(type, groups)
 	hi BGfaf0e6 guibg=#FAF0E6 guifg=#000000 ctermbg=255 ctermfg=16
 	hi BGfafad2 guibg=#FAFAD2 guifg=#000000 ctermbg=255 ctermfg=16
 	hi BGfdf5e6 guibg=#FDF5E6 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGff0000 guibg=#FF0000 guifg=#FFFFFF ctermbg=196 ctermfg=231
-	hi BGff00ff guibg=#FF00FF guifg=#FFFFFF ctermbg=13  ctermfg=231
 	hi BGff1493 guibg=#FF1493 guifg=#FFFFFF ctermbg=5   ctermfg=231
 	hi BGff4500 guibg=#FF4500 guifg=#FFFFFF ctermbg=9   ctermfg=231
 	hi BGff6347 guibg=#FF6347 guifg=#000000 ctermbg=203 ctermfg=16
@@ -409,30 +435,9 @@ function! css_color#init(type, groups)
 	hi BGfffacd guibg=#FFFACD guifg=#000000 ctermbg=255 ctermfg=16
 	hi BGfffaf0 guibg=#FFFAF0 guifg=#000000 ctermbg=15  ctermfg=16
 	hi BGfffafa guibg=#FFFAFA guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGffff00 guibg=#FFFF00 guifg=#000000 ctermbg=11  ctermfg=16
 	hi BGffffe0 guibg=#FFFFE0 guifg=#000000 ctermbg=255 ctermfg=16
 	hi BGfffff0 guibg=#FFFFF0 guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGffffff guibg=#FFFFFF guifg=#000000 ctermbg=231 ctermfg=16
 
-	" W3C Colors
-	syn keyword BG000000 black   contained containedin=@colorableGroup
-	syn keyword BGc0c0c0 silver  contained containedin=@colorableGroup
-	syn keyword BG808080 gray    contained containedin=@colorableGroup
-	syn match BGffffff "\<white\(-\)\@!\>" contained containedin=@colorableGroup
-	syn keyword BG800000 maroon  contained containedin=@colorableGroup
-	syn keyword BGff0000 red     contained containedin=@colorableGroup
-	syn keyword BG800080 purple  contained containedin=@colorableGroup
-	syn keyword BGff00ff fuchsia contained containedin=@colorableGroup
-	syn keyword BG008000 green   contained containedin=@colorableGroup
-	syn keyword BG00ff00 lime    contained containedin=@colorableGroup
-	syn keyword BG808000 olive   contained containedin=@colorableGroup
-	syn keyword BGffff00 yellow  contained containedin=@colorableGroup
-	syn keyword BG000080 navy    contained containedin=@colorableGroup
-	syn keyword BG0000ff blue    contained containedin=@colorableGroup
-	syn keyword BG008080 teal    contained containedin=@colorableGroup
-	syn keyword BG00ffff aqua    contained containedin=@colorableGroup
-
-	" extra colors
 	syn keyword BGf0f8ff AliceBlue            contained containedin=@colorableGroup
 	syn keyword BGfaebd7 AntiqueWhite         contained containedin=@colorableGroup
 	syn keyword BG7fffd4 Aquamarine           contained containedin=@colorableGroup

autoload/xml/html5.vim

@@ -545,7 +545,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'iframe': [
     \ [],
-    \ extend(copy(global_attributes), {'src': [], 'name': [], 'width': [], 'height': [], 'sandbox': ['allow-same-origin', 'allow-forms', 'allow-scripts'], 'seamless': ['seamless', '']})
+    \ extend(copy(global_attributes), {'src': [], 'srcdoc': [], 'name': [], 'width': [], 'height': [], 'sandbox': ['allow-same-origin', 'allow-forms', 'allow-scripts'], 'seamless': ['seamless', '']})
 \ ],
 \ 'img': [
     \ [],
@@ -601,7 +601,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'meta': [
     \ [],
-    \ extend(copy(global_attributes), {'name': [], 'http-equiv': ['refresh', 'default-style', 'content-type'], 'content': [], 'charset': charset})
+    \ extend(copy(global_attributes), {'name': ['application-name', 'author', 'description', 'generator', 'referrer', 'creator', 'googlebot', 'publisher', 'robots', 'slurp', 'viewport', 'theme-color'], 'http-equiv': ['refresh', 'default-style', 'content-type'], 'content': [], 'charset': charset})
 \ ],
 \ 'meter': [
     \ phrasing_elements,
@@ -659,6 +659,10 @@ let g:xmldata_html5 = {
     \ phrasing_elements,
     \ extend(copy(global_attributes), {'cite': []})
 \ ],
+\ 'rb': [
+    \ phrasing_elements,
+    \ global_attributes
+\ ],
 \ 'rp': [
     \ phrasing_elements,
     \ global_attributes
@@ -667,10 +671,14 @@ let g:xmldata_html5 = {
     \ phrasing_elements,
     \ global_attributes
 \ ],
-\ 'ruby': [
+\ 'rtc': [
     \ phrasing_elements + ['rp', 'rt'],
     \ global_attributes
 \ ],
+\ 'ruby': [
+    \ phrasing_elements + ['rb', 'rp', 'rt', 'rtc'],
+    \ global_attributes
+\ ],
 \ 'samp': [
     \ phrasing_elements,
     \ global_attributes

build

@@ -23,17 +23,18 @@ extract() {
     path="$(printf "$pack" | cut -d ':' -f 2)"
     dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
     directories="DIRS$(printf "$pack" | cut -d ':' -f 3)"
+    subtree="$(printf "$pack" | cut -d ':' -f 4)"
     printf -- "- [$name](https://github.com/$path) ("
 
     subdirs=""
     for subdir in ${!directories}; do
-      if [ -d "$dir/$subdir" ]; then
+      if [ -d "${dir}${subtree:-/}${subdir}" ]; then
         base="$(basename "$subdir")"
         if [[ "$subdirs" != *"$base"* ]]; then
           subdirs="$subdirs, $base"
         fi
 
-        copy_dir "$dir" "$subdir"
+        copy_dir "${dir}${subtree}" "$subdir"
       fi
     done
 
@@ -45,8 +46,9 @@ extract() {
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
     dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
+    subtree="$(printf "$pack" | cut -d ':' -f 4)"
 
-    if [ -d "$dir/plugin" ]; then
+    if [ -d "$dir${subtree:-/}plugin" ]; then
       printf "Possible error (plugin directory exists): $path\n"
     fi
   done
@@ -72,11 +74,9 @@ PACKS="
   blade:xsbeats/vim-blade
   c++11:octol/vim-cpp-enhanced-highlight
   c/c++:vim-jp/cpp-vim
-  c-extensions:kergoth/aftersyntaxc.vim
   clojure:guns/vim-clojure-static
   coffee-script:kchmck/vim-coffee-script
   css:JulesWang/css.vim
-  csv:chrisbra/csv.vim
   cucumber:tpope/vim-cucumber
   dockerfile:honza/dockerfile.vim
   elixir:elixir-lang/vim-elixir
@@ -93,7 +93,7 @@ PACKS="
   jade:digitaltoad/vim-jade
   jasmine:glanotte/vim-jasmine
   javascript:pangloss/vim-javascript
-  json:leshill/vim-json
+  json:sheerun/vim-json
   jst:briancollins/vim-jst
   latex:LaTeX-Box-Team/LaTeX-Box
   less:groenewege/vim-less
@@ -130,6 +130,7 @@ PACKS="
   xls:vim-scripts/XSLT-syntax
   yard:sheerun/vim-yardoc
   vala:tkztmk/vim-vala
+  vm:lepture/vim-velocity
   css-color:ap/vim-css-color
 "
 

compiler/sbt.vim

@@ -0,0 +1,30 @@
+" Vim compiler file
+" Language:             Scala SBT (http://www.scala-sbt.org/)
+" Maintainer:           Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" License:              Apache 2
+" ----------------------------------------------------------------------------
+
+if exists('current_compiler')
+  finish
+endif
+let current_compiler = 'sbt'
+
+if exists(':CompilerSet') != 2          " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=sbt\ -Dsbt.log.noformat=true\ compile
+
+CompilerSet errorformat=
+      \%E\ %#[error]\ %f:%l:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z,
+      \%W\ %#[warn]\ %f:%l:\ %m,%C\ %#[warn]\ %p^,%-C%.%#,%Z,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2 ts=8 et:

compiler/typescript.vim

@@ -3,11 +3,14 @@ if exists("current_compiler")
 endif
 let current_compiler = "typescript"
 
+if !exists("g:typescript_compiler_binary")
+  let g:typescript_compiler_binary = "tsc"
+endif
+
 if !exists("g:typescript_compiler_options")
   let g:typescript_compiler_options = ""
 endif
 
-
-let &l:makeprg='tsc' . g:typescript_compiler_options . ' $*  %'
+let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $*  %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m

ftdetect/polyglot.vim

@@ -11,7 +11,6 @@ function! s:DetectCoffee()
     endif
 endfunction
 autocmd BufNewFile,BufRead * call s:DetectCoffee()
-au BufRead,BufNewFile *.csv,*.dat,*.tsv,*.tab set filetype=csv
 autocmd BufNewFile,BufReadPost *.feature,*.story set filetype=cucumber
 au BufNewFile,BufRead Dockerfile set filetype=dockerfile
 au BufRead,BufNewFile *.eex set filetype=eelixir
@@ -29,11 +28,11 @@ autocmd FileType ember-script set tabstop=2|set shiftwidth=2|set expandtab
 autocmd BufNewFile,BufRead *.emblem set filetype=emblem
 autocmd FileType emblem set tabstop=2|set shiftwidth=2|set expandtab
 autocmd BufNewFile,BufRead *.git/{,modules/**/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG set ft=gitcommit
-autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules set ft=gitconfig
-autocmd BufNewFile,BufRead */.config/git/config                set ft=gitconfig
-autocmd BufNewFile,BufRead *.git/modules/**/config             set ft=gitconfig
-autocmd BufNewFile,BufRead git-rebase-todo                     set ft=gitrebase
-autocmd BufNewFile,BufRead .gitsendemail.*                     set ft=gitsendemail
+autocmd BufNewFile,BufRead *.git/config,.gitconfig,gitconfig,.gitmodules set ft=gitconfig
+autocmd BufNewFile,BufRead */.config/git/config                          set ft=gitconfig
+autocmd BufNewFile,BufRead *.git/modules/**/config                       set ft=gitconfig
+autocmd BufNewFile,BufRead git-rebase-todo                               set ft=gitrebase
+autocmd BufNewFile,BufRead .gitsendemail.*                               set ft=gitsendemail
 autocmd BufNewFile,BufRead *.git/**
       \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
       \   set ft=git |
@@ -49,18 +48,19 @@ autocmd BufNewFile,BufRead *
 let s:current_fileformats = ''
 let s:current_fileencodings = ''
 function! s:gofiletype_pre()
-  let s:current_fileformats = &g:fileformats
-  let s:current_fileencodings = &g:fileencodings
-  set fileencodings=utf-8 fileformats=unix
-  setlocal filetype=go
+    let s:current_fileformats = &g:fileformats
+    let s:current_fileencodings = &g:fileencodings
+    set fileencodings=utf-8 fileformats=unix
+    setlocal filetype=go
 endfunction
 function! s:gofiletype_post()
-  let &g:fileformats = s:current_fileformats
-  let &g:fileencodings = s:current_fileencodings
+    let &g:fileformats = s:current_fileformats
+    let &g:fileencodings = s:current_fileencodings
 endfunction
 au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
 au BufRead *.go call s:gofiletype_pre()
 au BufReadPost *.go call s:gofiletype_post()
+au BufRead,BufNewFile *.tmpl set filetype=gohtmltmpl
 autocmd BufNewFile,BufRead *.haml,*.hamlbars,*.hamlc setf haml
 autocmd BufNewFile,BufRead *.sass setf sass
 autocmd BufNewFile,BufRead *.scss setf scss
@@ -77,15 +77,12 @@ fun! s:SelectJavascript()
 endfun
 au BufNewFile,BufRead * call s:SelectJavascript()
 autocmd BufNewFile,BufRead *.json set filetype=json
-augroup json_autocmd
-  autocmd!
-  autocmd FileType json setlocal autoindent
-  autocmd FileType json setlocal formatoptions=tcq2l
-  autocmd FileType json setlocal foldmethod=syntax
-augroup END
-au BufNewFile,BufRead *.ejs		set filetype=jst
-au BufNewFile,BufRead *.jst  		set filetype=jst
+autocmd BufNewFile,BufRead *.jsonp set filetype=json
+au BufNewFile,BufRead *.ejs set filetype=jst
+au BufNewFile,BufRead *.jst set filetype=jst
+au BufNewFile,BufRead *.djs set filetype=jst
 au BufNewFile,BufRead *.hamljs set filetype=jst
+au BufNewFile,BufRead *.ect set filetype=jst
 autocmd BufNewFile,BufRead *.less setf less
 au BufNewFile,BufRead *.liquid					set ft=liquid
 au BufNewFile,BufRead */_layouts/*.html,*/_includes/*.html	set ft=liquid
@@ -133,7 +130,7 @@ function! s:DetectPerl6()
       endif
       if line =~ '^\s*\%(use\s\+\)\=v6\%(\.\d\%(\.\d\)\=\)\=;'
         set filetype=perl6 " we matched a 'use v6' declaration
-      elseif line =~ '^\s*\%(\%(my\|our\)\s\+\)\=\(module\|class\|role\|enum\|grammar\)'
+      elseif line =~ '^\s*\%(\%(my\|our\)\s\+\)\=\%(unit\s\+\)\=\(module\|class\|role\|enum\|grammar\)'
         set filetype=perl6 " we found a class, role, module, enum, or grammar declaration
       endif
       break " we either found what we needed, or we found a non-POD, non-comment,
@@ -142,7 +139,7 @@ function! s:DetectPerl6()
   endwhile
 endfunction
 autocmd BufReadPost *.pl,*.pm,*.t call s:DetectPerl6()
-autocmd BufNew,BufRead *.nqp setf perl6
+autocmd BufNew,BufNewFile,BufRead *.nqp setf perl6
 autocmd BufNewFile,BufRead *.proto setfiletype proto
 au BufNewFile,BufRead   *.ps1   set ft=ps1
 au BufNewFile,BufRead   *.psd1  set ft=ps1
@@ -178,14 +175,15 @@ au BufNewFile,BufRead [Bb]uildfile		call s:setf('ruby')
 au BufNewFile,BufRead Appraisals		call s:setf('ruby')
 au BufNewFile,BufRead Podfile,*.podspec		call s:setf('ruby')
 au BufRead,BufNewFile *.rs set filetype=rust
-au BufRead,BufNewFile *.sbt set filetype=sbt
+au BufRead,BufNewFile *.sbt set filetype=sbt.scala
 fun! s:DetectScala()
-    if getline(1) == '#!/usr/bin/env scala'
+    if getline(1) =~# '^#!\(/usr\)\?/bin/env\s\+scalas\?'
         set filetype=scala
     endif
 endfun
-au BufRead,BufNewFile *.scala,*.sbt set filetype=scala
+au BufRead,BufNewFile *.scala set filetype=scala
 au BufRead,BufNewFile * call s:DetectScala()
+au BufRead,BufNewFile *.sbt setfiletype sbt.scala
 autocmd BufNewFile,BufRead *.slim set filetype=slim
 autocmd BufNewFile,BufReadPost *.styl set filetype=stylus
 autocmd BufNewFile,BufReadPost *.stylus set filetype=stylus
@@ -201,9 +199,12 @@ au BufNewFile,BufRead *.timer     set filetype=systemd
 au BufRead,BufNewFile *.textile set filetype=textile
 au BufNewFile,BufRead *.thrift setlocal filetype=thrift
 autocmd BufNewFile,BufRead {.,}tmux.conf{.*,} setlocal filetype=tmux
+autocmd BufNewFile,BufRead {.,}tmux.conf{.*,} setlocal commentstring=#\ %s
 autocmd BufNewFile,BufRead *.toml set filetype=toml
+autocmd BufNewFile,BufRead Cargo.lock set filetype=toml
 autocmd BufNewFile,BufRead *.twig set filetype=twig
 autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig
 autocmd BufNewFile,BufRead *.ts setlocal filetype=typescript
 autocmd BufRead *.vala,*.vapi set efm=%f:%l.%c-%[%^:]%#:\ %t%[%^:]%#:\ %m
 au BufRead,BufNewFile *.vala,*.vapi setfiletype vala
+au BufRead,BufNewFile *.vm set ft=velocity syntax=velocity

ftplugin/cucumber.vim

@@ -19,6 +19,9 @@ setlocal omnifunc=CucumberComplete
 let b:undo_ftplugin = "setl fo< com< cms< ofu<"
 
 let b:cucumber_root = expand('%:p:h:s?.*[\/]\%(features\|stories\)\zs[\/].*??')
+if !exists("b:cucumber_steps_glob")
+  let b:cucumber_steps_glob = b:cucumber_root.'/**/*.rb'
+endif
 
 if !exists("g:no_plugin_maps") && !exists("g:no_cucumber_maps")
   cnoremap <SID>foldopen <Bar>if &foldopen =~# 'tag'<Bar>exe 'norm! zv'<Bar>endif
@@ -52,7 +55,7 @@ endfunction
 function! s:allsteps()
   let step_pattern = '\C^\s*\K\k*\>\s*(\=\s*\zs\S.\{-\}\ze\s*)\=\s*\%(do\|{\)\s*\%(|[^|]*|\s*\)\=\%($\|#\)'
   let steps = []
-  for file in split(glob(b:cucumber_root.'/**/*.rb'),"\n")
+  for file in split(glob(b:cucumber_steps_glob),"\n")
     let lines = readfile(file)
     let num = 0
     for line in lines

ftplugin/jade.vim

@@ -11,6 +11,8 @@ endif
 let s:save_cpo = &cpo
 set cpo-=C
 
+setlocal iskeyword+=-
+
 " Define some defaults in case the included ftplugins don't set them.
 let s:undo_ftplugin = ""
 let s:browsefilter = "All Files (*.*)\t*.*\n"

ftplugin/latex-box/common.vim

@@ -64,14 +64,24 @@ setlocal efm+=%-G%.%#
 
 " Vim Windows {{{
 
-" Width of vertical splits
+" Type of split, "new" for horiz. "vnew" for vert.
+if !exists('g:LatexBox_split_type')
+	let g:LatexBox_split_type = "vnew"
+endif
+
+" Length of vertical splits
+if !exists('g:LatexBox_split_length')
+	let g:LatexBox_split_length = 15
+endif
+
+" Width of horizontal splits
 if !exists('g:LatexBox_split_width')
 	let g:LatexBox_split_width = 30
 endif
 
-" Where vertical splits appear
+" Where splits appear
 if !exists('g:LatexBox_split_side')
-	let g:LatexBox_split_side = "leftabove"
+	let g:LatexBox_split_side = "aboveleft"
 endif
 
 " Resize when split?
@@ -169,7 +179,13 @@ function! LatexBox_GetTexRoot()
 	return fnamemodify(LatexBox_GetMainTexFile(), ':h')
 endfunction
 
-function! LatexBox_GetTexBasename(with_dir)
+function! LatexBox_GetBuildBasename(with_dir)
+	" 1. Check for g:LatexBox_jobname
+	if exists('g:LatexBox_jobname')
+		return g:LatexBox_jobname
+	endif
+
+	" 2. Get the basename from the main tex file
 	if a:with_dir
 		return fnamemodify(LatexBox_GetMainTexFile(), ':r')
 	else
@@ -180,48 +196,48 @@ endfunction
 function! LatexBox_GetAuxFile()
 	" 1. check for b:build_dir variable
 	if exists('b:build_dir') && isdirectory(b:build_dir)
-		return b:build_dir . '/' . LatexBox_GetTexBasename(0) . '.aux'
+		return b:build_dir . '/' . LatexBox_GetBuildBasename(0) . '.aux'
 	endif
 
 	" 2. check for g:LatexBox_build_dir variable
 	if exists('g:LatexBox_build_dir') && isdirectory(g:LatexBox_build_dir)
-		return g:LatexBox_build_dir . '/' . LatexBox_GetTexBasename(0) . '.aux'
+		return g:LatexBox_build_dir . '/' . LatexBox_GetBuildBasename(0) . '.aux'
 	endif
 
 	" 3. use the base name of main tex file
-	return LatexBox_GetTexBasename(1) . '.aux'
+	return LatexBox_GetBuildBasename(1) . '.aux'
 endfunction
 
 function! LatexBox_GetLogFile()
 	" 1. check for b:build_dir variable
 	if exists('b:build_dir') && isdirectory(b:build_dir)
-		return b:build_dir . '/' . LatexBox_GetTexBasename(0) . '.log'
+		return b:build_dir . '/' . LatexBox_GetBuildBasename(0) . '.log'
 	endif
 
 	" 2. check for g:LatexBox_build_dir variable
 	if exists('g:LatexBox_build_dir') && isdirectory(g:LatexBox_build_dir)
-		return g:LatexBox_build_dir . '/' . LatexBox_GetTexBasename(0) . '.log'
+		return g:LatexBox_build_dir . '/' . LatexBox_GetBuildBasename(0) . '.log'
 	endif
 
 	" 3. use the base name of main tex file
-	return LatexBox_GetTexBasename(1) . '.log'
+	return LatexBox_GetBuildBasename(1) . '.log'
 endfunction
 
 function! LatexBox_GetOutputFile()
 	" 1. check for b:build_dir variable
 	if exists('b:build_dir') && isdirectory(b:build_dir)
-		return b:build_dir . '/' . LatexBox_GetTexBasename(0)
+		return b:build_dir . '/' . LatexBox_GetBuildBasename(0)
 					\ . '.' . g:LatexBox_output_type
 	endif
 
 	" 2. check for g:LatexBox_build_dir variable
 	if exists('g:LatexBox_build_dir') && isdirectory(g:LatexBox_build_dir)
-		return g:LatexBox_build_dir . '/' . LatexBox_GetTexBasename(0)
+		return g:LatexBox_build_dir . '/' . LatexBox_GetBuildBasename(0)
 					\ . '.' . g:LatexBox_output_type
 	endif
 
 	" 3. use the base name of main tex file
-	return LatexBox_GetTexBasename(1) . '.' . g:LatexBox_output_type
+	return LatexBox_GetBuildBasename(1) . '.' . g:LatexBox_output_type
 endfunction
 " }}}
 
@@ -229,12 +245,18 @@ endfunction
 
 " Default pdf viewer
 if !exists('g:LatexBox_viewer')
-	if has('win32')
-		" On windows, 'running' a file will open it with the default program
-		let g:LatexBox_viewer = ''
-	else
-		let g:LatexBox_viewer = 'xdg-open'
+	" On windows, 'running' a file will open it with the default program
+	let s:viewer = ''
+	if has('unix')
+	  " echo -n necessary as uname -s will append \n otherwise
+      let s:uname = system('echo -n $(uname -s)')
+	  if s:uname == "Darwin"
+		  let s:viewer = 'open'
+	  else
+		  let s:viewer = 'xdg-open'
+	  endif
 	endif
+	let g:LatexBox_viewer = s:viewer
 endif
 
 function! LatexBox_View(...)
@@ -248,7 +270,12 @@ function! LatexBox_View(...)
 	if has('win32')
 		let cmd = '!start /b ' . cmd . ' >nul'
 	else
-		let cmd = '!' . cmd . ' &>/dev/null &'
+		let cmd = '!' . cmd . ' '
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let cmd .= ' >/dev/null ^/dev/null &'
+		else
+			let cmd .= ' &>/dev/null &'
+		endif
 	endif
 	silent execute cmd
 	if !has("gui_running")

ftplugin/latex-box/complete.vim

@@ -24,7 +24,7 @@ if !exists('g:LatexBox_cite_pattern')
 	let g:LatexBox_cite_pattern = '\C\\\a*cite\a*\*\?\(\[[^\]]*\]\)*\_\s*{'
 endif
 if !exists('g:LatexBox_ref_pattern')
-	let g:LatexBox_ref_pattern = '\C\\v\?\(eq\|page\|[cC]\|labelc\)\?ref\*\?\_\s*{'
+	let g:LatexBox_ref_pattern = '\C\\v\?\(eq\|page\|[cC]\|labelc\|name\|auto\)\?ref\*\?\_\s*{'
 endif
 
 if !exists('g:LatexBox_completion_environments')
@@ -255,14 +255,14 @@ function! LatexBox_BibSearch(regexp)
 		if has('win32')
 			let l:old_shellslash = &l:shellslash
 			setlocal noshellslash
-			silent execute '! cd ' shellescape(LatexBox_GetTexRoot()) .
+			call system('cd ' . shellescape(LatexBox_GetTexRoot()) .
 						\ ' & bibtex -terse '
-						\ . fnamemodify(auxfile, ':t') . ' >nul'
+						\ . fnamemodify(auxfile, ':t') . ' >nul')
 			let &l:shellslash = l:old_shellslash
 		else
-			silent execute '! cd ' shellescape(LatexBox_GetTexRoot()) .
+			call system('cd ' . shellescape(LatexBox_GetTexRoot()) .
 						\ ' ; bibtex -terse '
-						\ . fnamemodify(auxfile, ':t') . ' >/dev/null'
+						\ . fnamemodify(auxfile, ':t') . ' >/dev/null')
 		endif
 
 		let lines = split(substitute(join(readfile(bblfile), "\n"),
@@ -459,7 +459,8 @@ function! s:GetLabelCache(file)
 
 	if !has_key(s:LabelCache , a:file) || s:LabelCache[a:file][0] != getftime(a:file)
 		" Open file in temporary split window for label extraction.
-		silent execute '1sp +let\ labels=s:ExtractLabels()|let\ inputs=s:ExtractInputs()|quit! ' . fnameescape(a:file)
+		let main_tex_file = LatexBox_GetMainTexFile()
+		silent execute '1sp +let\ b:main_tex_file=main_tex_file|let\ labels=s:ExtractLabels()|let\ inputs=s:ExtractInputs()|quit! ' . fnameescape(a:file)
 		let s:LabelCache[a:file] = [ getftime(a:file), labels, inputs ]
 	endif
 

ftplugin/latex-box/findmain.vim

@@ -30,7 +30,7 @@ function! LatexBox_GetMainFileName(...)
 	" move up the directory tree until we find a .latexmain file.
 	" TODO: Should we be doing this recursion by default, or should there be a
 	"       setting?
-	while glob('*.latexmain') == ''
+	while glob('*.latexmain',1) == ''
 		let dirmodifier = dirmodifier.':h'
 		let dirNew = fnameescape(expand(dirmodifier))
 		" break from the loop if we cannot go up any further.
@@ -41,7 +41,7 @@ function! LatexBox_GetMainFileName(...)
 		exe 'cd '.dirLast
 	endwhile
 
-	let lheadfile = glob('*.latexmain')
+	let lheadfile = glob('*.latexmain',1)
 	if lheadfile != ''
 		" Remove the trailing .latexmain part of the filename... We never want
 		" that.

ftplugin/latex-box/folding.vim

@@ -75,8 +75,8 @@ if g:LatexBox_fold_automatic == 1
 	"
 	augroup FastFold
 		autocmd!
-		autocmd InsertEnter *.tex setlocal foldmethod=manual
-		autocmd InsertLeave *.tex setlocal foldmethod=expr
+		autocmd InsertEnter *.tex if !&diff | setlocal foldmethod=manual | endif
+		autocmd InsertLeave *.tex if !&diff | setlocal foldmethod=expr | endif
 	augroup end
 else
 	setl foldmethod=manual

ftplugin/latex-box/latexmk.vim

@@ -141,7 +141,7 @@ endfunction
 
 function! LatexBox_Latexmk(force)
 	" Define often used names
-	let basepath = LatexBox_GetTexBasename(1)
+	let basepath = LatexBox_GetBuildBasename(1)
 	let basename = fnamemodify(basepath, ':t')
 	let texroot = shellescape(LatexBox_GetTexRoot())
 	let mainfile = fnameescape(fnamemodify(LatexBox_GetMainTexFile(), ':t'))
@@ -166,7 +166,11 @@ function! LatexBox_Latexmk(force)
 	elseif match(&shell, '/tcsh$') >= 0
 		let env = 'setenv max_print_line ' . max_print_line . '; '
 	else
-		let env = 'max_print_line=' . max_print_line
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let env = 'set max_print_line ' . max_print_line . '; and '
+		else
+			let env = 'max_print_line=' . max_print_line
+		endif
 	endif
 
 	" Set environment options
@@ -177,7 +181,11 @@ function! LatexBox_Latexmk(force)
 		" Make sure to switch drive as well as directory
 		let cmd = 'cd /D ' . texroot . ' && '
 	else
-		let cmd = 'cd ' . texroot . ' && '
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let cmd = 'cd ' . texroot . '; and '
+		else
+			let cmd = 'cd ' . texroot . ' && '
+		endif
 	endif
 	let cmd .= env . ' latexmk'
 	if ! g:LatexBox_personal_latexmkrc
@@ -203,7 +211,11 @@ function! LatexBox_Latexmk(force)
 	if has('win32')
 		let cmd .= ' >nul'
 	else
-		let cmd .= ' &>/dev/null'
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let cmd .= ' >/dev/null ^/dev/null'
+		else
+			let cmd .= ' &>/dev/null'
+		endif
 	endif
 
 	if g:LatexBox_latexmk_async
@@ -357,7 +369,7 @@ function! LatexBox_LatexmkClean(cleanall)
 		return
 	endif
 
-	let basename = LatexBox_GetTexBasename(1)
+	let basename = LatexBox_GetBuildBasename(1)
 
 	if has_key(g:latexmk_running_pids, basename)
 		echomsg "don't clean when latexmk is running"
@@ -443,10 +455,32 @@ function! LatexBox_LatexErrors(status, ...)
 	endif
 endfunction
 
+" Redefine uniq() for compatibility with older Vim versions (< 7.4.218)
+function! s:uniq(list)
+        if exists('*uniq')
+                return uniq(a:list)
+        elseif len(a:list) <= 1
+                return a:list
+        endif
+
+        let last_element = get(a:list,0)
+        let uniq_list = [last_element]
+
+        for i in range(1, len(a:list)-1)
+                let next_element = get(a:list, i)
+                if last_element == next_element
+                        continue
+                endif
+                let last_element = next_element
+                call add(uniq_list, next_element)
+        endfor
+        return uniq_list
+endfunction
+
 function! s:log_contains_error(file)
 	let lines = readfile(a:file)
 	let lines = filter(lines, 'v:val =~ ''^.*:\d\+: ''')
-	let lines = uniq(map(lines, 'matchstr(v:val, ''^.*\ze:\d\+:'')'))
+	let lines = s:uniq(map(lines, 'matchstr(v:val, ''^.*\ze:\d\+:'')'))
 	let lines = filter(lines, 'filereadable(fnameescape(v:val))')
 	return len(lines) > 0
 endfunction
@@ -468,7 +502,7 @@ function! LatexBox_LatexmkStatus(detailed)
 			echo "latexmk is running (" . plist . ")"
 		endif
 	else
-		let basename = LatexBox_GetTexBasename(1)
+		let basename = LatexBox_GetBuildBasename(1)
 		if has_key(g:latexmk_running_pids, basename)
 			echo "latexmk is running"
 		else
@@ -482,12 +516,12 @@ endfunction
 function! LatexBox_LatexmkStop(silent)
 	if empty(g:latexmk_running_pids)
 		if !a:silent
-			let basepath = LatexBox_GetTexBasename(1)
+			let basepath = LatexBox_GetBuildBasename(1)
 			let basename = fnamemodify(basepath, ':t')
 			echoerr "latexmk is not running for `" . basename . "'"
 		endif
 	else
-		let basepath = LatexBox_GetTexBasename(1)
+		let basepath = LatexBox_GetBuildBasename(1)
 		let basename = fnamemodify(basepath, ':t')
 		if has_key(g:latexmk_running_pids, basepath)
 			call s:kill_latexmk_process(g:latexmk_running_pids[basepath])

ftplugin/latex-box/mappings.vim

@@ -5,31 +5,31 @@ if exists("g:LatexBox_no_mappings")
 endif
 
 " latexmk {{{
-map <buffer> <LocalLeader>ll :Latexmk<CR>
-map <buffer> <LocalLeader>lL :Latexmk!<CR>
-map <buffer> <LocalLeader>lc :LatexmkClean<CR>
-map <buffer> <LocalLeader>lC :LatexmkClean!<CR>
-map <buffer> <LocalLeader>lg :LatexmkStatus<CR>
-map <buffer> <LocalLeader>lG :LatexmkStatus!<CR>
-map <buffer> <LocalLeader>lk :LatexmkStop<CR>
-map <buffer> <LocalLeader>le :LatexErrors<CR>
+noremap <buffer> <LocalLeader>ll :Latexmk<CR>
+noremap <buffer> <LocalLeader>lL :Latexmk!<CR>
+noremap <buffer> <LocalLeader>lc :LatexmkClean<CR>
+noremap <buffer> <LocalLeader>lC :LatexmkClean!<CR>
+noremap <buffer> <LocalLeader>lg :LatexmkStatus<CR>
+noremap <buffer> <LocalLeader>lG :LatexmkStatus!<CR>
+noremap <buffer> <LocalLeader>lk :LatexmkStop<CR>
+noremap <buffer> <LocalLeader>le :LatexErrors<CR>
 " }}}
 
 " View {{{
-map <buffer> <LocalLeader>lv :LatexView<CR>
+noremap <buffer> <LocalLeader>lv :LatexView<CR>
 " }}}
 
 " TOC {{{
-map <silent> <buffer> <LocalLeader>lt :LatexTOC<CR>
+noremap <silent> <buffer> <LocalLeader>lt :LatexTOC<CR>
 " }}}
 
 " List of labels {{{
-map <silent> <buffer> <LocalLeader>lj :LatexLabels<CR>
+noremap <silent> <buffer> <LocalLeader>lj :LatexLabels<CR>
 " }}}
 
 " Folding {{{
 if g:LatexBox_Folding == 1
-	map <buffer> <LocalLeader>lf :LatexFold<CR>
+	noremap <buffer> <LocalLeader>lf :LatexFold<CR>
 endif
 " }}}
 
@@ -44,12 +44,12 @@ endif
 " Define text objects {{{
 vmap <buffer> ie <Plug>LatexBox_SelectCurrentEnvInner
 vmap <buffer> ae <Plug>LatexBox_SelectCurrentEnvOuter
-omap <buffer> ie :normal vie<CR>
-omap <buffer> ae :normal vae<CR>
+onoremap <buffer> ie :normal vie<CR>
+onoremap <buffer> ae :normal vae<CR>
 vmap <buffer> i$ <Plug>LatexBox_SelectInlineMathInner
 vmap <buffer> a$ <Plug>LatexBox_SelectInlineMathOuter
-omap <buffer> i$ :normal vi$<CR>
-omap <buffer> a$ :normal va$<CR>
+onoremap <buffer> i$ :normal vi$<CR>
+onoremap <buffer> a$ :normal va$<CR>
 " }}}
 
 " Jump between sections {{{

ftplugin/latex-box/motion.vim

@@ -349,7 +349,7 @@ function! s:ReadTOC(auxfile, texfile, ...)
 		if len(tree) > 3 && empty(tree[1])
 			call remove(tree, 1)
 		endif
-		if len(tree) > 1 && tree[0] =~ '^\\\(numberline\|tocsection\)'
+		if len(tree) > 1 && type(tree[0]) == type("") && tree[0] =~ '^\\\(\(chapter\)\?numberline\|tocsection\)'
 			let secnum = LatexBox_TreeToTex(tree[1])
 			let secnum = substitute(secnum, '\\\S\+\s', '', 'g')
 			let secnum = substitute(secnum, '\\\S\+{\(.\{-}\)}', '\1', 'g')
@@ -359,7 +359,7 @@ function! s:ReadTOC(auxfile, texfile, ...)
 		" parse section title
 		let text = LatexBox_TreeToTex(tree)
 		let text = substitute(text, '^{\+\|}\+$',                 '', 'g')
-		let text = substitute(text, '\m^\\\(no\)\?numberline\s*', '', '')
+		let text = substitute(text, '\m^\\\(no\)\?\(chapter\)\?numberline\s*', '', '')
 		let text = substitute(text, '\*',                         '', 'g')
 
 		" add TOC entry
@@ -379,6 +379,21 @@ function! LatexBox_TOC(...)
 
 	" Check if window already exists
 	let winnr = bufwinnr(bufnr('LaTeX TOC'))
+	" Two types of splits, horizontal and vertical
+	let l:hori = "new"
+	let l:vert = "vnew"
+
+	" Set General Vars and initialize size
+	let l:type = g:LatexBox_split_type
+	let l:size = 10
+
+	" Size detection
+	if l:type == l:hori
+	  let l:size = g:LatexBox_split_length
+	elseif l:type == l:vert
+	  let l:size = g:LatexBox_split_width
+	endif
+
 	if winnr >= 0
 		if a:0 == 0
 			silent execute winnr . 'wincmd w'
@@ -386,13 +401,12 @@ function! LatexBox_TOC(...)
 			" Supplying an argument to this function causes toggling instead
 			" of jumping to the TOC window
 			if g:LatexBox_split_resize
-				silent exe "set columns-=" . g:LatexBox_split_width
+				silent exe "set columns-=" . l:size
 			endif
 			silent execute 'bwipeout' . bufnr('LaTeX TOC')
 		endif
 		return
 	endif
-
 	" Read TOC
 	let [toc, fileindices] = s:ReadTOC(LatexBox_GetAuxFile(),
 									 \ LatexBox_GetMainTexFile())
@@ -403,9 +417,10 @@ function! LatexBox_TOC(...)
 
 	" Create TOC window and set local settings
 	if g:LatexBox_split_resize
-		silent exe "set columns+=" . g:LatexBox_split_width
+		silent exe "set columns+=" . l:size
 	endif
-	silent exe g:LatexBox_split_side g:LatexBox_split_width . 'vnew LaTeX\ TOC'
+	silent exe g:LatexBox_split_side l:size . l:type . ' LaTeX\ TOC'
+
 	let b:toc = toc
 	let b:toc_numbers = 1
 	let b:calling_win = bufwinnr(calling_buf)

ftplugin/perl.vim

@@ -77,7 +77,7 @@ endif
 "---------------------------------------------
 
 " Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp< path<" .
+let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk< isf< kp< path<" .
 	    \	      " | unlet! b:browsefilter"
 
 " proper matching for matchit plugin

ftplugin/perl6.vim

@@ -20,7 +20,7 @@ setlocal formatoptions-=t
 setlocal formatoptions+=crqol
 setlocal keywordprg=p6doc
 
-setlocal comments=:#
+setlocal comments=:#\|,:#=,:#
 setlocal commentstring=#%s
 
 " Change the browse dialog on Win32 to show mainly Perl-related files
@@ -43,7 +43,7 @@ setlocal define=[^A-Za-z_]
 " after/ftplugin/perl6.vim file that contains
 "       set isfname-=:
 set isfname+=:
-setlocal iskeyword=48-57,_,A-Z,a-z,:,-
+setlocal iskeyword=@,48-57,_,192-255,:,-,'
 
 " Set this once, globally.
 if !exists("perlpath")
@@ -65,11 +65,22 @@ if !exists("perlpath")
     endif
 endif
 
-let &l:path=perlpath
+" Append perlpath to the existing path value, if it is set.  Since we don't
+" use += to do it because of the commas in perlpath, we have to handle the
+" global / local settings, too.
+if &l:path == ""
+    if &g:path == ""
+        let &l:path=perlpath
+    else
+        let &l:path=&g:path.",".perlpath
+    endif
+else
+    let &l:path=&l:path.",".perlpath
+endif
 "---------------------------------------------
 
 " Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk<" .
+let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< isk< kp< path<" .
         \         " | unlet! b:browsefilter"
 
 " Restore the saved compatibility options.

ftplugin/ruby.vim

@@ -28,7 +28,7 @@ if exists("loaded_matchit") && !exists("b:match_words")
 	\ ':' .
 	\ '\<\%(else\|elsif\|ensure\|when\|rescue\|break\|redo\|next\|retry\)\>' .
 	\ ':' .
-	\ '\<end\>' .
+        \ '\%(^\|[^.\:@$]\)\@<=\<end\:\@!\>' .
 	\ ',{:},\[:\],(:)'
 
   let b:match_skip =

ftplugin/scala.vim

@@ -1,14 +1,33 @@
-setlocal formatoptions+=ro
-setlocal commentstring=//%s
-let &l:include = '^\s*import'
-let &l:includeexpr = 'substitute(v:fname,"\\.","/","g")'
+" Vim filetype plugin
+" Language:             Scala
+" Maintainer:           Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" License:              Apache 2
+" ----------------------------------------------------------------------------
+
+if exists('b:did_ftplugin') || &cp
+  finish
+endif
+let b:did_ftplugin = 1
+
+" j is fairly new in Vim, so don't complain if it's not there
+setlocal formatoptions-=t formatoptions+=croqnl
+silent! setlocal formatoptions+=j
+
+" Just like c.vim, but additionally doesn't wrap text onto /** line when
+" formatting. Doesn't bungle bulleted lists when formatting.
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/**,mb:*,ex:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+setlocal shiftwidth=2 softtabstop=2 expandtab
+
+setlocal include='^\s*import'
+setlocal includeexpr='substitute(v:fname,"\\.","/","g")'
+
 setlocal path+=src/main/scala,src/test/scala
 setlocal suffixesadd=.scala
 
-set makeprg=sbt\ -Dsbt.log.noformat=true\ compile
-set efm=%E\ %#[error]\ %f:%l:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z,
-       \%W\ %#[warn]\ %f:%l:\ %m,%C\ %#[warn]\ %p^,%-C%.%#,%Z,
-       \%-G%.%#
+compiler sbt
 
 if globpath(&rtp, 'plugin/fuf.vim') != ''
     "
@@ -127,49 +146,6 @@ if globpath(&rtp, 'plugin/fuf.vim') != ''
     endif
 endif
 
-" If you want to disable the default key mappings, write the following line in
-" your ~/.vimrc
-"     let g:scala_use_default_keymappings = 0
-if get(g:, 'scala_use_default_keymappings', 1)
-    nnoremap <buffer> <Leader>jt :call JustifyCurrentLine()<cr>
-endif
-
-"
-" TagBar
-"
-let g:tagbar_type_scala = {
-    \ 'ctagstype' : 'scala',
-    \ 'kinds'     : [
-      \ 'p:packages:1',
-      \ 'V:values',
-      \ 'v:variables',
-      \ 'T:types',
-      \ 't:traits',
-      \ 'o:objects',
-      \ 'a:aclasses',
-      \ 'c:classes',
-      \ 'r:cclasses',
-      \ 'm:methods'
-    \ ],
-    \ 'sro'        : '.',
-    \ 'kind2scope' : {
-        \ 'T' : 'type',
-        \ 't' : 'trait',
-        \ 'o' : 'object',
-        \ 'a' : 'abstract class',
-        \ 'c' : 'class',
-        \ 'r' : 'case class'
-    \ },
-    \ 'scope2kind' : {
-      \ 'type' : 'T',
-      \ 'trait' : 't',
-      \ 'object' : 'o',
-      \ 'abstract class' : 'a',
-      \ 'class' : 'c',
-      \ 'case class' : 'r'
-    \ }
-\ }
-
 function! s:CreateOrExpression(keywords)
   return '('.join(a:keywords, '|').')'
 endfunction
@@ -191,5 +167,6 @@ function! s:NextSection(backwards)
 endfunction
 
 noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
-
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
+
+" vim:set sw=2 sts=2 ts=8 et:

ftplugin/scala/tagbar.vim

@@ -0,0 +1,31 @@
+"
+" Support for Tagbar -- https://github.com/majutsushi/tagbar
+"
+" Hat tip to Leonard Ehrenfried for the built-in ctags deffile:
+"    https://leonard.io/blog/2013/04/editing-scala-with-vim/
+"
+if !exists(':Tagbar')
+  finish
+endif
+
+let g:tagbar_type_scala = {
+    \ 'ctagstype' : 'scala',
+    \ 'sro'        : '.',
+    \ 'kinds'     : [
+      \ 'p:packages',
+      \ 'T:types:1',
+      \ 't:traits',
+      \ 'o:objects',
+      \ 'O:case objects',
+      \ 'c:classes',
+      \ 'C:case classes',
+      \ 'm:methods',
+      \ 'V:values:1',
+      \ 'v:variables:1'
+    \ ]
+\ }
+
+" In case you've updated/customized your ~/.ctags and prefer to use it.
+if get(g:, 'scala_use_builtin_tagbar_defs', 1)
+  let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
+endif

ftplugin/toml.vim

@@ -11,6 +11,8 @@ let b:did_ftplugin = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
+setlocal commentstring=#\ %s
+
 " Add NERDCommenter delimiters
 
 let s:delims = { 'left': '#' }

ftplugin/typescript.vim

@@ -1,2 +1,19 @@
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
 compiler typescript
 setlocal commentstring=//\ %s
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" " and insert the comment leader when hitting <CR> or using "o".
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setl fo< ofu< com< cms<"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

indent/blade.vim

@@ -0,0 +1,62 @@
+" Language:     Blade
+" Author:       Barry Deeney <sitemaster16@gmail.com>
+" Version:      0.1
+" Description:  BLADE indent file based on HTML indentation...
+
+" Check if this file has already been loaded
+if exists("b:did_indent")
+	finish
+endif
+
+" Include HTML
+runtime! indent/html.vim
+runtime! indent/php.vim
+silent! unlet b:did_indent
+
+" What function do we need to use to detect indentation?
+setlocal indentexpr=BladeIndent()
+
+" What keys would trigger indentation?
+setlocal indentkeys=o,O,<Return>,<>>,{,},!^F,0{,0},0),:,!^F,o,O,e,*<Return>,=?>,=<?,=*/
+
+" THE MAIN INDENT FUNCTION. Return the amount of indent for v:lnum.
+func! BladeIndent()
+	" What is the current line?
+	let current_line = v:lnum
+
+	" What is the current text?
+	let current_text = tolower(getline(current_line))
+
+	" What was the last non blank line?
+	let previous_line = prevnonblank(current_line)
+
+	" What was the last non blank text?
+	let previous_text = tolower(getline(previous_line))
+
+	" How large are indents??
+	let indent_size = &sw
+
+	" Check if we have a PHPIndent value...
+	let indent = GetPhpIndent()
+
+	" check if we have indent
+	if indent == -1
+		" Check if we have BLADE
+		if current_text =~ '^\s*@' || previous_text =~ '^\s*@'
+			" We need to add to the indent
+			return indent_size * indent(previous_text)
+		endif
+
+		" Check if we have HTML
+		if current_text =~ '^\s*<' || previous_text =~ '^\s*<'
+			" We now give the honors to HtmlIndent()
+			let indent = HtmlIndent()
+		endif
+	endif
+
+	" Give the indent back!
+	return indent
+endfunc
+
+" Make sure we store that flag!
+let b:did_indent = 1

indent/elixir.vim

@@ -25,6 +25,7 @@ let s:block_skip   = "synIDattr(synID(line('.'),col('.'),1),'name') =~? '" . s:s
 let s:block_start  = 'do\|fn'
 let s:block_middle = 'else\|match\|elsif\|catch\|after\|rescue'
 let s:block_end    = 'end'
+let s:symbols_end  = '\]\|}'
 let s:arrow        = '^.*->$'
 let s:pipeline     = '^\s*|>.*$'
 
@@ -59,7 +60,11 @@ function! GetElixirIndent()
 
     let ind += opened_symbol * &sw
 
-    if current_line =~ '^\s*\(\]\|}\)'
+    if last_line =~ '^\s*\(' . s:symbols_end . '\)'
+      let ind += &sw
+    endif
+
+    if current_line =~ '^\s*\(' . s:symbols_end . '\)'
       let ind -= &sw
     endif
 

indent/go.vim

@@ -9,7 +9,7 @@
 " - general line splits (line ends in an operator)
 
 if exists("b:did_indent")
-    finish
+	finish
 endif
 let b:did_indent = 1
 
@@ -21,45 +21,58 @@ setlocal indentexpr=GoIndent(v:lnum)
 setlocal indentkeys+=<:>,0=},0=)
 
 if exists("*GoIndent")
-  finish
+	finish
+endif
+
+" use shiftwidth function only if it's available
+if exists('*shiftwidth')
+	func s:sw()
+		return shiftwidth()
+	endfunc
+else
+	func s:sw()
+		return &sw
+	endfunc
 endif
 
 function! GoIndent(lnum)
-  let prevlnum = prevnonblank(a:lnum-1)
-  if prevlnum == 0
-    " top of file
-    return 0
-  endif
+	let prevlnum = prevnonblank(a:lnum-1)
+	if prevlnum == 0
+		" top of file
+		return 0
+	endif
 
-  " grab the previous and current line, stripping comments.
-  let prevl = substitute(getline(prevlnum), '//.*$', '', '')
-  let thisl = substitute(getline(a:lnum), '//.*$', '', '')
-  let previ = indent(prevlnum)
+	" grab the previous and current line, stripping comments.
+	let prevl = substitute(getline(prevlnum), '//.*$', '', '')
+	let thisl = substitute(getline(a:lnum), '//.*$', '', '')
+	let previ = indent(prevlnum)
 
-  let ind = previ
+	let ind = previ
 
-  if prevl =~ '[({]\s*$'
-    " previous line opened a block
-    let ind += &sw
-  endif
-  if prevl =~# '^\s*\(case .*\|default\):$'
-    " previous line is part of a switch statement
-    let ind += &sw
-  endif
-  " TODO: handle if the previous line is a label.
+	if prevl =~ '[({]\s*$'
+		" previous line opened a block
+		let ind += s:sw()
+	endif
+	if prevl =~# '^\s*\(case .*\|default\):$'
+		" previous line is part of a switch statement
+		let ind += s:sw()
+	endif
+	" TODO: handle if the previous line is a label.
 
-  if thisl =~ '^\s*[)}]'
-    " this line closed a block
-    let ind -= &sw
-  endif
+	if thisl =~ '^\s*[)}]'
+		" this line closed a block
+		let ind -= s:sw()
+	endif
 
-  " Colons are tricky.
-  " We want to outdent if it's part of a switch ("case foo:" or "default:").
-  " We ignore trying to deal with jump labels because (a) they're rare, and
-  " (b) they're hard to disambiguate from a composite literal key.
-  if thisl =~# '^\s*\(case .*\|default\):$'
-    let ind -= &sw
-  endif
+	" Colons are tricky.
+	" We want to outdent if it's part of a switch ("case foo:" or "default:").
+	" We ignore trying to deal with jump labels because (a) they're rare, and
+	" (b) they're hard to disambiguate from a composite literal key.
+	if thisl =~# '^\s*\(case .*\|default\):$'
+		let ind -= s:sw()
+	endif
 
-  return ind
+	return ind
 endfunction
+
+" vim:ts=4:sw=4:et

indent/gohtmltmpl.vim

@@ -0,0 +1,5 @@
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/html.vim

indent/html.vim

@@ -128,8 +128,10 @@ call add(s:tags, 'nav')
 call add(s:tags, 'output')
 call add(s:tags, 'progress')
 call add(s:tags, 'picture')
+call add(s:tags, 'rb')
 call add(s:tags, 'rp')
 call add(s:tags, 'rt')
+call add(s:tags, 'rtc')
 call add(s:tags, 'ruby')
 call add(s:tags, 'section')
 call add(s:tags, 'source')

indent/javascript.vim

@@ -49,11 +49,11 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_term
+let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=].*,\)' . s:line_term
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
-let s:msl_regex = '\%([\\*+/.:([]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_term
+let s:msl_regex = s:continuation_regex
 
 let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 
@@ -443,11 +443,17 @@ function! Fixedgq(lnum, count)
     let l:tw = &tw ? &tw : 80;
 
     let l:count = a:count
+    let l:first_char = indent(a:lnum) + 1
 
     if mode() == 'i' " gq was not pressed, but tw was set
         return 1
     endif
 
+    " This gq is only meant to do code with strings, not comments
+    if s:IsLineComment(a:lnum, l:first_char) || s:IsInMultilineComment(a:lnum, l:first_char)
+        return 1
+    endif
+
     if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
         return 1
     endif

indent/json.vim

@@ -0,0 +1,169 @@
+" Vim indent file
+" Language:		JSON
+" Mantainer:		Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
+" Last Change:          2014-05-13: merged Fix for square bracket matching by Jakar 
+"   https://github.com/jakar/vim-json/commit/20b650e22aa750c4ab6a66aa646bdd95d7cd548a#diff-e81fc111b2052e306d126bd9989f7b7c
+" Original Author:	Rogerz Zhang <rogerz.zhang at gmail.com> http://github.com/rogerz/vim-json
+" Acknowledgement:      Based off of vim-javascript maintained by Darrick Wiebe 
+"                       http://www.vim.org/scripts/script.php?script_id=2765
+
+" 0. Initialization {{{1
+" =================
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+
+" Now, set up our indentation expression and keys that trigger it.
+setlocal indentexpr=GetJSONIndent()
+setlocal indentkeys=0{,0},0),0[,0],!^F,o,O,e
+
+" Only define the function once.
+if exists("*GetJSONIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" 1. Variables {{{1
+" ============
+
+let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
+" Regex that defines blocks.
+let s:block_regex = '\%({\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
+
+" 2. Auxiliary Functions {{{1
+" ======================
+
+" Check if the character at lnum:col is inside a string.
+function s:IsInString(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') == jsonString
+endfunction
+
+" Find line above 'lnum' that isn't empty, or in a string.
+function s:PrevNonBlankNonString(lnum)
+  let lnum = prevnonblank(a:lnum)
+  while lnum > 0
+    " If the line isn't empty or in a string, end search.
+    let line = getline(lnum)
+    if !(s:IsInString(lnum, 1) && s:IsInString(lnum, strlen(line)))
+      break
+    endif
+    let lnum = prevnonblank(lnum - 1)
+  endwhile
+  return lnum
+endfunction
+
+" Check if line 'lnum' has more opening brackets than closing ones.
+function s:LineHasOpeningBrackets(lnum)
+  let open_0 = 0
+  let open_2 = 0
+  let open_4 = 0
+  let line = getline(a:lnum)
+  let pos = match(line, '[][(){}]', 0)
+  while pos != -1
+    let idx = stridx('(){}[]', line[pos])
+    if idx % 2 == 0
+      let open_{idx} = open_{idx} + 1
+    else
+      let open_{idx - 1} = open_{idx - 1} - 1
+    endif
+    let pos = match(line, '[][(){}]', pos + 1)
+  endwhile
+  return (open_0 > 0) . (open_2 > 0) . (open_4 > 0)
+endfunction
+
+function s:Match(lnum, regex)
+  let col = match(getline(a:lnum), a:regex) + 1
+  return col > 0 && !s:IsInString(a:lnum, col) ? col : 0
+endfunction
+
+" 3. GetJSONIndent Function {{{1
+" =========================
+
+function GetJSONIndent()
+  " 3.1. Setup {{{2
+  " ----------
+
+  " Set up variables for restoring position in file.  Could use v:lnum here.
+  let vcol = col('.')
+
+  " 3.2. Work on the current line {{{2
+  " -----------------------------
+
+  " Get the current line.
+  let line = getline(v:lnum)
+  let ind = -1
+
+  " If we got a closing bracket on an empty line, find its match and indent
+  " according to it.
+  let col = matchend(line, '^\s*[]}]')
+
+  if col > 0 && !s:IsInString(v:lnum, col)
+    call cursor(v:lnum, col)
+    let bs = strpart('{}[]', stridx('}]', line[col - 1]) * 2, 2)
+
+    let pairstart = escape(bs[0], '[')
+    let pairend = escape(bs[1], ']')
+    let pairline = searchpair(pairstart, '', pairend, 'bW')
+
+    if pairline > 0 
+      let ind = indent(pairline)
+    else
+      let ind = virtcol('.') - 1
+    endif
+
+    return ind
+  endif
+
+  " If we are in a multi-line string, don't do anything to it.
+  if s:IsInString(v:lnum, matchend(line, '^\s*') + 1)
+    return indent('.')
+  endif
+
+  " 3.3. Work on the previous line. {{{2
+  " -------------------------------
+
+  let lnum = prevnonblank(v:lnum - 1)
+
+  if lnum == 0
+    return 0
+  endif
+
+  " Set up variables for current line.
+  let line = getline(lnum)
+  let ind = indent(lnum)
+
+  " If the previous line ended with a block opening, add a level of indent.
+  " if s:Match(lnum, s:block_regex)
+    " return indent(lnum) + shiftwidth()
+  " endif
+
+  " If the previous line contained an opening bracket, and we are still in it,
+  " add indent depending on the bracket type.
+  if line =~ '[[({]'
+    let counts = s:LineHasOpeningBrackets(lnum)
+    if counts[0] == '1' || counts[1] == '1' || counts[2] == '1'
+      return ind + shiftwidth()
+    else
+      call cursor(v:lnum, vcol)
+    end
+  endif
+
+  " }}}2
+
+  return ind
+endfunction
+
+" }}}1
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2 ts=8 noet:
+

indent/perl.vim

@@ -48,11 +48,6 @@ function! GetPerlIndent()
         return 0
     endif
 
-    " Don't reindent comments on first column
-    if cline =~ '^#.'
-        return 0
-    endif
-
     " Get current syntax item at the line's first char
     let csynid = ''
     if b:indent_use_syntax

indent/perl6.vim

@@ -60,11 +60,6 @@ function! GetPerl6Indent()
         return 0
     endif
 
-    " Don't reindent coments on first column
-    if cline =~ '^#'
-        return 0
-    endif
-
     " Get current syntax item at the line's first char
     let csynid = ''
     if b:indent_use_syntax

indent/ruby.vim

@@ -440,10 +440,14 @@ function GetRubyIndent(...)
 
       if strpart(line, 0, col('.') - 1) =~ '=\s*$' &&
             \ strpart(line, col('.') - 1, 2) !~ 'do'
+        " assignment to case/begin/etc, on the same line, hanging indent
         let ind = virtcol('.') - 1
       elseif getline(msl) =~ '=\s*\(#.*\)\=$'
+        " in the case of assignment to the msl, align to the starting line,
+        " not to the msl
         let ind = indent(line('.'))
       else
+        " align to the msl
         let ind = indent(msl)
       endif
     endif
@@ -508,7 +512,16 @@ function GetRubyIndent(...)
 
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
-    return indent(s:GetMSL(lnum)) + sw
+    let msl = s:GetMSL(lnum)
+
+    if getline(msl) =~ '=\s*\(#.*\)\=$'
+      " in the case of assignment to the msl, align to the starting line,
+      " not to the msl
+      let ind = indent(lnum) + sw
+    else
+      let ind = indent(msl) + sw
+    endif
+    return ind
   endif
 
   " If the previous line started with a leading operator, use its MSL's level

indent/scala.vim

@@ -9,13 +9,9 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
+setlocal autoindent
 setlocal indentexpr=GetScalaIndent()
 setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case,<CR>
-setlocal autoindent
-setlocal softtabstop=2
-setlocal tabstop=2
-setlocal shiftwidth=2
-setlocal expandtab
 
 if exists("*GetScalaIndent")
   finish
@@ -543,7 +539,7 @@ function! GetScalaIndent()
     let ind = ind - 1
   endif
 
-  if scala#LineEndsInIncomplete(curline)
+  if scala#LineEndsInIncomplete(prevline)
     call scala#ConditionalConfirm("19")
     return ind
   endif
@@ -597,5 +593,6 @@ function! GetScalaIndent()
 
   return ind
 endfunction
-" vim:set ts=2 sts=2 sw=2:
+
+" vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:

indent/tex.vim

@@ -17,8 +17,8 @@ let s:list_envs = ['itemize', 'enumerate', 'description']
 " indent on \left( and on \(, but not on (
 " indent on \left[ and on \[, but not on [
 " indent on \left\{ and on {, but not on \{
-let s:open_pat = '\\\@<!\%(\\begin\|\\left\|\\(\|\\\[\|{\)'
-let s:close_pat = '\\\@<!\%(\\end\|\\right\|\\)\|\\\]\|}\)'
+let s:open_pat = '\\\@<!\%(\\begin\|\\left\a\@!\|\\(\|\\\[\|{\)'
+let s:close_pat = '\\\@<!\%(\\end\|\\right\a\@!\|\\)\|\\\]\|}\)'
 let s:list_open_pat = '\\\@<!\\begin{\%(' . join(s:list_envs, '\|') . '\)}'
 let s:list_close_pat	= '\\\@<!\\end{\%(' . join(s:list_envs, '\|') . '\)}'
 
@@ -101,9 +101,21 @@ function! Latexbox_CallIndent()
   let window = getpos('.')
   call setpos('.', cursor)
 
+  " Get first non-whitespace character of current line.
+  let line_start_char = matchstr(getline('.'), '\S')
+
+  " Get initial tab position.
+  let initial_tab = stridx(getline('.'), line_start_char)
+
   " Execute the command.
   execute 'normal! =='
 
+  " Get tab position difference.
+  let difference = stridx(getline('.'), line_start_char) - initial_tab
+
+  " Set new cursor Y position based on calculated difference.
+  let cursor[2] = cursor[2] + difference
+
   " Restore the previous window position.
   call setpos('.', window)
   normal! zt

indent/typescript.vim

@@ -0,0 +1,89 @@
+" Vim indent file, taken from indent/java.vim
+" Language:	    Typescript
+" Maintainer:	None!  Wanna improve this?
+" Last Change:	2015 Mar 07
+
+if get(g:, 'typescript_indent_disable')
+  finish
+endif
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+" Use javascript cindent options
+setlocal cindent cinoptions& cinoptions+=j1,J1
+setlocal indentkeys&
+
+" Load typescript indent function
+setlocal indentexpr=GetTypescriptIndent()
+
+let b:undo_indent = "setl cin< cino< indentkeys< indentexpr<"
+
+" Only define the function once
+if exists("*GetTypescriptIndent")
+    finish
+endif
+
+" Make sure we have vim capabilities
+let s:keepcpo = &cpo
+set cpo&vim
+
+function! TypescriptPrevNonBlankOrComment(lnum)
+    let pnum = prevnonblank(a:lnum)
+    " skip any comments (either `//`, `/*` or `*`)
+    while getline(pnum) =~ '^\s*\(\/\/\|\/\*\|\*\)'
+        let pnum = prevnonblank(pnum-1)
+    endwhile
+    return pnum
+endfunction
+
+function GetTypescriptIndent()
+
+    " default value: trust cindent
+    let ind = cindent(v:lnum)
+
+    if getline(v:lnum) =~ '^\s*[{}\*]'
+        return ind
+    endif
+
+    " The last non-empty line
+    let prev = TypescriptPrevNonBlankOrComment(v:lnum-1)
+
+    " Check if the previous line consists of a single `<variable> : <type>;`
+    " declaration (e.g. in interface definitions)
+    if getline(prev) =~ '^\s*\w\+\s*:[^{]\+;\s*$'
+        return indent(prev)
+    endif
+
+    " If a variable was declared and the semicolon omitted, do not indent
+    " the next line
+    if getline(prev) =~ '^\s*var\s\+\w\+'
+        return indent(prev)
+    endif
+
+    " Try to find out whether the last `}` ended a `<variable> : {` block
+    if getline(prev) =~ '};\s*$'
+        " jump to matching `{` bracket
+        call cursor(prev, 1)
+        silent normal %
+
+        " See if current line is type annotation without closing ';' but open
+        " `{` bracket
+        let lnum = line('.')
+        if getline(lnum) =~ '^\s*\w\+\s*:[^;]\+{'
+            let ind = indent(lnum)
+        endif
+    endif
+
+    return ind
+
+endfunction
+
+" Restore compatibility mode
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: et

indent/velocity.vim

@@ -0,0 +1,5 @@
+if exists("b:did_indent")
+    finish
+endif
+
+runtime! indent/html.vim

syntax/arduino.vim

@@ -2,16 +2,13 @@
 " Language:    Arduino
 " Maintainer:  Sudar <sudar@sudarmuthu.com>
 " Original Author:  Johannes Hoff <johannes@johanneshoff.com>
-" Last Change: 19 February 2013
+" Last Change: 27 April 2015
 " License:     VIM license (:help license, replace vim by arduino.vim)
 
 " Syntax highlighting like in the Arduino IDE
-" Automatically generated by the script available at
-"    https://bitbucket.org/johannes/arduino-vim-syntax
-" Using keywords from <arduino>/lib/keywords.txt
-" From version: 
 
 " Thanks to original author Johannes Hoff and Rik, Erik Nomitch, Adam Obeng and Graeme Cross for helpful feedback!
+" Thanks to Rafi Khan for Arduino 1.5.x support
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -28,33 +25,142 @@ else
   runtime! syntax/cpp.vim
 endif
 
-syn keyword arduinoConstant  BIN CHANGE DEC DEFAULT EXTERNAL FALLING HALF_PI HEX
-syn keyword arduinoConstant  HIGH INPUT INPUT_PULLUP INTERNAL INTERNAL1V1
-syn keyword arduinoConstant  INTERNAL2V56 LOW LSBFIRST MSBFIRST OCT OUTPUT PI
-syn keyword arduinoConstant  RISING TWO_PI
-
-syn keyword arduinoFunc      analogRead analogReference analogWrite
-syn keyword arduinoFunc      attachInterrupt bit bitClear bitRead bitSet
-syn keyword arduinoFunc      bitWrite delay delayMicroseconds detachInterrupt
-syn keyword arduinoFunc      digitalRead digitalWrite highByte interrupts
-syn keyword arduinoFunc      lowByte micros millis noInterrupts noTone pinMode
-syn keyword arduinoFunc      pulseIn shiftIn shiftOut tone
-
-syn keyword arduinoMethod    available begin end find findUntil flush loop
-syn keyword arduinoMethod    parseFloat parseInt peek print println read
-syn keyword arduinoMethod    readBytes readBytesUntil setTimeout setup
-
-syn keyword arduinoModule    Serial Serial1 Serial2 Serial3
-
-syn keyword arduinoStdFunc   abs acos asin atan atan2 ceil constrain cos degrees
-syn keyword arduinoStdFunc   exp floor log map max min radians random randomSeed
-syn keyword arduinoStdFunc   round sin sq sqrt tan
-
-syn keyword arduinoType      boolean byte null String word
+"C:/Program Files (x86)/Arduino\hardware\arduino\avr\libraries\EEPROM\keywords.txt{{{
+	syn keyword arduinoConstant EEPROM
+"}}}
+"C:/Program Files (x86)/Arduino\hardware\arduino\avr\libraries\SoftwareSerial\keywords.txt{{{
+	syn keyword arduinoFunc SoftwareSerial begin end read write available isListening overflow flush listen
+	syn keyword arduinoFunc peek
+"}}}
+"C:/Program Files (x86)/Arduino\hardware\arduino\avr\libraries\SPI\keywords.txt{{{
+	syn keyword arduinoConstant SPI SPI_CLOCK_DIV4 SPI_CLOCK_DIV16 SPI_CLOCK_DIV64 SPI_CLOCK_DIV128 SPI_CLOCK_DIV2 SPI_CLOCK_DIV8 SPI_CLOCK_DIV32 SPI_CLOCK_DIV64 SPI_MODE0
+	syn keyword arduinoConstant SPI_MODE1 SPI_MODE2 SPI_MODE3
+	syn keyword arduinoFunc begin end transfer setBitOrder setDataMode setClockDivider
+"}}}
+"C:/Program Files (x86)/Arduino\hardware\arduino\avr\libraries\Wire\keywords.txt{{{
+	syn keyword arduinoFunc begin setClock beginTransmission endTransmission requestFrom send receive onReceive onRequest Wire
+"}}}
+"C:/Program Files (x86)/Arduino\hardware\arduino\sam\libraries\SPI\keywords.txt{{{
+	syn keyword arduinoConstant SPI SPI_MODE0 SPI_MODE1 SPI_MODE2 SPI_MODE3 SPI_CONTINUE SPI_LAST
+	syn keyword arduinoFunc begin end transfer setDataMode setClockDivider
+"}}}
+"C:/Program Files (x86)/Arduino\hardware\arduino\sam\libraries\Wire\keywords.txt{{{
+	syn keyword arduinoFunc begin setClock beginTransmission endTransmission requestFrom send receive onReceive onRequest Wire
+	syn keyword arduinoFunc Wire1
+"}}}
+"C:/Program Files (x86)/Arduino\lib\keywords.txt{{{
+	syn keyword arduinoConstant HIGH LOW INPUT INPUT_PULLUP OUTPUT DEC BIN HEX OCT PI
+	syn keyword arduinoConstant HALF_PI TWO_PI LSBFIRST MSBFIRST CHANGE FALLING RISING DEFAULT EXTERNAL INTERNAL
+	syn keyword arduinoConstant INTERNAL1V1 INTERNAL2V56
+	syn keyword arduinoType boolean break byte case char class const continue default do
+	syn keyword arduinoType double else false float for if int long new null
+	syn keyword arduinoType private protected public register return short signed static String switch
+	syn keyword arduinoType this throw try true unsigned void while word boolean byte
+	syn keyword arduinoType char float int long word
+	syn keyword arduinoFunc abs acos asin atan atan2 ceil constrain cos degrees exp
+	syn keyword arduinoFunc floor log map max min radians random randomSeed round sin
+	syn keyword arduinoFunc sq sqrt tan pow bitRead bitWrite bitSet bitClear bit highByte
+	syn keyword arduinoFunc lowByte analogReference analogRead analogWrite attachInterrupt detachInterrupt delay delayMicroseconds digitalWrite digitalRead
+	syn keyword arduinoFunc interrupts millis micros noInterrupts noTone pinMode pulseIn shiftIn shiftOut tone
+	syn keyword arduinoFunc yield
+	syn keyword arduinoIdentifier Serial Serial1 Serial2 Serial3
+	syn keyword arduinoFunc SerialUSB begin end peek read
+	syn keyword arduinoFunc print println available availableForWrite flush setTimeout find findUntil parseInt parseFloat
+	syn keyword arduinoFunc readBytes readBytesUntil readString readStringUntil trim toUpperCase toLowerCase charAt compareTo concat
+	syn keyword arduinoFunc endsWith startsWith equals equalsIgnoreCase getBytes indexOf lastIndexOf length replace setCharAt
+	syn keyword arduinoFunc substring toCharArray toInt Keyboard Mouse press release releaseAll accept click
+	syn keyword arduinoFunc move isPressed setup loop
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Audio\keywords.txt{{{
+	syn keyword arduinoFunc Audio prepare write
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Bridge\keywords.txt{{{
+	syn keyword arduinoConstant FILE_READ FILE_WRITE FILE_APPEND
+	syn keyword arduinoFunc Bridge FileIO FileSystem Console Process Mailbox HttpClient YunServer YunClient begin
+	syn keyword arduinoFunc end available read peek write flush bool transfer put get
+	syn keyword arduinoFunc buffer noBuffer connected File seek position size close name isDirectory
+	syn keyword arduinoFunc openNextFile rewindDirectory addParameter runAsynchronously run running exitValue runShellCommand runShellCommandAsynchronously readMessage
+	syn keyword arduinoFunc writeMessage writeJSON message Available getAsynchronously ready getResult accept stop connect connected
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Esplora\keywords.txt{{{
+	syn keyword arduinoConstant JOYSTICK_BASE MAX_CHANNELS CH_SWITCH_1 CH_SWITCH_2 CH_SWITCH_3 CH_SWITCH_4 CH_SLIDER CH_LIGHT CH_TEMPERATURE CH_MIC
+	syn keyword arduinoConstant CH_JOYSTICK_SW CH_JOYSTICK_X CH_JOYSTICK_Y SWITCH_1 SWITCH_2 SWITCH_3 SWITCH_4 SWITCH_DOWN SWITCH_LEFT SWITCH_UP
+	syn keyword arduinoConstant SWITCH_RIGHT JOYSTICK_DOWN JOYSTICK_LEFT JOYSTICK_UP PRESSED RELEASED DEGREES_C DEGREES_F X_AXIS Y_AXIS
+	syn keyword arduinoConstant Z_AXIS
+	syn keyword arduinoFunc Esplora begin readSlider readLightSensor readTemperature readMicrophone readJoystickSwitch readJoystickButton readJoystickX readJoystickY
+	syn keyword arduinoFunc readAccelerometer readButton writeRGB writeRed writeGreen writeBlue readRed readGreen readBlue readBlue
+	syn keyword arduinoFunc readBlue readBlue tone noTone
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Ethernet\keywords.txt{{{
+	syn keyword arduinoFunc Ethernet EthernetClient EthernetServer IPAddress status connect write available read peek
+	syn keyword arduinoFunc flush stop connected begin beginPacket endPacket parsePacket remoteIP remotePort
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Firmata\keywords.txt{{{
+	syn keyword arduinoConstant MAX_DATA_BYTES DIGITAL_MESSAGE ANALOG_MESSAGE REPORT_ANALOG REPORT_DIGITAL REPORT_VERSION SET_PIN_MODE SYSTEM_RESET START_SYSEX END_SYSEX
+	syn keyword arduinoConstant PWM TOTAL_ANALOG_PINS TOTAL_DIGITAL_PINS TOTAL_PORTS ANALOG_PORT
+	syn keyword arduinoFunc Firmata callbackFunction systemResetCallbackFunction stringCallbackFunction sysexCallbackFunction begin begin printVersion blinkVersion printFirmwareVersion
+	syn keyword arduinoFunc setFirmwareVersion setFirmwareNameAndVersion available processInput sendAnalog sendDigital sendDigitalPortPair sendDigitalPort sendString sendString
+	syn keyword arduinoFunc sendSysex attach detach flush
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\GSM\keywords.txt{{{
+	syn keyword arduinoConstant GSM GSM_SMS GPRS GSMPIN GSMPIN ERROR IDLE CONNECTING GSM_READY GPRS_READY
+	syn keyword arduinoConstant TRANSPARENT_CONNECTED IDLE_CALL CALLING RECEIVINGCALL TALKING GSM_MODE_UNDEFINED GSM_MODE_EGSM GSM_MODE_DCS GSM_MODE_PCS GSM_MODE_EGSM_DCS
+	syn keyword arduinoConstant GSM_MODE_GSM850_PCS GSM_MODE_GSM850_EGSM_DCS_PCS
+	syn keyword arduinoFunc GSMVoiceCall GSMClient GSMServer GSMModem GSMScanner begin shutdown gatVoiceCallStatus ready voiceCall
+	syn keyword arduinoFunc answerCall hangCall retrieveCallingNumber beginSMS endSMS remoteNumber attachGPRS begnWrite endWrite getIMEI
+	syn keyword arduinoFunc getCurrentCarrier getSignalStrength readNetworks isPIN checkPIN checkPUK changePIN switchPIN checkReg getPINUsed
+	syn keyword arduinoFunc setPINUsed getBand setBand getvoiceCallStatus
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\LiquidCrystal\keywords.txt{{{
+	syn keyword arduinoFunc LiquidCrystal begin clear home print setCursor cursor noCursor blink noBlink
+	syn keyword arduinoFunc display noDisplay autoscroll noAutoscroll leftToRight rightToLeft scrollDisplayLeft scrollDisplayRight createChar setRowOffsets
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Scheduler\keywords.txt{{{
+	syn keyword arduinoFunc Scheduler startLoop
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\SD\keywords.txt{{{
+	syn keyword arduinoConstant SD FILE_READ FILE_WRITE
+	syn keyword arduinoFunc File begin exists mkdir remove rmdir open close seek position
+	syn keyword arduinoFunc size
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Servo\keywords.txt{{{
+	syn keyword arduinoFunc Servo attach detach write read attached writeMicroseconds readMicroseconds
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\SpacebrewYun\keywords.txt{{{
+	syn keyword arduinoFunc SpacebrewYun addPublish addSubscribe connect verbose monitor onMessage send onRangeMessage onStringMessage
+	syn keyword arduinoFunc onBooleanMessage onCustomMessage onOpen onClose onError
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Stepper\keywords.txt{{{
+	syn keyword arduinoFunc Stepper step setSpeed version direction speed
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\Temboo\keywords.txt{{{
+	syn keyword arduinoFunc Temboo TembooChoreo begin setAccountName setAppKeyName setAppKey setChoreo setCredential setSavedInputs addInput
+	syn keyword arduinoFunc addOutputFilter setSettingsFileToWrite setSettingsFileToRead
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\TFT\keywords.txt{{{
+	syn keyword arduinoConstant TFT
+	syn keyword arduinoFunc EsploraTFT
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\TFT\src\utility\keywords.txt{{{
+	syn keyword arduinoFunc Adafruit_GFX Adafruit_ST7735 PImage drawPixel invertDisplay drawLine drawFastVLine drawFastHLine drawRect fillRect
+	syn keyword arduinoFunc fillScreen drawCircle drawCircleHelper fillCircle fillCircleHelper drawTriangle fillTriangle drawRoundRect fillRoundRect drawBitmap
+	syn keyword arduinoFunc drawChar setCursor setTextColor setTextSize setTextWrap height width setRotation getRotation newColor
+	syn keyword arduinoFunc background fill noFill stroke noStroke text textWrap textSize circle point
+	syn keyword arduinoFunc quad rect triangle loadImage image draw isValid
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\USBHost\keywords.txt{{{
+	syn keyword arduinoFunc MouseController USBHost KeyboardController Task mouseMoved mouseDragged mousePressed mouseReleased getXChange getYChange
+	syn keyword arduinoFunc getButton keyPressed keyReleased getModifiers getKey getOemKey
+"}}}
+"C:/Program Files (x86)/Arduino\libraries\WiFi\keywords.txt{{{
+	syn keyword arduinoConstant SSID BSSID RSSI
+	syn keyword arduinoFunc WiFi WiFiUdp Client Server firmwareVersion status connect write available config
+	syn keyword arduinoFunc setDNS read flush stop connected begin disconnect macAddress localIP subnetMask
+	syn keyword arduinoFunSec gatewayIP encryptionType getResult getSocket WiFiClient WiFiServer WiFiUDP beginPacket endPacket parsePacket
+	syn keyword arduinoFunc remoteIP remotePort
+"}}}
 
 hi def link arduinoType Type
 hi def link arduinoConstant Constant
-hi def link arduinoStdFunc Function
 hi def link arduinoFunc Function
-hi def link arduinoMethod Function
-hi def link arduinoModule Identifier
+hi def link arduinoIdentifier Identifier

syntax/c.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2013 Jul 05
+" Last Change:	2015 Mar 05
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -35,28 +35,37 @@ syn match	cSpecial	display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
 if !exists("c_no_utf")
   syn match	cSpecial	display contained "\\\(u\x\{4}\|U\x\{8}\)"
 endif
-if exists("c_no_cformat")
-  syn region	cString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
-  " cCppString: same as cString, but ends at end of line
-  if !exists("cpp_no_cpp11") " ISO C++11
-    syn region cCppString	start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
-  else
-    syn region cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
-  endif
-  syn region	cCppOut2	contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip
-  syn region	cCppSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
-else
+
+if !exists("c_no_cformat")
+  " Highlight % items in strings.
   if !exists("c_no_c99") " ISO C99
     syn match	cFormat		display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
   else
     syn match	cFormat		display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
   endif
   syn match	cFormat		display "%%" contained
+endif
+
+" cCppString: same as cString, but ends at end of line
+if s:ft ==# "cpp" && !exists("cpp_no_cpp11") && !exists("c_no_cformat")
+  " ISO C++11
+  syn region	cString		start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
+  syn region 	cCppString	start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+elseif s:ft ==# "c" && !exists("c_no_c11") && !exists("c_no_cformat")
+  " ISO C99
+  syn region	cString		start=+\%(L\|U\|u8\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
+  syn region	cCppString	start=+\%(L\|U\|u8\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+else
+  " older C or C++
+  syn match	cFormat		display "%%" contained
   syn region	cString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
-  " cCppString: same as cString, but ends at end of line
   syn region	cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
 endif
 
+syn region	cCppSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
+
+syn cluster	cStringGroup	contains=cCppString,cCppSkip
+
 syn match	cCharacter	"L\='[^\\]'"
 syn match	cCharacter	"L'[^']*'" contains=cSpecial
 if exists("c_gnu")
@@ -70,7 +79,8 @@ syn match	cSpecialCharacter display "L\='\\\o\{1,3}'"
 syn match	cSpecialCharacter display "'\\x\x\{1,2}'"
 syn match	cSpecialCharacter display "L'\\x\x\+'"
 
-if !exists("c_no_c11") " ISO C11
+if (s:ft ==# "c" && !exists("c_no_c11")) || (s:ft ==# "cpp" && !exists("cpp_no_cpp11"))
+  " ISO C11 or ISO C++ 11
   if exists("c_no_cformat")
     syn region	cString		start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
   else
@@ -102,24 +112,24 @@ endif
 " This should be before cErrInParen to avoid problems with #define ({ xxx })
 if exists("c_curly_error")
   syn match cCurlyError "}"
-  syn region	cBlock		start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold
+  syn region	cBlock		start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,@cStringGroup,@Spell fold
 else
   syn region	cBlock		start="{" end="}" transparent fold
 endif
 
-"catch errors caused by wrong parenthesis and brackets
-" also accept <% for {, %> for }, <: for [ and :> for ] (C99)
+" Catch errors caused by wrong parenthesis and brackets.
+" Also accept <% for {, %> for }, <: for [ and :> for ] (C99)
 " But avoid matching <::.
 syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
 if exists("c_no_curly_error")
   if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
-    syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
+    syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
     syn match	cParenError	display ")"
     syn match	cErrInParen	display contained "^^<%\|^%>"
   else
-    syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell
+    syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
     syn match	cParenError	display ")"
@@ -127,13 +137,13 @@ if exists("c_no_curly_error")
   endif
 elseif exists("c_no_bracket_error")
   if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
-    syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
+    syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
     syn match	cParenError	display ")"
     syn match	cErrInParen	display contained "<%\|%>"
   else
-    syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell
+    syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
     syn match	cParenError	display ")"
@@ -141,19 +151,19 @@ elseif exists("c_no_bracket_error")
   endif
 else
   if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
-    syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
+    syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
     syn match	cParenError	display "[\])]"
     syn match	cErrInParen	display contained "<%\|%>"
-    syn region	cBracket	transparent start='\[\|<::\@!' end=']\|:>' contains=ALLBUT,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell
+    syn region	cBracket	transparent start='\[\|<::\@!' end=']\|:>' contains=ALLBUT,@cParenGroup,cErrInParen,cCppParen,cCppBracket,@cStringGroup,@Spell
   else
-    syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
+    syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
     syn match	cParenError	display "[\])]"
     syn match	cErrInParen	display contained "[\]{}]\|<%\|%>"
-    syn region	cBracket	transparent start='\[\|<::\@!' end=']\|:>' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell
+    syn region	cBracket	transparent start='\[\|<::\@!' end=']\|:>' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cErrInParen,cCppParen,cCppBracket,@cStringGroup,@Spell
   endif
   " cCppBracket: same as cParen but ends at end-of-line; used in cDefine
   syn region	cCppBracket	transparent start='\[\|<::\@!' skip='\\$' excludenl end=']\|:>' end='$' contained contains=ALLBUT,@cParenGroup,cErrInParen,cParen,cBracket,cString,@Spell
@@ -322,6 +332,11 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
   syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET
   syn keyword cConstant TMP_MAX stderr stdin stdout
   syn keyword cConstant EXIT_FAILURE EXIT_SUCCESS RAND_MAX
+  " POSIX 2001
+  syn keyword cConstant SIGBUS SIGPOLL SIGPROF SIGSYS SIGURG
+  syn keyword cConstant SIGVTALRM SIGXCPU SIGXFSZ
+  " non-POSIX signals
+  syn keyword cConstant SIGWINCH SIGINFO
   " Add POSIX errors as well
   syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY
   syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT
@@ -373,7 +388,7 @@ syn region	cPreProc	start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>
 " Highlight User Labels
 syn cluster	cMultiGroup	contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
 if s:ft ==# 'c' || exists("cpp_no_cpp11")
-  syn region	cMulti		transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell
+  syn region	cMulti		transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell,@cStringGroup
 endif
 " Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
 syn cluster	cLabelGroup	contains=cUserLabel
@@ -458,8 +473,7 @@ hi def link cTodo		Todo
 hi def link cBadContinuation	Error
 hi def link cCppOutSkip		cCppOutIf2
 hi def link cCppInElse2		cCppOutIf2
-hi def link cCppOutIf2		cCppOut2  " Old syntax group for #if 0 body
-hi def link cCppOut2		cCppOut  " Old syntax group for #if of #if 0
+hi def link cCppOutIf2		cCppOut
 hi def link cCppOut		Comment
 
 let b:current_syntax = "c"

syntax/coffee.vim

@@ -32,7 +32,7 @@ hi def link coffeeConditional Conditional
 syn match coffeeException /\<\%(try\|catch\|finally\)\>/ display
 hi def link coffeeException Exception
 
-syn match coffeeKeyword /\<\%(new\|in\|of\|by\|and\|or\|not\|is\|isnt\|class\|extends\|super\|do\)\>/
+syn match coffeeKeyword /\<\%(new\|in\|of\|by\|and\|or\|not\|is\|isnt\|class\|extends\|super\|do\|yield\)\>/
 \                       display
 " The `own` keyword is only a keyword after `for`.
 syn match coffeeKeyword /\<for\s\+own\>/ contained containedin=coffeeRepeat
@@ -92,7 +92,7 @@ syn region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/
 hi def link coffeeString String
 
 " A integer, including a leading plus or minus
-syn match coffeeNumber /\%(\i\|\$\)\@<![-+]\?\d\+\%([eE][+-]\?\d\+\)\?/ display
+syn match coffeeNumber /\%(\i\|\$\)\@<![-+]\?\d\+\%(e[+-]\?\d\+\)\?/ display
 " A hex, binary, or octal number
 syn match coffeeNumber /\<0[xX]\x\+\>/ display
 syn match coffeeNumber /\<0[bB][01]\+\>/ display
@@ -107,7 +107,7 @@ hi def link coffeeFloat Float
 
 " An error for reserved keywords, taken from the RESERVED array:
 " http://coffeescript.org/documentation/docs/lexer.html#section-67
-syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|export\|import\|native\|__hasProp\|__extends\|__slice\|__bind\|__indexOf\|implements\|interface\|package\|private\|protected\|public\|static\|yield\)\>/
+syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|export\|import\|native\|__hasProp\|__extends\|__slice\|__bind\|__indexOf\|implements\|interface\|package\|private\|protected\|public\|static\)\>/
 \                             display
 hi def link coffeeReservedError Error
 

syntax/cpp.vim

@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	C++
-" Current Maintainer:	vim-jp (https://github.com/vim-jp/cpp-vim)
+" Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2014 May 13
+" Last Change:	2015 Mar 1
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -32,14 +32,21 @@ syn match cppCast		"\<\(const\|static\|dynamic\|reinterpret\)_cast\s*$"
 syn keyword cppStorageClass	mutable
 syn keyword cppStructure	class typename template namespace
 syn keyword cppBoolean		true false
+syn keyword cppConstant		__cplusplus
 
 " C++ 11 extensions
 if !exists("cpp_no_cpp11")
   syn keyword cppType		override final
   syn keyword cppExceptions	noexcept
-  syn keyword cppStorageClass	constexpr decltype
+  syn keyword cppStorageClass	constexpr decltype thread_local
   syn keyword cppConstant	nullptr
-  syn region cppRawString       matchgroup=cppRawDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell
+  syn keyword cppConstant	ATOMIC_FLAG_INIT ATOMIC_VAR_INIT
+  syn keyword cppConstant	ATOMIC_BOOL_LOCK_FREE ATOMIC_CHAR_LOCK_FREE
+  syn keyword cppConstant	ATOMIC_CHAR16_T_LOCK_FREE ATOMIC_CHAR32_T_LOCK_FREE
+  syn keyword cppConstant	ATOMIC_WCHAR_T_LOCK_FREE ATOMIC_SHORT_LOCK_FREE
+  syn keyword cppConstant	ATOMIC_INT_LOCK_FREE ATOMIC_LONG_LOCK_FREE
+  syn keyword cppConstant	ATOMIC_LLONG_LOCK_FREE ATOMIC_POINTER_LOCK_FREE
+  syn region cppRawString	matchgroup=cppRawStringDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell
 endif
 
 " The minimum and maximum operators in GNU C++
@@ -63,7 +70,7 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppStructure		Structure
   HiLink cppBoolean		Boolean
   HiLink cppConstant		Constant
-  HiLink cppRawDelimiter	Delimiter
+  HiLink cppRawStringDelimiter	Delimiter
   HiLink cppRawString		String
   delcommand HiLink
 endif

syntax/css.vim

@@ -6,7 +6,7 @@
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
 " URL:          https://github.com/JulesWang/css.vim
-" Last Change:  2014 Oct.28
+" Last Change:  2015 Apr.17
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -479,7 +479,7 @@ syn match cssPseudoClassId contained  "\<focus\(-inner\)\=\>"
 syn match cssPseudoClassId contained  "\<\(input-\)\=placeholder\>"
 
 " Misc highlight groups
-syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained
+syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained
 syntax match cssNoise contained /\(:\|;\|\/\)/
 
 " Comment

syntax/csv.vim

@@ -1,159 +0,0 @@
-" A simple syntax highlighting, simply alternate colors between two
-" adjacent columns
-" Init {{{2
-let s:cpo_save = &cpo
-set cpo&vim
-
-scriptencoding utf8
-if version < 600
-    syn clear
-elseif exists("b:current_syntax")
-    finish
-endif
-
-" Helper functions "{{{2
-fu! <sid>Warning(msg) "{{{3
-    " Don't redraw, so we are not overwriting messages from the ftplugin
-    " script
-    "redraw!
-    echohl WarningMsg
-    echomsg "CSV Syntax:" . a:msg
-    echohl Normal
-endfu
-
-fu! <sid>Esc(val, char) "{{2
-    return '\V'.escape(a:val, '\\'.a:char).'\m'
-endfu
-
-fu! <sid>CheckSaneSearchPattern() "{{{3
-    let s:del_def = ','
-    let s:col_def = '\%([^' . s:del_def . ']*' . s:del_def . '\|$\)'
-    let s:col_def_end = '\%([^' . s:del_def . ']*' . s:del_def . '\)'
-
-    " First: 
-    " Check for filetype plugin. This syntax script relies on the filetype
-    " plugin, else, it won't work properly.
-    redir => s:a |sil filetype | redir end
-    let s:a=split(s:a, "\n")[0]
-    if match(s:a, '\cplugin:off') > 0
-	call <sid>Warning("No filetype support, only simple highlighting using"
-		    \ . s:del_def . " as delimiter! See :h csv-installation")
-    endif
-
-    " Check Comment setting
-    if !exists("g:csv_comment")
-        let b:csv_cmt = split(&cms, '%s')
-    else
-        let b:csv_cmt = split(g:csv_comment, '%s')
-    endif
-
-
-    " Second: Check for sane defaults for the column pattern
-    " Not necessary to check for fixed width columns
-    if exists("b:csv_fixed_width_cols")
-	return
-    endif
-
-
-    " Try a simple highlighting, if the defaults from the ftplugin
-    " don't exist
-    let s:col  = exists("b:col") && !empty(b:col) ? b:col
-		\ : s:col_def
-    let s:col_end  = exists("b:col_end") && !empty(b:col_end) ? b:col_end
-		\ : s:col_def_end
-    let s:del  = exists("b:delimiter") && !empty(b:delimiter) ? b:delimiter
-		\ : s:del_def
-    let s:cmts = exists("b:csv_cmt") ? b:csv_cmt[0] : split(&cms, '&s')[0]
-    let s:cmte = exists("b:csv_cmt") && len(b:csv_cmt) == 2 ? b:csv_cmt[1]
-		\ : ''
-
-    if line('$') > 1 && (!exists("b:col") || empty(b:col))
-    " check for invalid pattern, ftplugin hasn't been loaded yet
-	call <sid>Warning("Invalid column pattern, using default pattern " . s:col_def)
-    endif
-endfu
-
-" Syntax rules {{{2
-fu! <sid>DoHighlight() "{{{3
-    if has("conceal") && !exists("g:csv_no_conceal") &&
-		\ !exists("b:csv_fixed_width_cols")
-	" old val
-	    "\ '\%(.\)\@=/ms=e,me=e contained conceal cchar=' .
-	    " Has a problem with the last line!
-	exe "syn match CSVDelimiter /" . s:col_end . 
-	    \ '/ms=e,me=e contained conceal cchar=' .
-	    \ (&enc == "utf-8" ? "│" : '|')
-	"exe "syn match CSVDelimiterEOL /" . s:del . 
-	"    \ '\?$/ contained conceal cchar=' .
-	"    \ (&enc == "utf-8" ? "│" : '|')
-	hi def link CSVDelimiter Conceal
-    elseif !exists("b:csv_fixed_width_cols")
-	" The \%(.\)\@<= makes sure, the last char won't be concealed,
-	" if it isn't a delimiter
-	"exe "syn match CSVDelimiter /" . s:col . '\%(.\)\@<=/ms=e,me=e contained'
-	exe "syn match CSVDelimiter /" . s:col_end . '/ms=e,me=e contained'
-	"exe "syn match CSVDelimiterEOL /" . s:del . '\?$/ contained'
-	if has("conceal")
-	    hi def link CSVDelimiter Conceal
-	else
-	    hi def link CSVDelimiter Ignore
-	endif
-    endif " There is no delimiter for csv fixed width columns
-
-
-    if !exists("b:csv_fixed_width_cols")
-	exe 'syn match CSVColumnEven nextgroup=CSVColumnOdd /'
-		    \ . s:col . '/ contains=CSVDelimiter'
-	exe 'syn match CSVColumnOdd nextgroup=CSVColumnEven /'
-		    \ . s:col . '/ contains=CSVDelimiter'
-
-	exe 'syn match CSVColumnHeaderEven nextgroup=CSVColumnHeaderOdd /\%1l'
-		    \. s:col . '/ contains=CSVDelimiter'
-	exe 'syn match CSVColumnHeaderOdd nextgroup=CSVColumnHeaderEven /\%1l'
-		    \. s:col . '/ contains=CSVDelimiter'
-    else
-	for i in range(len(b:csv_fixed_width_cols))
-	    let pat = '/\%' . b:csv_fixed_width_cols[i] . 'v.*' .
-			\ ((i == len(b:csv_fixed_width_cols)-1) ? '/' : 
-			\ '\%' . b:csv_fixed_width_cols[i+1] . 'v/')
-
-	    let group  = "CSVColumn" . (i%2 ? "Odd"  : "Even" )
-	    let ngroup = "CSVColumn" . (i%2 ? "Even" : "Odd"  )
-	    exe "syn match " group pat " nextgroup=" . ngroup
-	endfor
-    endif
-    " Comment regions
-    exe 'syn match CSVComment /'. <sid>Esc(s:cmts, '/'). '.*'.
-		\ (!empty(s:cmte) ? '\%('. <sid>Esc(s:cmte, '/'). '\)\?'
-		\: '').  '/'
-    hi def link CSVComment Comment
-endfun
-
-fu! <sid>DoSyntaxDefinitions() "{{{3
-    syn spell toplevel
-
-    " Not really needed
-    syn case ignore
-
-    hi def link CSVColumnHeaderOdd  WarningMsg
-    hi def link CSVColumnHeaderEven WarningMsg
-    hi def link CSVColumnOdd	    DiffAdd
-    hi def link CSVColumnEven	    DiffChange
-endfun
-
-" Main: {{{2 
-" Make sure, we are using a sane, valid pattern for syntax
-" highlighting
-call <sid>CheckSaneSearchPattern()
-
-" Define all necessary syntax groups
-call <sid>DoSyntaxDefinitions()
-
-" Highlight the file
-call <sid>DoHighlight()
-
-" Set the syntax variable {{{2
-let b:current_syntax="csv"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save

syntax/dockerfile.vim

@@ -10,7 +10,7 @@ endif
 syntax case ignore
 
 syntax match dockerfileKeyword /\v^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s/
-syntax match dockerfileKeyword /\v^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR)\s/
+syntax match dockerfileKeyword /\v^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR|COPY)\s/
 highlight link dockerfileKeyword Keyword
 
 syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/

syntax/elixir.vim

@@ -15,11 +15,20 @@ syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@el
 syn match elixirComment '#.*' contains=elixirTodo
 syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
 
-syn keyword elixirKeyword is_atom is_binary is_bitstring is_boolean is_float is_function is_integer is_list is_number is_pid is_port is_record is_reference is_tuple is_exception
-syn keyword elixirKeyword case cond for if unless try receive send
+syn keyword elixirKeyword case when cond for if unless try receive send
 syn keyword elixirKeyword exit raise throw after rescue catch else do end
 syn keyword elixirKeyword quote unquote super
 
+" Functions used on guards
+syn keyword elixirKeyword contained is_atom is_binary is_bitstring is_boolean
+syn keyword elixirKeyword contained is_float is_function is_integer is_list
+syn keyword elixirKeyword contained is_map is_number is_pid is_port is_record
+syn keyword elixirKeyword contained is_reference is_tuple is_exception abs
+syn keyword elixirKeyword contained bit_size byte_size div elem hd length
+syn keyword elixirKeyword contained map_size node rem round tl trunc tuple_size
+
+syn match elixirGuard '.*when.*' contains=ALLBUT,@elixirNotTop
+
 syn keyword elixirInclude import require alias use
 
 syn keyword elixirSelf self
@@ -70,7 +79,7 @@ syn region elixirRegex matchgroup=elixirRegexDelimiter start="%r/" end="/[uiomxf
 syn cluster elixirRegexSpecial    contains=elixirRegexEscape,elixirRegexCharClass,elixirRegexQuantifier,elixirRegexEscapePunctuation
 syn cluster elixirStringContained contains=elixirInterpolation,elixirRegexEscape,elixirRegexCharClass
 
-syn region elixirString        matchgroup=elixirStringDelimiter start="'" end="'" skip="\\'|\\\\"
+syn region elixirString        matchgroup=elixirStringDelimiter start="'" end="'" skip="\\'\|\\\\"
 syn region elixirString        matchgroup=elixirStringDelimiter start='"' end='"' skip='\\"' contains=@elixirStringContained
 syn region elixirInterpolation matchgroup=elixirInterpolationDelimiter start="#{" end="}" contained contains=ALLBUT,elixirComment,@elixirNotTop
 

syntax/go.vim

@@ -52,7 +52,7 @@ if !exists("g:go_highlight_trailing_whitespace_error")
 endif
 
 if !exists("g:go_highlight_operators")
-	let g:go_highlight_operators = 1
+	let g:go_highlight_operators = 0
 endif
 
 if !exists("g:go_highlight_functions")
@@ -67,6 +67,10 @@ if !exists("g:go_highlight_structs")
 	let g:go_highlight_structs = 0
 endif
 
+if !exists("g:go_highlight_build_constraints")
+    let g:go_highlight_build_constraints = 0
+endif
+
 syn case match
 
 syn keyword     goDirective         package import
@@ -232,20 +236,18 @@ hi def link     goTodo              Todo
 
 " Operators; 
 if g:go_highlight_operators != 0
-	syn match goOperator /:=/
-	syn match goOperator />=/
-	syn match goOperator /<=/
-	syn match goOperator /==/
-	syn match goOperator /!=/
-	syn match goOperator /+=/
-	syn match goOperator /-=/
-	syn match goOperator /\s>\s/
-	syn match goOperator /\s<\s/
-	syn match goOperator /\s+\s/
-	syn match goOperator /\s-\s/
-	syn match goOperator /\s\*\s/
-	syn match goOperator /\s\/\s/
-	syn match goOperator /\s%\s/
+	" match single-char operators:          - + % < > ! & | ^ * =
+	" and corresponding two-char operators: -= += %= <= >= != &= |= ^= *= ==
+	syn match goOperator /[-+%<>!&|^*=]=\?/
+	" match / and /=
+	syn match goOperator /\/\%(=\|\ze[^/*]\)/
+	" match two-char operators:               << >> &^
+	" and corresponding three-char operators: <<= >>= &^=
+	syn match goOperator /\%(<<\|>>\|&^\)=\?/
+	" match remaining two-char operators: := && || <- ++ --
+	syn match goOperator /:=\|||\|<-\|++\|--/
+	" match ...
+	syn match goOperator /\.\.\./
 endif
 hi def link     goOperator					Operator
 
@@ -270,6 +272,21 @@ endif
 hi def link     goStruct						Function
 hi def link     goStructDef         Function
 
+" Build Constraints
+if g:go_highlight_build_constraints != 0
+    syn keyword goBuildOs           contained ignore cgo android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows 
+    syn keyword goBuildArch         contained 386 amd64 amd64p32 arm
+    syn match   goBuildDirective    display contained "+build"
+    syn region  goBuildComment      start="//\s*+build" end="$" contains=goBuildDirective,goBuildOs,goBuildArch
+    syn region  goBuildComment      start="/\*\s*+build" end="\*/" contains=goBuildDirective,goBuildOs,goBuildArch
+endif
+
+hi def link     goBuildComment      Comment
+hi def link     goBuildOs           Type
+hi def link     goBuildArch         Type
+hi def link     goBuildDirective    PreProc
+
+
 " Search backwards for a global declaration to start processing the syntax.
 "syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/
 

syntax/gohtmltmpl.vim

@@ -0,0 +1,15 @@
+if exists("b:current_syntax")
+    finish
+endif
+
+if !exists("main_syntax")
+    let main_syntax = 'html'
+endif
+
+runtime! syntax/gotexttmpl.vim
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+let b:current_syntax = "gohtmltmpl"
+
+" vim:ts=4:sw=4:et

syntax/gotexttmpl.vim

@@ -0,0 +1,85 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" gotexttmpl.vim: Vim syntax file for Go templates.
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+syn case match
+
+" Go escapes
+syn match       goEscapeOctal       display contained "\\[0-7]\{3}"
+syn match       goEscapeC           display contained +\\[abfnrtv\\'"]+
+syn match       goEscapeX           display contained "\\x\x\{2}"
+syn match       goEscapeU           display contained "\\u\x\{4}"
+syn match       goEscapeBigU        display contained "\\U\x\{8}"
+syn match       goEscapeError       display contained +\\[^0-7xuUabfnrtv\\'"]+
+
+hi def link     goEscapeOctal       goSpecialString
+hi def link     goEscapeC           goSpecialString
+hi def link     goEscapeX           goSpecialString
+hi def link     goEscapeU           goSpecialString
+hi def link     goEscapeBigU        goSpecialString
+hi def link     goSpecialString     Special
+hi def link     goEscapeError       Error
+
+" Strings and their contents
+syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
+syn region      goString            contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
+syn region      goRawString         contained start=+`+ end=+`+
+
+hi def link     goString            String
+hi def link     goRawString         String
+
+" Characters; their contents
+syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
+syn region      goCharacter         start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
+
+hi def link     goCharacter         Character
+
+" Integers
+syn match       goDecimalInt        contained "\<\d\+\([Ee]\d\+\)\?\>"
+syn match       goHexadecimalInt    contained "\<0x\x\+\>"
+syn match       goOctalInt          contained "\<0\o\+\>"
+syn match       goOctalError        contained "\<0\o*[89]\d*\>"
+syn cluster     goInt               contains=goDecimalInt,goHexadecimalInt,goOctalInt
+" Floating point
+syn match       goFloat             contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             contained "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             contained "\<\d\+[Ee][-+]\d\+\>"
+" Imaginary literals
+syn match       goImaginary         contained "\<\d\+i\>"
+syn match       goImaginary         contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         contained "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         contained "\<\d\+[Ee][-+]\d\+i\>"
+
+hi def link     goInt        Number
+hi def link     goFloat      Number
+hi def link     goImaginary  Number
+
+" Token groups
+syn cluster     gotplLiteral     contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary
+syn keyword     gotplControl     contained   if else end range with template
+syn keyword     gotplFunctions   contained   and html index js len not or print printf println urlquery eq ne lt le gt ge
+syn match       gotplVariable    contained   /\$[^ ]*\>/
+syn match       goTplIdentifier  contained   /\.[^ ]*\>/
+
+hi def link     gotplControl        Keyword
+hi def link     gotplFunctions      Function
+hi def link     goTplVariable       Special
+
+syn region gotplAction start="{{" end="}}" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable,goTplIdentifier display
+syn region gotplAction start="\[\[" end="\]\]" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable display
+syn region goTplComment start="{{/\*" end="\*/}}" display
+syn region goTplComment start="\[\[/\*" end="\*/\]\]" display
+
+hi def link gotplAction PreProc
+hi def link goTplComment Comment
+
+let b:current_syntax = "gotexttmpl"
+
+" vim:ts=4:sw=4:et

syntax/html.vim

@@ -21,7 +21,7 @@
 syn keyword htmlTagName contained article aside audio canvas command
 syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
 syn keyword htmlTagName contained header hgroup keygen main mark meter menu nav output
-syn keyword htmlTagName contained progress ruby rt rp section source summary time track video data
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
 syn keyword htmlTagName contained template content shadow
 syn keyword htmlTagName contained wbr bdi
 syn keyword htmlTagName contained picture
@@ -43,7 +43,7 @@ syn keyword htmlTagName contained missing-glyph mpath
 syn keyword htmlTagName contained text textPath tref tspan vkern
 
 " Custom Element
-syn match htmlTagName contained "\<[a-z_]\+\(\-[a-z_]\+\)\+\>"
+syn match htmlTagName contained "\<[a-z_]\([a-z0-9_.]\+\)\?\(\-[a-z0-9_.]\+\)\+\>"
 
 " HTML 5 arguments
 " Core Attributes
@@ -76,12 +76,14 @@ syn keyword htmlArg contained label icon open datetime pubdate
 syn keyword htmlArg contained async
 " <content>
 syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox
 " <picture>
 syn keyword htmlArg contained srcset sizes
 
 " Custom Data Attributes
 " http://dev.w3.org/html5/spec/elements.html#embedding-custom-non-visible-data
-syn match   htmlArg "\<\(data\(\-[a-z]\+\)\+\)\=\>" contained
+syn match   htmlArg "\<\(data\-\([a-z_][a-z0-9_.\-]*\)\+\)\=\>" contained
 
 " Microdata
 " http://dev.w3.org/html5/md/

syntax/jade.vim

@@ -31,6 +31,7 @@ syn match   jadeBegin "^\s*\%([<>]\|&[^=~ ]\)\@!" nextgroup=jadeTag,jadeClassCha
 syn match   jadeTag "+\?\w\+\%(:\w\+\)\=" contained contains=htmlTagName,htmlSpecialTagName nextgroup=@jadeComponent
 syn cluster jadeComponent contains=jadeAttributes,jadeIdChar,jadeBlockExpansionChar,jadeClassChar,jadePlainChar,jadeJavascript,jadeTagBlockChar,jadeTagInlineText
 syn match   jadeComment '\s*\/\/.*$'
+syn region  jadeCommentBlock start="\z(\s*\)\/\/.*$" end="^\%(\z1\s\|\s*$\)\@!" keepend 
 syn region  jadeHtmlConditionalComment start="<!--\%(.*\)>" end="<!\%(.*\)-->"
 syn region  jadeAttributes matchgroup=jadeAttributesDelimiter start="(" end=")" contained contains=@htmlJavascript,jadeHtmlArg,htmlArg,htmlEvent,htmlCssDefinition nextgroup=@jadeComponent
 syn match   jadeClassChar "\." contained nextgroup=jadeClass
@@ -45,7 +46,7 @@ syn region  jadeDocType start="^\s*\(!!!\|doctype\)" end="$"
 syn keyword jadeHtmlArg contained href title
 
 syn match   jadePlainChar "\\" contained
-syn region  jadeInterpolation matchgroup=jadeInterpolationDelimiter start="#{" end="}" contains=@htmlJavascript
+syn region  jadeInterpolation matchgroup=jadeInterpolationDelimiter start="[#!]{" end="}" contains=@htmlJavascript
 syn match   jadeInterpolationEscape "\\\@<!\%(\\\\\)*\\\%(\\\ze#{\|#\ze{\)"
 syn match   jadeTagInlineText "\s.*$" contained contains=jadeInterpolation,jadeTextInlineJade
 syn region  jadePipedText matchgroup=jadePipeChar start="|" end="$" contained contains=jadeInterpolation,jadeTextInlineJade nextgroup=jadePipedText skipnl
@@ -67,7 +68,7 @@ syn keyword  jadeScriptLoopKeywords for in contained
 
 syn region  jadeJavascript start="^\z(\s*\)script\%(:\w\+\)\=" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlJavascript,jadeJavascriptTag keepend 
 syn region  jadeJavascriptTag contained start="^\z(\s*\)script\%(:\w\+\)\=" end="$" contains=jadeBegin,jadeTag
-syn region  jadeCssBlock        start="^\z(\s*\)style" nextgroup=@jadeComponent,jadeError  end="^\%(\z1\s\|\s*$\)\@!" contains=@jadeTop,@htmlCss keepend
+syn region  jadeCssBlock        start="^\z(\s*\)style" nextgroup=@jadeComponent,jadeError  end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlCss keepend
 
 syn match  jadeError "\$" contained
 
@@ -90,6 +91,7 @@ hi def link jadeInlineDelimiter        Delimiter
 hi def link jadeFilter                 PreProc
 hi def link jadeDocType                PreProc
 hi def link jadeComment                Comment
+hi def link jadeCommentBlock           Comment
 hi def link jadeHtmlConditionalComment jadeComment
 
 let b:current_syntax = "jade"

syntax/javascript.vim

@@ -35,7 +35,13 @@ syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax keyword jsCommonJS       require module exports
+syntax keyword jsModules        import export contained
+syntax keyword jsModuleWords    default from as contained
+syntax keyword jsOf             of contained
+
+syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString
+
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -53,10 +59,10 @@ if !exists("javascript_ignore_javaScriptdoc")
   "syntax include @javaHtml <sfile>:p:h/html.vim
   "unlet b:current_syntax
 
-  syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+  syntax region jsBlockComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
@@ -70,7 +76,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
   syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
   syntax case match
@@ -79,26 +85,33 @@ endif   "" JSDoc end
 syntax case match
 
 "" Syntax in the JavaScript code
-syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
-syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax match   jsTemplateVar     "\${.\{-}}" contained
-syntax region  jsStringD         start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsStringS         start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString  start=+`+  skip=+\\\(`\|$\)+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
+syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
+syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
+syntax match   jsTemplateVar      "\${.\{-}}" contained
+syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsTaggedTemplate   start=/\k\+\(\(\n\|\s\)\+\)\?`/ end=+`\|$+ contains=jsTemplateString
+syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
-syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
+syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
 syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
-syntax match   jsRegexpOr        "\v\<@!\|" contained
-syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
-syntax cluster jsRegexpSpecial   contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup     start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
-syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
-syntax keyword jsNumber          Infinity
-syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey contained
-syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
+syntax match   jsRegexpOr         "\v\<@!\|" contained
+syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
+syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
+syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpString     start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
+syntax keyword jsNumber           Infinity
+syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
+syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
+
+syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise
+syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
+syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis contained
+syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained
+syntax match   jsFuncAssignIdent    /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
 
 exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
 exe 'syntax keyword jsReturn    return    '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
@@ -106,23 +119,26 @@ exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefi
 exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
 exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
 exe 'syntax keyword jsThis      this      '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
+exe 'syntax keyword jsStatic    static    '.(exists('g:javascript_conceal_static')      ? 'conceal cchar='.g:javascript_conceal_static      : '')
+exe 'syntax keyword jsSuper     super     '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
 
 "" Statement Keywords
 syntax keyword jsStatement      break continue with
 syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
 syntax keyword jsLabel          case default
-syntax keyword jsKeyword        yield import export default extends class
+syntax keyword jsKeyword        yield
+syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 
-syntax keyword jsFutureKeys     abstract enum int short boolean interface static byte long super char final native synchronized float package throws goto private transient debugger implements protected volatile double public
+syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
 
 "" DOM/HTML/CSS specified things
 
@@ -172,12 +188,11 @@ endif "DOM/HTML/CSS
 
 "" end DOM/HTML/CSS specified things
 
-
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
-syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
+syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
@@ -194,10 +209,11 @@ if main_syntax == "javascript"
   syntax sync match jsHighlight grouphere jsBlock /{/
 endif
 
-exe 'syntax match jsFunction /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 
+syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
 syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
@@ -218,7 +234,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsComment              Comment
   HiLink jsLineComment          Comment
   HiLink jsEnvComment           PreProc
-  HiLink jsDocComment           Comment
+  HiLink jsBlockComment         Comment
   HiLink jsCommentTodo          Todo
   HiLink jsCvsTag               Function
   HiLink jsDocTags              Special
@@ -229,6 +245,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStringS              String
   HiLink jsStringD              String
   HiLink jsTemplateString       String
+  HiLink jsTaggedTemplate       StorageClass
   HiLink jsTernaryIfOperator    Conditional
   HiLink jsRegexpString         String
   HiLink jsRegexpBoundary       SpecialChar
@@ -250,6 +267,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsKeyword              Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
+  HiLink jsGenerator            jsFunction
   HiLink jsFuncName             Function
   HiLink jsArgsObj              Special
   HiLink jsError                Error
@@ -258,8 +276,12 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensErrB           Error
   HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
+  HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass
+  HiLink jsClass                Structure
   HiLink jsThis                 Special
+  HiLink jsStatic               Special
+  HiLink jsSuper                Special
   HiLink jsNan                  Number
   HiLink jsNull                 Type
   HiLink jsUndefined            Type
@@ -279,7 +301,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special
   HiLink jsBuiltins             Special
-  HiLink jsCommonJS             Include
+  HiLink jsModules              Include
+  HiLink jsModuleWords          Include
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant
@@ -296,10 +319,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 endif
 
 " Define the htmlJavaScript for HTML syntax html.vim
-"syntax clear htmlJavaScript
-"syntax clear jsExpression
 syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock
 syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,@htmlPreproc
+
 " Vim's default html.vim highlights all javascript as 'Special'
 hi! def link javaScript              NONE
 

syntax/json.vim

@@ -1,13 +1,7 @@
 " Vim syntax file
 " Language:	JSON
-" Maintainer:	Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
-" Last Change:	2009-06-16
-" Version:      0.4
-" {{{1
-
-" Syntax setup {{{2
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
+" Last Change:	2014-12-20 Load ftplugin/json.vim
 
 if !exists("main_syntax")
   if version < 600
@@ -18,54 +12,95 @@ if !exists("main_syntax")
   let main_syntax = 'json'
 endif
 
-" Syntax: Strings {{{2
-syn region  jsonString    start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=jsonEscape
-" Syntax: JSON does not allow strings with single quotes, unlike JavaScript.
-syn region  jsonStringSQ  start=+'+  skip=+\\\\\|\\"+  end=+'+
+syntax match   jsonNoise           /\%(:\|,\)/
 
-" Syntax: Escape sequences {{{3
+" Syntax: Strings
+" Separated into a match and region because a region by itself is always greedy
+syn match  jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString
+syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ concealends contains=jsonEscape contained
+
+" Syntax: JSON does not allow strings with single quotes, unlike JavaScript.
+syn region  jsonStringSQError oneline  start=+'+  skip=+\\\\\|\\"+  end=+'+
+
+" Syntax: JSON Keywords
+" Separated into a match and region because a region by itself is always greedy
+syn match  jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
+syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contains=jsonEscape contained
+
+" Syntax: Escape sequences
 syn match   jsonEscape    "\\["\\/bfnrt]" contained
 syn match   jsonEscape    "\\u\x\{4}" contained
 
-" Syntax: Strings should always be enclosed with quotes.
-syn match   jsonNoQuotes  "\<\a\+\>"
+" Syntax: Numbers
+syn match   jsonNumber    "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>\ze[[:blank:]\r\n]*[,}\]]"
 
-" Syntax: Numbers {{{2
-syn match   jsonNumber    "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>"
+" ERROR WARNINGS **********************************************
+" Syntax: Strings should always be enclosed with quotes.
+syn match   jsonNoQuotesError  "\<[[:alpha:]][[:alnum:]]*\>"
+syn match   jsonTripleQuotesError  /"""/
 
 " Syntax: An integer part of 0 followed by other digits is not allowed.
 syn match   jsonNumError  "-\=\<0\d\.\d*\>"
 
-" Syntax: Boolean {{{2
-syn keyword jsonBoolean   true false
+" Syntax: Decimals smaller than one should begin with 0 (so .1 should be 0.1).
+syn match   jsonNumError  "\:\@<=[[:blank:]\r\n]*\zs\.\d\+"
 
-" Syntax: Null {{{2
-syn keyword jsonNull      null
+" Syntax: No comments in JSON, see http://stackoverflow.com/questions/244777/can-i-comment-a-json-file
+syn match   jsonCommentError  "//.*"
+syn match   jsonCommentError  "\(/\*\)\|\(\*/\)"
 
-" Syntax: Braces {{{2
-syn match   jsonBraces	   "[{}\[\]]"
+" Syntax: No semicolons in JSON
+syn match   jsonSemicolonError  ";"
 
-" Define the default highlighting. {{{1
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Syntax: No trailing comma after the last element of arrays or objects
+syn match   jsonTrailingCommaError  ",\_s*[}\]]"
+
+" Syntax: Watch out for missing commas between elements
+syn match   jsonMissingCommaError /\("\|\]\|\d\)\zs\_s\+\ze"/
+syn match   jsonMissingCommaError /\(\]\|\}\)\_s\+\ze"/ "arrays/objects as values
+syn match   jsonMissingCommaError /}\_s\+\ze{/ "objects as elements in an array
+syn match   jsonMissingCommaError /\(true\|false\)\_s\+\ze"/ "true/false as value
+
+" ********************************************** END OF ERROR WARNINGS
+" Allowances for JSONP: function call at the beginning of the file,
+" parenthesis and semicolon at the end.
+" Function name validation based on
+" http://stackoverflow.com/questions/2008279/validate-a-javascript-function-name/2008444#2008444
+syn match  jsonPadding "\%^[[:blank:]\r\n]*[_$[:alpha:]][_$[:alnum:]]*[[:blank:]\r\n]*("
+syn match  jsonPadding ");[[:blank:]\r\n]*\%$"
+
+" Syntax: Boolean
+syn match  jsonBoolean /\(true\|false\)\(\_s\+\ze"\)\@!/
+
+" Syntax: Null
+syn keyword  jsonNull      null
+
+" Syntax: Braces
+syn region  jsonFold matchgroup=jsonBraces start="{" end=/}\(\_s\+\ze\("\|{\)\)\@!/ transparent fold
+syn region  jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent fold
+
+" Define the default highlighting.
 if version >= 508 || !exists("did_json_syn_inits")
-  if version < 508
-    let did_json_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsonString             String
-  HiLink jsonEscape             Special
-  HiLink jsonNumber		Number
-  HiLink jsonBraces		Operator
-  HiLink jsonNull		Function
-  HiLink jsonBoolean		Boolean
+  hi def link jsonPadding		Operator
+  hi def link jsonString		String
+  hi def link jsonTest			Label
+  hi def link jsonEscape		Special
+  hi def link jsonNumber		Number
+  hi def link jsonBraces		Delimiter
+  hi def link jsonNull			Function
+  hi def link jsonBoolean		Boolean
+  hi def link jsonKeyword		Label
 
-  HiLink jsonNumError           Error
-  HiLink jsonStringSQ           Error
-  HiLink jsonNoQuotes           Error
-  delcommand HiLink
+  hi def link jsonNumError					Error
+  hi def link jsonCommentError				Error
+  hi def link jsonSemicolonError			Error
+  hi def link jsonTrailingCommaError		Error
+  hi def link jsonMissingCommaError		Error
+  hi def link jsonStringSQError				Error
+  hi def link jsonNoQuotesError				Error
+  hi def link jsonTripleQuotesError		Error
+  hi def link jsonQuote			Quote
+  hi def link jsonNoise			Noise
 endif
 
 let b:current_syntax = "json"
@@ -73,5 +108,12 @@ if main_syntax == 'json'
   unlet main_syntax
 endif
 
-" Vim settings {{{2
+" Vim settings
 " vim: ts=8 fdm=marker
+
+" MIT License
+" Copyright (c) 2013, Jeroen Ruigrok van der Werven, Eli Parra
+"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+"THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"See https://twitter.com/elzr/status/294964017926119424

syntax/jst.vim

@@ -24,6 +24,10 @@ elseif !exists("b:jst_subtype") && main_syntax == 'jst'
     let b:jst_subtype = 'haml'
   elseif b:jst_subtype == 'ejs'
     let b:jst_subtype = 'html'
+  elseif b:jst_subtype == 'ect'
+    let b:jst_subtype = 'html'
+  elseif b:jst_subtype == 'djs'
+    let b:jst_subtype = 'html'
   elseif b:jst_subtype == 'rb'
     let b:jst_subtype = 'ruby'
   elseif b:jst_subtype == 'yml'
@@ -70,4 +74,14 @@ if main_syntax == 'jst'
   unlet main_syntax
 endif
 
+set commentstring=<!--%s-->
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 1
+  let b:match_words = '<:>,' .
+  \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .
+  \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .
+  \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+endif
+
 " vim: nowrap sw=2 sts=2 ts=8:

syntax/perl.vim

@@ -39,11 +39,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-if exists('&regexpengine')
-  let s:regexpengine=&regexpengine
-  set regexpengine=1
-endif
-
 " POD starts with ^=<word> and ends with ^=cut
 
 if !exists("perl_include_pod") || perl_include_pod == 1
@@ -334,19 +329,24 @@ syn region perlQQ		matchgroup=perlStringStartEnd start=+\<\%(::\|'\|->\)\@<!qr\s
 " XXX Any statements after the identifier are in perlString colour (i.e.
 " 'if $a' in 'print <<EOF if $a'). This is almost impossible to get right it
 " seems due to the 'auto-extending nature' of regions.
+syn region perlHereDocStart	matchgroup=perlStringStartEnd start=+<<\z(\I\i*\)+  end=+$+     contains=@perlTop oneline
+syn region perlHereDocStart	matchgroup=perlStringStartEnd start=+<<\s*"\z([^\\"]*\%(\\.[^\\"]*\)*\)"+ end=+$+ contains=@perlTop oneline
+syn region perlHereDocStart	matchgroup=perlStringStartEnd start=+<<\s*'\z([^\\']*\%(\\.[^\\']*\)*\)'+ end=+$+ contains=@perlTop oneline
+syn region perlHereDocStart	matchgroup=perlStringStartEnd start=+<<\s*""+       end=+$+     contains=@perlTop oneline
+syn region perlHereDocStart	matchgroup=perlStringStartEnd start=+<<\s*''+       end=+$+     contains=@perlTop oneline
 if exists("perl_fold")
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\z(\I\i*\).*+    end=+^\z1$+ contains=@perlInterpDQ fold extend
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*"\z([^\\"]*\%(\\.[^\\"]*\)*\)"+ end=+^\z1$+ contains=@perlInterpDQ fold extend
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*'\z([^\\']*\%(\\.[^\\']*\)*\)'+ end=+^\z1$+ contains=@perlInterpSQ fold extend
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*""+           end=+^$+    contains=@perlInterpDQ,perlNotEmptyLine fold extend
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*''+           end=+^$+    contains=@perlInterpSQ,perlNotEmptyLine fold extend
+  syn region perlHereDoc	start=+<<\z(\I\i*\)+ matchgroup=perlStringStartEnd      end=+^\z1$+ contains=perlHereDocStart,@perlInterpDQ fold extend
+  syn region perlHereDoc	start=+<<\s*"\z([^\\"]*\%(\\.[^\\"]*\)*\)"+ matchgroup=perlStringStartEnd end=+^\z1$+ contains=perlHereDocStart,@perlInterpDQ fold extend
+  syn region perlHereDoc	start=+<<\s*'\z([^\\']*\%(\\.[^\\']*\)*\)'+ matchgroup=perlStringStartEnd end=+^\z1$+ contains=perlHereDocStart,@perlInterpSQ fold extend
+  syn region perlHereDoc	start=+<<\s*""+ matchgroup=perlStringStartEnd           end=+^$+    contains=perlHereDocStart,@perlInterpDQ,perlNotEmptyLine fold extend
+  syn region perlHereDoc	start=+<<\s*''+ matchgroup=perlStringStartEnd           end=+^$+    contains=perlHereDocStart,@perlInterpSQ,perlNotEmptyLine fold extend
   syn region perlAutoload	matchgroup=perlStringStartEnd start=+<<\s*\(['"]\=\)\z(END_\%(SUB\|OF_FUNC\|OF_AUTOLOAD\)\)\1+ end=+^\z1$+ contains=ALL fold extend
 else
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\z(\I\i*\).*+    end=+^\z1$+ contains=@perlInterpDQ
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*"\z([^\\"]*\%(\\.[^\\"]*\)*\)"+ end=+^\z1$+ contains=@perlInterpDQ
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*'\z([^\\']*\%(\\.[^\\']*\)*\)'+ end=+^\z1$+ contains=@perlInterpSQ
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*""+           end=+^$+    contains=@perlInterpDQ,perlNotEmptyLine
-  syn region perlHereDoc	matchgroup=perlStringStartEnd start=+<<\s*''+           end=+^$+    contains=@perlInterpSQ,perlNotEmptyLine
+  syn region perlHereDoc	start=+<<\z(\I\i*\)+ matchgroup=perlStringStartEnd      end=+^\z1$+ contains=perlHereDocStart,@perlInterpDQ
+  syn region perlHereDoc	start=+<<\s*"\z([^\\"]*\%(\\.[^\\"]*\)*\)"+ matchgroup=perlStringStartEnd end=+^\z1$+ contains=perlHereDocStart,@perlInterpDQ
+  syn region perlHereDoc	start=+<<\s*'\z([^\\']*\%(\\.[^\\']*\)*\)'+ matchgroup=perlStringStartEnd end=+^\z1$+ contains=perlHereDocStart,@perlInterpSQ
+  syn region perlHereDoc	start=+<<\s*""+ matchgroup=perlStringStartEnd           end=+^$+    contains=perlHereDocStart,@perlInterpDQ,perlNotEmptyLine
+  syn region perlHereDoc	start=+<<\s*''+ matchgroup=perlStringStartEnd           end=+^$+    contains=perlHereDocStart,@perlInterpSQ,perlNotEmptyLine
   syn region perlAutoload	matchgroup=perlStringStartEnd start=+<<\s*\(['"]\=\)\z(END_\%(SUB\|OF_FUNC\|OF_AUTOLOAD\)\)\1+ end=+^\z1$+ contains=ALL
 endif
 
@@ -360,20 +360,16 @@ syn keyword perlStatementPackage	package contained
 "       sub [name] [(prototype)] {
 "
 syn match perlSubError "[^[:space:];{#]" contained
-if v:version == 701 && !has('patch221')  " XXX I hope that's the right one
-    syn match perlSubAttributes ":" contained
+syn match perlSubAttributesCont "\h\w*\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained
+syn region perlSubAttributesCont matchgroup=perlSubAttributesCont start="\h\w*(" end=")\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained contains=@perlInterpSQ,perlParensSQ
+syn cluster perlSubAttrMaybe contains=perlSubAttributesCont,perlSubError,perlFakeGroup
+syn match perlSubAttributes "" contained nextgroup=perlSubError
+syn match perlSubAttributes ":\_s*" contained nextgroup=@perlSubAttrMaybe
+if get(g:, "perl_sub_signatures", 0)
+    syn match perlSignature +(\_[^)]*)\_s*+ nextgroup=perlSubAttributes,perlComment contained
 else
-    syn match perlSubAttributesCont "\h\w*\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained
-    syn region perlSubAttributesCont matchgroup=perlSubAttributesCont start="\h\w*(" end=")\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained contains=@perlInterpSQ,perlParensSQ
-    syn cluster perlSubAttrMaybe contains=perlSubAttributesCont,perlSubError,perlFakeGroup
-    syn match perlSubAttributes "" contained nextgroup=perlSubError
-    syn match perlSubAttributes ":\_s*" contained nextgroup=@perlSubAttrMaybe
-endif
-if !exists("perl_no_subprototype_error") " Set 1 if using signatures feature in perl5.19.9
     syn match perlSubPrototypeError "(\%(\_s*\%(\%(\\\%([$@%&*]\|\[[$@%&*]\+\]\)\|[$&*]\|[@%]\%(\_s*)\)\@=\|;\%(\_s*[)$@%&*\\]\)\@=\|_\%(\_s*[);]\)\@=\)\_s*\)*\)\@>\zs\_[^)]\+" contained
     syn match perlSubPrototype +(\_[^)]*)\_s*+ nextgroup=perlSubAttributes,perlComment contained contains=perlSubPrototypeError
-else
-    syntax match perlSignature "(.\{-})" nextgroup=perlSubAttributes,perlComment contained
 endif
 
 syn match perlSubName +\%(\h\|::\|'\w\)\%(\w\|::\|'\w\)*\_s*\|+ contained nextgroup=perlSubPrototype,perlSignature,perlSubAttributes,perlComment
@@ -416,9 +412,9 @@ if exists("perl_fold")
     syn region perlPackageFold start="^package \S\+;\s*\%(#.*\)\=$" end="^1;\=\s*\%(#.*\)\=$" end="\n\+package"me=s-1 transparent fold keepend
   endif
   if !exists("perl_nofold_subs")
-    if exists("perl_fold_anonymous_subs") && perl_fold_anonymous_subs
-      syn region perlSubFold     start="\<sub\>[^;]*{" end="}" transparent fold keepend extend
-      syn region perlSubFold     start="\<\%(BEGIN\|END\|CHECK\|INIT\)\>\s*{" end="}" transparent fold keepend
+    if get(g:, "perl_fold_anonymous_subs", 0)
+      syn region perlSubFold start="\<sub\>[^{]*{" end="}" transparent fold keepend extend
+      syn region perlSubFold start="\<\%(BEGIN\|END\|CHECK\|INIT\)\>\s*{" end="}" transparent fold keepend
     else
       syn region perlSubFold     start="^\z(\s*\)\<sub\>.*[^};]$" end="^\z1}\s*\%(#.*\)\=$" transparent fold keepend
       syn region perlSubFold start="^\z(\s*\)\<\%(BEGIN\|END\|CHECK\|INIT\|UNITCHECK\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
@@ -583,11 +579,6 @@ syn sync match perlSyncPOD	grouphere NONE "^=cut"
 
 let b:current_syntax = "perl"
 
-if exists('&regexpengine')
-  let &regexpengine=s:regexpengine
-  unlet s:regexpengine
-endif
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 

syntax/php.vim

@@ -533,10 +533,10 @@ syn match phpOperator       "&&\|\<and\>" contained display
 syn match phpOperator       "||\|\<x\=or\>" contained display
 syn match phpOperator       "[!=<>]=" contained display
 syn match phpOperator       "[<>]"  contained display
-syn match phpMemberSelector "->"  contained display
+syn match phpMemberSelector "->\|::"  contained display
 syn match phpVarSelector    "\$"  contained display
-" highlight object variables inside strings
-syn match phpMethodsVar     "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble
+" highlight static and object variables inside strings
+syn match phpMethodsVar     "\%(->\|::$\?\)\h\w*" contained contains=phpMethods,phpMemberSelector,phpIdentifier display containedin=phpStringDouble
 syn match phpSplatOperator  "\.\.\." contained display
 
 " Identifier

syntax/proto.vim

@@ -1,6 +1,6 @@
 " Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
-" http://code.google.com/p/protobuf/
+" https://developers.google.com/protocol-buffers/
 "
 " Redistribution and use in source and binary forms, with or without
 " modification, are permitted provided that the following conditions are
@@ -54,7 +54,7 @@ syn keyword pbTodo       contained TODO FIXME XXX
 syn cluster pbCommentGrp contains=pbTodo
 
 syn keyword pbSyntax     syntax import option
-syn keyword pbStructure  package message group
+syn keyword pbStructure  package message group oneof
 syn keyword pbRepeat     optional required repeated
 syn keyword pbDefault    default
 syn keyword pbExtend     extend extensions to max
@@ -69,11 +69,10 @@ syn keyword pbBool      true false
 syn match   pbInt     /-\?\<\d\+\>/
 syn match   pbInt     /\<0[xX]\x+\>/
 syn match   pbFloat   /\<-\?\d*\(\.\d*\)\?/
-" TODO: .proto also supports C-style block comments;
-" see /usr/share/vim/vim70/syntax/c.vim for how it's done.
+syn region  pbComment start="\/\*" end="\*\/" contains=@pbCommentGrp
 syn region  pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
-syn region  pbString  start=/"/ skip=/\\"/ end=/"/
-syn region  pbString  start=/'/ skip=/\\'/ end=/'/
+syn region  pbString  start=/"/ skip=/\\./ end=/"/
+syn region  pbString  start=/'/ skip=/\\./ end=/'/
 
 if version >= 508 || !exists("did_proto_syn_inits")
   if version < 508

syntax/ruby.vim

@@ -130,18 +130,22 @@ syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\["				 end="\][io
 syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r("				 end=")[iomxneus]*"   skip="\\\\\|\\)"	 contains=@rubyRegexpSpecial fold
 
 " Normal String and Shell Command Output
-syn region rubyString matchgroup=rubyStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial,@Spell fold
-syn region rubyString matchgroup=rubyStringDelimiter start="'"	end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape,@Spell    fold
-syn region rubyString matchgroup=rubyStringDelimiter start="`"	end="`"  skip="\\\\\|\\`"  contains=@rubyStringSpecial fold
+if exists('ruby_spellcheck_strings')
+  syn region rubyString matchgroup=rubyStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial,@Spell fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="'"  end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape,@Spell    fold
+else
+  syn region rubyString matchgroup=rubyStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="'"  end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape    fold
+endif
+syn region rubyString matchgroup=rubyStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=@rubyStringSpecial fold
 
 " Generalized Single Quoted String, Symbol and Array of Strings
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]{"				   end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]<"				   end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]\["				   end="\]"  skip="\\\\\|\\\]"	fold contains=rubyNestedSquareBrackets,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]("				   end=")"   skip="\\\\\|\\)"	fold contains=rubyNestedParentheses,rubyDelimEscape
+syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
+syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]{"				   end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimEscape
+syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]<"				   end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimEscape
+syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]\["				   end="\]"  skip="\\\\\|\\\]"	fold contains=rubyNestedSquareBrackets,rubyDelimEscape
+syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]("				   end=")"   skip="\\\\\|\\)"	fold contains=rubyNestedParentheses,rubyDelimEscape
 syn region rubyString matchgroup=rubyStringDelimiter start="%q "				   end=" "   skip="\\\\\|\\)"	fold
-
 syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\z([~`!@#$%^&*_\-+=|\:;"',.? /]\)"   end="\z1" skip="\\\\\|\\\z1" fold
 syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s{"				   end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimEscape
 syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s<"				   end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimEscape
@@ -151,13 +155,27 @@ syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s("				   end=")"
 " Generalized Double Quoted String and Array of Strings and Shell Command Output
 " Note: %= is not matched here as the beginning of a double quoted string
 syn region rubyString matchgroup=rubyStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)"	    end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\={"				    end="}"   skip="\\\\\|\\}"	 contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimEscape    fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\=<"				    end=">"   skip="\\\\\|\\>"	 contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimEscape  fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\=\["				    end="\]"  skip="\\\\\|\\\]"	 contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimEscape fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\=("				    end=")"   skip="\\\\\|\\)"	 contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimEscape    fold
+syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
+syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\={"				    end="}"   skip="\\\\\|\\}"	 contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimEscape    fold
+syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=<"				    end=">"   skip="\\\\\|\\>"	 contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimEscape  fold
+syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=\["				    end="\]"  skip="\\\\\|\\\]"	 contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimEscape fold
+syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=("				    end=")"   skip="\\\\\|\\)"	 contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimEscape    fold
 syn region rubyString matchgroup=rubyStringDelimiter start="%[Qx] "				    end=" "   skip="\\\\\|\\)"   contains=@rubyStringSpecial fold
 
+" Array of Symbols
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i{"				end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimEscape
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i<"				end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimEscape
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i\["				end="\]"  skip="\\\\\|\\\]"	fold contains=rubyNestedSquareBrackets,rubyDelimEscape
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i("				end=")"   skip="\\\\\|\\)"	fold contains=rubyNestedParentheses,rubyDelimEscape
+
+" Array of interpolated Symbols
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\={"				end="}"   skip="\\\\\|\\}"	 contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimEscape    fold
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\=<"				end=">"   skip="\\\\\|\\>"	 contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimEscape  fold
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\=\["				end="\]"  skip="\\\\\|\\\]"	 contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimEscape fold
+syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\=("				end=")"   skip="\\\\\|\\)"	 contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimEscape    fold
+
 " Here Document
 syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<-\=\zs\%(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)+	 end=+$+ oneline contains=ALLBUT,@rubyNotTop
 syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<-\=\zs"\%([^"]*\)"+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
@@ -224,7 +242,7 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
   " statements without 'do'
   syn region rubyBlockExpression       matchgroup=rubyControl	  start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
   syn region rubyCaseExpression	       matchgroup=rubyConditional start="\<case\>"  end="\<end\>" contains=ALLBUT,@rubyNotTop fold
-  syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" end="\%(\%(\%(\.\@<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
+  syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*%&^|+=-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" end="\%(\%(\%(\.\@<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
 
   syn match rubyConditional "\<\%(then\|else\|when\)\>[?!]\@!"	contained containedin=rubyCaseExpression
   syn match rubyConditional "\<\%(then\|else\|elsif\)\>[?!]\@!" contained containedin=rubyConditionalExpression
@@ -352,7 +370,7 @@ hi def link rubyInterpolationDelimiter	Delimiter
 hi def link rubyNoInterpolation		rubyString
 hi def link rubySharpBang		PreProc
 hi def link rubyRegexpDelimiter		rubyStringDelimiter
-hi def link rubySymbolDelimiter		rubyStringDelimiter
+hi def link rubySymbolDelimiter		rubySymbol
 hi def link rubyStringDelimiter		Delimiter
 hi def link rubyHeredoc			rubyString
 hi def link rubyString			String

syntax/rust.vim

@@ -3,7 +3,7 @@
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
 " Maintainer:   Ben Blum <bblum@cs.cmu.edu>
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
-" Last Change:  July 18, 2014
+" Last Change:  January 5, 2015
 
 if version < 600
   syntax clear
@@ -24,7 +24,7 @@ syn keyword   rustKeyword     continue
 syn keyword   rustKeyword     extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite skipempty
 syn keyword   rustKeyword     fn nextgroup=rustFuncName skipwhite skipempty
 syn keyword   rustKeyword     for in if impl let
-syn keyword   rustKeyword     loop once proc pub
+syn keyword   rustKeyword     loop once pub
 syn keyword   rustKeyword     return super
 syn keyword   rustKeyword     unsafe virtual where while
 syn keyword   rustKeyword     use nextgroup=rustModPath skipwhite skipempty
@@ -56,10 +56,10 @@ syn match rustMacroRepeatCount ".\?[*+]" contained
 syn match rustMacroVariable "$\w\+"
 
 " Reserved (but not yet used) keywords {{{2
-syn keyword   rustReservedKeyword alignof be do offsetof priv pure sizeof typeof unsized yield abstract final override
+syn keyword   rustReservedKeyword alignof be do offsetof priv pure sizeof typeof unsized yield abstract final override macro
 
 " Built-in types {{{2
-syn keyword   rustType        int uint float char bool u8 u16 u32 u64 f32
+syn keyword   rustType        isize usize float char bool u8 u16 u32 u64 f32
 syn keyword   rustType        f64 i8 i16 i32 i64 str Self
 
 " Things from the prelude (src/libstd/prelude.rs) {{{2
@@ -68,59 +68,35 @@ syn keyword   rustType        f64 i8 i16 i32 i64 str Self
 
 " Reexported core operators {{{3
 syn keyword   rustTrait       Copy Send Sized Sync
-syn keyword   rustTrait       Add Sub Mul Div Rem Neg Not
-syn keyword   rustTrait       BitAnd BitOr BitXor
-syn keyword   rustTrait       Drop Deref DerefMut
-syn keyword   rustTrait       Shl Shr
-syn keyword   rustTrait       Index IndexMut
-syn keyword   rustTrait       Slice SliceMut
-syn keyword   rustTrait       Fn FnMut FnOnce
+syn keyword   rustTrait       Drop Fn FnMut FnOnce
 
 " Reexported functions {{{3
-"syn keyword rustFunction range repeat
-"syn keyword rustFunction drop
-"syn keyword rustFunction from_str
+syn keyword rustFunction drop
 
 " Reexported types and traits {{{3
-syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr
-syn keyword rustTrait IntoBytes
-syn keyword rustTrait ToCStr
-syn keyword rustTrait Char UnicodeChar
+syn keyword rustTrait Box
+syn keyword rustTrait CharExt
 syn keyword rustTrait Clone
 syn keyword rustTrait PartialEq PartialOrd Eq Ord
-syn keyword rustEnum Ordering Equiv
-syn keyword rustEnumVariant Less Equal Greater
-syn keyword rustTrait FromIterator Extend ExactSize
-syn keyword rustTrait Iterator DoubleEndedIterator
-syn keyword rustTrait RandomAccessIterator CloneableIterator
-syn keyword rustTrait OrdIterator MutableDoubleEndedIterator
-syn keyword rustTrait ToPrimitive FromPrimitive
-syn keyword rustTrait Box
+syn keyword rustTrait DoubleEndedIterator
+syn keyword rustTrait ExactSizeIterator
+syn keyword rustTrait Iterator IteratorExt Extend
 syn keyword rustEnum Option
 syn keyword rustEnumVariant Some None
-syn keyword rustTrait GenericPath Path PosixPath WindowsPath
-syn keyword rustTrait RawPtr RawMutPtr
+syn keyword rustTrait PtrExt MutPtrExt
 syn keyword rustEnum Result
 syn keyword rustEnumVariant Ok Err
-syn keyword rustTrait Buffer Writer Reader Seek BufferPrelude
-syn keyword rustTrait Str StrVector StrPrelude
-syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrPrelude
-syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
-syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
-syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12
-syn keyword rustTrait SlicePrelude AsSlice CloneSlicePrelude
-syn keyword rustTrait VectorVector PartialEqSlicePrelude OrdSlicePrelude
-syn keyword rustTrait CloneSliceAllocPrelude OrdSliceAllocPrelude SliceAllocPrelude
-syn keyword rustTrait IntoString String ToString
+syn keyword rustTrait AsSlice
+syn keyword rustTrait SliceExt SliceConcatExt
+syn keyword rustTrait Str StrExt
+syn keyword rustTrait String ToString
 syn keyword rustTrait Vec
-
-" Reexported runtime types {{{3
-"syn keyword rustFunction sync_channel channel
-syn keyword rustTrait SyncSender Sender Receiver
-"syn keyword rustFunction spawn
+" FIXME: remove when path reform lands
+syn keyword rustTrait Path GenericPath
+" FIXME: remove when I/O reform lands
+syn keyword rustTrait Buffer Writer Reader Seek BufferPrelude
 
 " Other syntax {{{2
-
 syn keyword   rustSelf        self
 syn keyword   rustBoolean     true false
 
@@ -151,19 +127,20 @@ syn match     rustMacro       '#\w\(\w\)*' contains=rustAssert,rustPanic
 syn match     rustEscapeError   display contained /\\./
 syn match     rustEscape        display contained /\\\([nrt0\\'"]\|x\x\{2}\)/
 syn match     rustEscapeUnicode display contained /\\\(u\x\{4}\|U\x\{8}\)/
+syn match     rustEscapeUnicode display contained /\\u{\x\{1,6}}/
 syn match     rustStringContinuation display contained /\\\n\s*/
 syn region    rustString      start=+b"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeError,rustStringContinuation
 syn region    rustString      start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustStringContinuation,@Spell
 syn region    rustString      start='b\?r\z(#*\)"' end='"\z1' contains=@Spell
 
-syn region    rustAttribute   start="#!\?\[" end="\]" contains=rustString,rustDeriving
-syn region    rustDeriving    start="deriving(" end=")" contained contains=rustTrait
+syn region    rustAttribute   start="#!\?\[" end="\]" contains=rustString,rustDerive
+syn region    rustDerive      start="derive(" end=")" contained contains=rustTrait
 
 " Number literals
-syn match     rustDecNumber   display "\<[0-9][0-9_]*\%([iu]\%(8\|16\|32\|64\)\=\)\="
-syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\%([iu]\%(8\|16\|32\|64\)\=\)\="
-syn match     rustOctNumber   display "\<0o[0-7_]\+\%([iu]\%(8\|16\|32\|64\)\=\)\="
-syn match     rustBinNumber   display "\<0b[01_]\+\%([iu]\%(8\|16\|32\|64\)\=\)\="
+syn match     rustDecNumber   display "\<[0-9][0-9_]*\%([iu]\%(s\|8\|16\|32\|64\)\)\="
+syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\%([iu]\%(s\|8\|16\|32\|64\)\)\="
+syn match     rustOctNumber   display "\<0o[0-7_]\+\%([iu]\%(s\|8\|16\|32\|64\)\)\="
+syn match     rustBinNumber   display "\<0b[01_]\+\%([iu]\%(s\|8\|16\|32\|64\)\)\="
 
 " Special case for numbers of the form "1." which are float literals, unless followed by
 " an identifier, which makes them integer literals with a method call or field access,
@@ -187,7 +164,7 @@ syn match   rustCharacterInvalid   display contained /b\?'\zs[\n\r\t']\ze'/
 " The groups negated here add up to 0-255 but nothing else (they do not seem to go beyond ASCII).
 syn match   rustCharacterInvalidUnicode   display contained /b'\zs[^[:cntrl:][:graph:][:alnum:][:space:]]\ze'/
 syn match   rustCharacter   /b'\([^\\]\|\\\(.\|x\x\{2}\)\)'/ contains=rustEscape,rustEscapeError,rustCharacterInvalid,rustCharacterInvalidUnicode
-syn match   rustCharacter   /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'/ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustCharacterInvalid
+syn match   rustCharacter   /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{8}\|u{\x\{1,6}}\)\)'/ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustCharacterInvalid
 
 syn region rustCommentLine                                        start="//"                      end="$"   contains=rustTodo,@Spell
 syn region rustCommentLineDoc                                     start="//\%(//\@!\|!\)"         end="$"   contains=rustTodo,@Spell
@@ -262,7 +239,7 @@ hi def link rustMacro         Macro
 hi def link rustType          Type
 hi def link rustTodo          Todo
 hi def link rustAttribute     PreProc
-hi def link rustDeriving      PreProc
+hi def link rustDerive        PreProc
 hi def link rustStorage       StorageClass
 hi def link rustObsoleteStorage Error
 hi def link rustLifetime      Special
@@ -274,7 +251,7 @@ hi def link rustBoxPlacementExpr rustKeyword
 
 " Other Suggestions:
 " hi rustAttribute ctermfg=cyan
-" hi rustDeriving ctermfg=cyan
+" hi rustDerive ctermfg=cyan
 " hi rustAssert ctermfg=yellow
 " hi rustPanic ctermfg=red
 " hi rustMacro ctermfg=magenta

syntax/scala.vim

@@ -1,22 +1,40 @@
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
+" Vim syntax file
+" Language:             Scala
+" Maintainer:           Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" License:              Apache 2
+" ----------------------------------------------------------------------------
+
+if !exists('main_syntax')
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'scala'
 endif
 
 scriptencoding utf-8
 
 let b:current_syntax = "scala"
 
+" Allows for embedding, see #59; main_syntax convention instead? Refactor TOP
+"
+" The @Spell here is a weird hack, it means *exclude* if the first group is
+" TOP. Otherwise we get spelling errors highlighted on code elements that
+" match scalaBlock, even with `syn spell notoplevel`.
 function! s:ContainedGroup()
   try
     silent syn list @scala
-    return '@scala'
+    return '@scala,@NoSpell'
   catch /E392/
-    return 'TOP'
+    return 'TOP,@Spell'
   endtry
 endfunction
 
+syn include @scalaHtml syntax/html.vim  " Doc comment HTML
+unlet! b:current_syntax
+
 syn case match
 syn sync minlines=200 maxlines=1000
 
@@ -37,7 +55,9 @@ syn match scalaSymbol /'[_A-Za-z0-9$]\+/
 hi link scalaSymbol Number
 
 syn match scalaChar /'.'/
-syn match scalaEscapedChar /\\[\\"ntbrf]/
+syn match scalaChar /'\\[\\"'ntbrf]'/ contains=scalaEscapedChar
+syn match scalaChar /'\\u[A-Fa-f0-9]\{4}'/ contains=scalaUnicodeChar
+syn match scalaEscapedChar /\\[\\"'ntbrf]/
 syn match scalaUnicodeChar /\\u[A-Fa-f0-9]\{4}/
 hi link scalaChar Character
 hi link scalaEscapedChar Function
@@ -58,6 +78,9 @@ syn match scalaInstanceHash /#/ contained nextgroup=scalaInstanceDeclaration
 hi link scalaInstanceDeclaration Special
 hi link scalaInstanceHash Type
 
+syn match scalaUnimplemented /???/
+hi link scalaUnimplemented ERROR
+
 syn match scalaCapitalWord /\<[A-Z][A-Za-z0-9$]*\>/
 hi link scalaCapitalWord Special
 
@@ -97,39 +120,45 @@ hi link scalaCaseFollowing Special
 syn keyword scalaKeywordModifier abstract override final lazy implicit implicitly private protected sealed null require super
 hi link scalaKeywordModifier Function
 
-syn keyword scalaSpecial this true false package import ne eq
+syn keyword scalaSpecial this true false ne eq
 syn keyword scalaSpecial new nextgroup=scalaInstanceDeclaration skipwhite
 syn match scalaSpecial "\%(=>\|⇒\|<-\|←\|->\|→\)"
 syn match scalaSpecial /`[^`]*`/  " Backtick literals
 hi link scalaSpecial PreProc
 
+syn keyword scalaExternal package import
+hi link scalaExternal Include
+
 syn match scalaStringEmbeddedQuote /\\"/ contained
 syn region scalaString start=/"/ end=/"/ contains=scalaStringEmbeddedQuote,scalaEscapedChar,scalaUnicodeChar
 hi link scalaString String
 hi link scalaStringEmbeddedQuote String
 
-syn region scalaIString matchgroup=Special start=/\<[a-zA-Z][a-zA-Z0-9_]*"/ skip=/\\"/ end=/"/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
-syn region scalaTripleIString matchgroup=Special start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn region scalaIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"/ skip=/\\"/ end=/"/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn region scalaTripleIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
 hi link scalaIString String
 hi link scalaTripleIString String
 
 syn match scalaInterpolation /\$[a-zA-Z0-9_$]\+/ contained
-exe 'syn region scalaInterpolationB matchgroup=scalaInterpolation start=/\${/ end=/}/ contained contains=' . s:ContainedGroup()
+exe 'syn region scalaInterpolationB matchgroup=scalaInterpolationBoundary start=/\${/ end=/}/ contained contains=' . s:ContainedGroup()
 hi link scalaInterpolation Function
 hi link scalaInterpolationB Normal
 
-syn region scalaFString matchgroup=Special start=/f"/ skip=/\\"/ end=/"/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn region scalaFString matchgroup=scalaInterpolationBrackets start=/f"/ skip=/\\"/ end=/"/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
 syn match scalaFInterpolation /\$[a-zA-Z0-9_$]\+\(%[-A-Za-z0-9\.]\+\)\?/ contained
-exe 'syn region scalaFInterpolationB matchgroup=scalaFInterpolation start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=' . s:ContainedGroup()
+exe 'syn region scalaFInterpolationB matchgroup=scalaInterpolationBoundary start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=' . s:ContainedGroup()
 hi link scalaFString String
 hi link scalaFInterpolation Function
 hi link scalaFInterpolationB Normal
 
 syn region scalaTripleString start=/"""/ end=/"""\%([^"]\|$\)/ contains=scalaEscapedChar,scalaUnicodeChar
-syn region scalaTripleFString matchgroup=Special start=/f"""/ end=/"""\%([^"]\|$\)/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn region scalaTripleFString matchgroup=scalaInterpolationBrackets start=/f"""/ end=/"""\%([^"]\|$\)/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
 hi link scalaTripleString String
 hi link scalaTripleFString String
 
+hi link scalaInterpolationBrackets Special
+hi link scalaInterpolationBoundary Function
+
 syn match scalaNumber /\<0[dDfFlL]\?\>/ " Just a bare 0
 syn match scalaNumber /\<[1-9]\d*[dDfFlL]\?\>/  " A multi-digit number - octal numbers with leading 0's are deprecated in Scala
 syn match scalaNumber /\<0[xX][0-9a-fA-F]\+[dDfFlL]\?\>/ " Hex number
@@ -140,29 +169,35 @@ hi link scalaNumber Number
 
 syn region scalaRoundBrackets start="(" end=")" skipwhite contained contains=scalaTypeDeclaration,scalaSquareBrackets,scalaRoundBrackets
 
-syn region scalaSquareBrackets matchgroup=Type start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter
+syn region scalaSquareBrackets matchgroup=scalaSquareBracketsBrackets start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter
 syn match scalaTypeOperator /[-+=:<>]\+/ contained
 syn match scalaTypeAnnotationParameter /@\<[`_A-Za-z0-9$]\+\>/ contained
+hi link scalaSquareBracketsBrackets Type
 hi link scalaTypeOperator Keyword
 hi link scalaTypeAnnotationParameter Function
 
-syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaCommentCodeBlock,@scalaHtml keepend
+syn match scalaShebang "\%^#!.*" display
+syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaTodo,scalaCommentCodeBlock,@scalaHtml,@Spell keepend
 syn match scalaCommentAnnotation "@[_A-Za-z0-9$]\+" contained
 syn match scalaParameterAnnotation "@param" nextgroup=scalaParamAnnotationValue skipwhite contained
 syn match scalaParamAnnotationValue /[`_A-Za-z0-9$]\+/ contained
 syn region scalaDocLinks start="\[\[" end="\]\]" contained
 syn region scalaCommentCodeBlock matchgroup=Keyword start="{{{" end="}}}" contained
+syn match scalaTodo "\vTODO|FIXME|XXX" contained
+hi link scalaShebang Comment
 hi link scalaMultilineComment Comment
 hi link scalaDocLinks Function
 hi link scalaParameterAnnotation Function
 hi link scalaParamAnnotationValue Keyword
 hi link scalaCommentAnnotation Function
+hi link scalaCommentCodeBlockBrackets String
 hi link scalaCommentCodeBlock String
+hi link scalaTodo Todo
 
 syn match scalaAnnotation /@\<[`_A-Za-z0-9$]\+\>/
 hi link scalaAnnotation PreProc
 
-syn match scalaTrailingComment "//.*$"
+syn match scalaTrailingComment "//.*$" contains=scalaTodo,@Spell
 hi link scalaTrailingComment Comment
 
 syn match scalaAkkaFSM /goto([^)]*)\_s\+\<using\>/ contains=scalaAkkaFSMGotoUsing
@@ -178,3 +213,11 @@ syn match scalaAkkaFSMGotoUsing /\<using\>/
 syn match scalaAkkaFSMGotoUsing /\<goto\>/
 hi link scalaAkkaFSM PreProc
 hi link scalaAkkaFSMGotoUsing PreProc
+
+let b:current_syntax = 'scala'
+
+if main_syntax ==# 'scala'
+  unlet main_syntax
+endif
+
+" vim:set sw=2 sts=2 ts=8 et:

syntax/tap.vim

@@ -0,0 +1,97 @@
+" Vim syntax file
+" Language:    Verbose TAP Output
+" Maintainer:  Rufus Cable <rufus@threebytesfull.com>
+" Remark:      Simple syntax highlighting for TAP output
+" License:
+" Copyright:   (c) 2008-2013 Rufus Cable
+" Last Change: {{LAST_CHANGE}}
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match tapTestDiag /^ *#.*/ contains=tapTestTodo
+syn match tapTestTime /^ *\[\d\d:\d\d:\d\d\].*/ contains=tapTestFile
+syn match tapTestFile /\w\+\/[^. ]*/ contained
+syn match tapTestFileWithDot /\w\+\/[^ ]*/ contained
+
+syn match tapTestPlan /^ *\d\+\.\.\d\+$/
+
+" tapTest is a line like 'ok 1', 'not ok 2', 'ok 3 - xxxx'
+syn match tapTest /^ *\(not \)\?ok \d\+.*/ contains=tapTestStatusOK,tapTestStatusNotOK,tapTestLine
+
+" tapTestLine is the line without the ok/not ok status - i.e. number and
+" optional message
+syn match tapTestLine /\d\+\( .*\|$\)/ contains=tapTestNumber,tapTestLoadMessage,tapTestTodo,tapTestSkip contained
+
+" turn ok/not ok messages green/red respectively
+syn match tapTestStatusOK /ok/ contained
+syn match tapTestStatusNotOK /not ok/ contained
+
+" highlight todo tests
+syn match tapTestTodo /\(# TODO\|Failed (TODO)\) .*$/ contained contains=tapTestTodoRev
+syn match tapTestTodoRev /\<TODO\>/ contained
+
+" highlight skipped tests
+syn match tapTestSkip /# skip .*$/ contained contains=tapTestSkipTag
+syn match tapTestSkipTag /\(# \)\@<=skip\>/ contained
+
+" look behind so "ok 123" and "not ok 124" match test number
+syn match tapTestNumber /\(ok \)\@<=\d\d*/ contained
+syn match tapTestLoadMessage /\*\*\*.*\*\*\*/ contained contains=tapTestThreeStars,tapTestFileWithDot
+syn match tapTestThreeStars /\*\*\*/ contained
+
+syn region tapTestRegion start=/^ *\(not \)\?ok.*$/me=e+1 end=/^\(\(not \)\?ok\|# Looks like you planned \|All tests successful\|Bailout called\)/me=s-1 fold transparent excludenl
+syn region tapTestResultsOKRegion start=/^\(All tests successful\|Result: PASS\)/ end=/$/
+syn region tapTestResultsNotOKRegion start=/^\(# Looks like you planned \|Bailout called\|# Looks like you failed \|Result: FAIL\)/ end=/$/
+syn region tapTestResultsSummaryRegion start=/^Test Summary Report/ end=/^Files=.*$/ contains=tapTestResultsSummaryHeading,tapTestResultsSummaryNotOK
+
+syn region tapTestResultsSummaryHeading start=/^Test Summary Report/ end=/^-\+$/ contained
+syn region tapTestResultsSummaryNotOK start=/TODO passed:/ end=/$/ contained
+
+syn region tapTestInstructionsRegion start=/\%1l/ end=/^$/
+
+set foldtext=TAPTestLine_foldtext()
+function! TAPTestLine_foldtext()
+    let line = getline(v:foldstart)
+    let sub = substitute(line, '/\*\|\*/\|{{{\d\=', '', 'g')
+    return sub
+endfunction
+
+set foldminlines=5
+set foldcolumn=2
+set foldenable
+set foldmethod=syntax
+syn sync fromstart
+
+if !exists("did_tapverboseoutput_syntax_inits")
+  let did_tapverboseoutput_syntax_inits = 1
+
+  hi      tapTestStatusOK    term=bold    ctermfg=green                 guifg=Green
+  hi      tapTestStatusNotOK term=reverse ctermfg=black  ctermbg=red    guifg=Black     guibg=Red
+  hi      tapTestTodo        term=bold    ctermfg=yellow ctermbg=black  guifg=Yellow    guibg=Black
+  hi      tapTestTodoRev     term=reverse ctermfg=black  ctermbg=yellow guifg=Black     guibg=Yellow
+  hi      tapTestSkip        term=bold    ctermfg=lightblue             guifg=LightBlue
+  hi      tapTestSkipTag     term=reverse ctermfg=black  ctermbg=lightblue guifg=Black  guibg=LightBlue
+  hi      tapTestTime        term=bold    ctermfg=blue                  guifg=Blue
+  hi      tapTestFile        term=reverse ctermfg=black  ctermbg=yellow guibg=Black     guifg=Yellow
+  hi      tapTestLoadedFile  term=bold    ctermfg=black  ctermbg=cyan   guibg=Cyan      guifg=Black
+  hi      tapTestThreeStars  term=reverse ctermfg=blue                                  guifg=Blue
+  hi      tapTestPlan        term=bold    ctermfg=yellow                                guifg=Yellow
+
+  hi link tapTestFileWithDot tapTestLoadedFile
+  hi link tapTestNumber      Number
+  hi link tapTestDiag        Comment
+
+  hi tapTestRegion ctermbg=green
+
+  hi tapTestResultsOKRegion ctermbg=green ctermfg=black
+  hi tapTestResultsNotOKRegion ctermbg=red ctermfg=black
+
+  hi tapTestResultsSummaryHeading ctermbg=blue ctermfg=white
+  hi tapTestResultsSummaryNotOK ctermbg=red ctermfg=black
+
+  hi tapTestInstructionsRegion ctermbg=lightmagenta ctermfg=black
+endif
+
+let b:current_syntax="tapVerboseOutput"

syntax/tmux.vim

@@ -3,6 +3,20 @@
 " Maintainer: Tiago Cunha <tcunha@users.sourceforge.net>
 " Last Change: $Date: 2010-07-27 18:29:07 $
 " License: This file is placed in the public domain.
+"
+" To install this file:
+"
+" - Drop the file in the syntax directory into runtimepath (such as
+"  ~/.vim/syntax/tmux.vim).
+" - Make the filetype recognisable by adding the following to filetype.vim
+"   (~/.vim/filetype.vim):
+"
+"	augroup filetypedetect
+"		au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
+"	augroup END
+"
+" - Switch on syntax highlighting by adding "syntax enable" to .vimrc.
+"
 
 if version < 600
 	syntax clear
@@ -17,60 +31,237 @@ syn keyword tmuxAction	any current none
 syn keyword tmuxBoolean	off on
 
 syn keyword tmuxCmds
-	\ attach[-session] detach[-client] has[-session] kill-server
-	\ kill-session lsc list-clients lscm list-commands ls list-sessions
-	\ lockc lock-client locks lock-session new[-session] refresh[-client]
-	\ rename[-session] showmsgs show-messages source[-file] start[-server]
-	\ suspendc suspend-client switchc switch-client copy-mode
-	\ breakp break-pane capturep capture-pane choose-client choose-session
-	\ choose-tree choose-window displayp display-panes findw find-window
-	\ joinp join-pane killp kill-pane killw kill-window lastp last-pane
-	\ last[-window] linkw link-window lsp list-panes lsw list-windows movep
-	\ move-pane movew move-window neww new-window nextl next-layout
-	\ next[-window] pipep pipe-pane prevl previous-layout prev[ious-window]
-	\ renamew rename-window resizep resize-pane respawnp respawn-pane
-	\ respawnw respawn-window rotatew rotate-window selectl select-layout
-	\ selectp select-pane selectw select-window splitw split-window swapp
-	\ swap-pane swapw swap-window unlinkw unlink-window
-	\ bind[-key] lsk list-keys send[-keys] send-prefix unbind[-key]
-	\ set[-option] setw set-window-option show[-options] showw
-	\ show-window-options setenv set-environment showenv show-environment
-	\ command-prompt confirm[-before] display[-message]
-	\ choose-buffer clearhist clear-history deleteb delete-buffer lsb
-	\ list-buffers loadb load-buffer pasteb paste-buffer saveb save-buffer
-	\ setb set-buffer showb show-buffer
-	\ clock-mode if[-shell] lock[-server] run[-shell] [server-]info
+	\ attach[-session]
+	\ bind[-key]
+	\ break-pane
+	\ breakp
+	\ capture-pane
+	\ capturep
+	\ choose-buffer
+	\ choose-client
+	\ choose-list
+	\ choose-session
+	\ choose-tree
+	\ choose-window
+	\ clear-history
+	\ clearhist
+	\ clock-mode
+	\ command-prompt
+	\ confirm[-before]
+	\ copy-mode
+	\ delete-buffer
+	\ deleteb
+	\ detach[-client]
+	\ display[-message]
+	\ display-panes
+	\ displayp
+	\ find-window
+	\ findw
+	\ has[-session]
+	\ if[-shell]
+	\ join-pane
+	\ joinp
+	\ kill-pane
+	\ killp
+	\ kill-server
+	\ kill-session
+	\ kill-window
+	\ killw
+	\ last-pane
+	\ lastp
+	\ last[-window]
+	\ link-window
+	\ linkw
+	\ list-buffers
+	\ lsb
+	\ list-clients
+	\ lsc
+	\ list-commands
+	\ lscm
+	\ list-keys
+	\ lsk
+	\ list-panes
+	\ lsp
+	\ list-sessions
+	\ ls
+	\ list-windows
+	\ lsw
+	\ load-buffer
+	\ loadb
+	\ lock-client
+	\ lockc
+	\ lock[-server]
+	\ lock-session
+	\ locks
+	\ move-pane
+	\ movep
+	\ move-window
+	\ movew
+	\ new[-session]
+	\ next-layout
+	\ nextl
+	\ next[-window]
+	\ paste-buffer
+	\ pasteb
+	\ pipe-pane
+	\ pipep
+	\ previous-layout
+	\ prevl
+	\ prev[ious-window]
+	\ refresh[-client]
+	\ rename[-session]
+	\ rename-window
+	\ renamew
+	\ resize-pane
+	\ resizep
+	\ respawn-pane
+	\ respawnp
+	\ respawn-window
+	\ respawnw
+	\ rotate-window
+	\ rotatew
+	\ run[-shell]
+	\ save-buffer
+	\ saveb
+	\ select-layout
+	\ selectl
+	\ select-pane
+	\ selectp
+	\ select-window
+	\ selectw
+	\ send[-keys]
+	\ send-prefix
+	\ server-info
+	\ info
+	\ set-buffer
+	\ setb
+	\ set-environment
+	\ setenv
+	\ set[-option]
+	\ set-window-option
+	\ setw
+	\ show-buffer
+	\ showb
+	\ show-environment
+	\ showenv
+	\ show-messages
+	\ showmsgs
+	\ show[-options]
+	\ show-window-options
+	\ showw
+	\ source[-file]
+	\ split-window
+	\ splitw
+	\ start[-server]
+	\ suspend-client
+	\ suspendc
+	\ swap-pane
+	\ swapp
+	\ swap-window
+	\ swapw
+	\ switch-client
+	\ switchc
+	\ unbind[-key]
+	\ unlink-window
+	\ unlinkw
+	\ wait[-for]
 
 syn keyword tmuxOptsSet
-	\ buffer-limit escape-time exit-unattached exit-unattached quiet
+	\ assume-paste-time
+	\ base-index
+	\ bell-action
+	\ bell-on-alert
+	\ buffer-limit
+	\ default-command
+	\ default-shell
+	\ default-terminal
+	\ destroy-unattached
+	\ detach-on-destroy
+	\ display-panes-active-colour
+	\ display-panes-colour
+	\ display-panes-time
+	\ display-time
+	\ escape-time
+	\ exit-unattached
+	\ focus-events
+	\ history-limit
+	\ lock-after-time
+	\ lock-command
+	\ lock-server
+	\ message-command-style
+	\ message-limit
+	\ message-style
+	\ mouse-resize-pane
+	\ mouse-select-pane
+	\ mouse-select-window
+	\ mouse-utf8
+	\ pane-active-border-style
+	\ pane-border-style
+	\ prefix
+	\ prefix2
+	\ quiet
+	\ renumber-windows
+	\ repeat-time
 	\ set-clipboard
-	\ base-index bell-action bell-on-alert default-command default-path
-	\ default-shell default-terminal destroy-unattached detach-on-destroy
-	\ display-panes-[active-]colour display-[panes-]time history-limit
-	\ lock-after-time lock-command lock-server message-[command-]attr
-	\ message-[command-]bg message-[command-]fg message-limit
-	\ mouse-resize-pane mouse-select-pane mouse-select-window mouse-utf8
-	\ pane-[active-]border-style prefix prefix2
-	\ renumber-windows repeat-time set-remain-on-exit set-titles
-	\ set-titles-string status status-style
-	\ status-interval status-justify status-keys status-left
-	\ status-left-style status-left-length status-position status-right
-	\ status-right-style status-right-length status-utf8 terminal-overrides
-	\ update-environment visual-activity visual-bell visual-content
-	\ visual-silence word-separators
+	\ set-remain-on-exit
+	\ set-titles
+	\ set-titles-string
+	\ status
+	\ status-interval
+	\ status-justify
+	\ status-keys
+	\ status-left
+	\ status-left-length
+	\ status-left-style
+	\ status-position
+	\ status-right
+	\ status-right-length
+	\ status-utf8
+	\ staus-right-style
+	\ terminal-overrides
+	\ update-environment
+	\ visual-activity
+	\ visual-bell
+	\ visual-content
+	\ visual-silence
+	\ word-separators
 
 syn keyword tmuxOptsSetw
-	\ aggressive-resize alternate-screen automatic-rename
-	\ c0-change-interval c0-change-trigger clock-mode-colour
-	\ clock-mode-style force-height force-width layout-history-limit
-	\ main-pane-height main-pane-width mode-style move-keys
-	\ mode-mouse monitor-activity monitor-content monitor-silence
-	\ other-pane-height other-pane-width pane-base-index remain-on-exit
-	\ synchronize-panes utf8 window-status-bell-style
-	\ window-status-content-style window-status-activity-style
-	\ window-status-[current-]attr window-status-[current-]bg
-	\ window-status-[current-]fg window-status-[current-]format
-	\ window-status-separator xterm-keys wrap-search
+	\ aggressive-resize
+	\ allow-rename
+	\ alternate-screen
+	\ automatic-rename
+	\ c0-change-interval
+	\ c0-change-trigger
+	\ clock-mode-colour
+	\ clock-mode-style
+	\ force-height
+	\ force-width
+	\ main-pane-height
+	\ main-pane-width
+	\ mode-keys
+	\ mode-mouse
+	\ mode-style
+	\ monitor-activity
+	\ monitor-content
+	\ monitor-silence
+	\ other-pane-height
+	\ other-pane-width
+	\ pane-base-index
+	\ remain-on-exit
+	\ synchronize-panes
+	\ utf8
+	\ window-status-activity-style
+	\ window-status-bell-style
+	\ window-status-content-style
+	\ window-status-current-format
+	\ window-status-current-style
+	\ window-status-format
+	\ window-status-last-style
+	\ window-status-separator
+	\ window-status-style
+	\ wrap-search
+	\ xterm-keys
 
 syn keyword tmuxTodo FIXME NOTE TODO XXX contained
 

syntax/tomdoc.vim

@@ -0,0 +1,18 @@
+syn keyword tomdocKeywords
+      \ Returns Yields Raises Examples Signature
+      \ containedin=.*Comment
+      \ contained
+
+syn match tomdocDescriptions
+      \ +\s*\(Public\|Internal\|Deprecated\):+he=e-1
+      \ containedin=.*Comment
+      \ contained
+
+syn match tomdocArguments
+      \ +\s*[A-Za-z0-9_\-&\*:]*\(\s*- \)+he=e-3
+      \ containedin=.*Comment
+      \ contained
+
+hi default link tomdocDescriptions String
+hi default link tomdocKeywords String
+hi default link tomdocArguments HELP

syntax/toml.vim

@@ -34,7 +34,8 @@ hi def link tomlFloat Float
 syn match tomlBoolean /\<\%(true\|false\)\>/ display
 hi def link tomlBoolean Boolean
 
-syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}T\d\{2\}:\d\{2\}:\d\{2\}Z/ display
+" http://tools.ietf.org/html/rfc3339
+syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}T\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)/ display
 hi def link tomlDate Constant
 
 syn match tomlTable /^\s*\[[^#\[\]]\+\]\s*\(#.*\)\?$/ contains=tomlComment

syntax/tt2.vim

@@ -5,8 +5,8 @@
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
 " Last Change:   {{LAST_CHANGE}}
 "
-" Instration:
-"   put tt2.vim and tt2html.vim in to your syntax diretory.
+" Installation:
+"   put tt2.vim and tt2html.vim in to your syntax directory.
 "
 "   add below in your filetype.vim.
 "       au BufNewFile,BufRead *.tt2 setf tt2

syntax/typescript.vim

@@ -1,5 +1,5 @@
 " Vim syntax file
-" Language: TypeScript
+" Language: typescript
 " Author: MicroSoft Open Technologies Inc.
 " Version: 0.1
 " Credits: Zhao Yi, Claudio Fleiner, Scott Shattuck, Jose Elera Campana
@@ -14,8 +14,8 @@ if !exists("main_syntax")
 endif
 
 " Drop fold if it set but vim doesn't support it.
-if version < 600 && exists("typeScript_fold")
-  unlet typeScript_fold
+if version < 600 && exists("typescript_fold")
+  unlet typescript_fold
 endif
 
 "" dollar sign is permitted anywhere in an identifier
@@ -27,293 +27,299 @@ syntax sync fromstart
 syn match shebang "^#!.*/bin/env\s\+node\>"
 hi link shebang Comment
 
-"" typeScript comments"{{{
-syn keyword typeScriptCommentTodo TODO FIXME XXX TBD contained
-syn match typeScriptLineComment "\/\/.*" contains=@Spell,typeScriptCommentTodo,typeScriptRef
-syn match typeScriptRef /\/\/\/<reference\s\+.*\/>$/ contains=typeScriptRefD,typeScriptRefS
-syn region typeScriptRefD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+
-syn region typeScriptRefS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+
+"" typescript comments"{{{
+syn keyword typescriptCommentTodo TODO FIXME XXX TBD contained
+syn match typescriptLineComment "\/\/.*" contains=@Spell,typescriptCommentTodo,typescriptRef
+syn match typescriptRef /\/\/\/<reference\s\+.*\/>$/ contains=typescriptRefD,typescriptRefS
+syn region typescriptRefD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+
+syn region typescriptRefS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+
 
-syn match typeScriptCommentSkip "^[ \t]*\*\($\|[ \t]\+\)"
-syn region typeScriptComment start="/\*" end="\*/" contains=@Spell,typeScriptCommentTodo
+syn match typescriptCommentSkip "^[ \t]*\*\($\|[ \t]\+\)"
+syn region typescriptComment start="/\*" end="\*/" contains=@Spell,typescriptCommentTodo extend
 "}}}
 "" JSDoc support start"{{{
-if !exists("typeScript_ignore_typeScriptdoc")
+if !exists("typescript_ignore_typescriptdoc")
   syntax case ignore
 
 " syntax coloring for JSDoc comments (HTML)
 "unlet b:current_syntax
 
-  syntax region typeScriptDocComment matchgroup=typeScriptComment start="/\*\*\s*$" end="\*/" contains=typeScriptDocTags,typeScriptCommentTodo,typeScriptCvsTag,@typeScriptHtml,@Spell fold
-  syntax match typeScriptDocTags contained "@\(param\|argument\|requires\|exception\|throws\|type\|class\|extends\|see\|link\|member\|module\|method\|title\|namespace\|optional\|default\|base\|file\)\>" nextgroup=typeScriptDocParam,typeScriptDocSeeTag skipwhite
-  syntax match typeScriptDocTags contained "@\(beta\|deprecated\|description\|fileoverview\|author\|license\|version\|returns\=\|constructor\|private\|protected\|final\|ignore\|addon\|exec\)\>"
-  syntax match typeScriptDocParam contained "\%(#\|\w\|\.\|:\|\/\)\+"
-  syntax region typeScriptDocSeeTag contained matchgroup=typeScriptDocSeeTag start="{" end="}" contains=typeScriptDocTags
+  syntax region typescriptDocComment start="/\*\*\s*$" end="\*/" contains=typescriptDocTags,typescriptCommentTodo,typescriptCvsTag,@typescriptHtml,@Spell fold extend
+  syntax match typescriptDocTags contained "@\(param\|argument\|requires\|exception\|throws\|type\|class\|extends\|see\|link\|member\|module\|method\|title\|namespace\|optional\|default\|base\|file\)\>" nextgroup=typescriptDocParam,typescriptDocSeeTag skipwhite
+  syntax match typescriptDocTags contained "@\(beta\|deprecated\|description\|fileoverview\|author\|license\|version\|returns\=\|constructor\|private\|protected\|final\|ignore\|addon\|exec\)\>"
+  syntax match typescriptDocParam contained "\%(#\|\w\|\.\|:\|\/\)\+"
+  syntax region typescriptDocSeeTag contained matchgroup=typescriptDocSeeTag start="{" end="}" contains=typescriptDocTags
 
   syntax case match
 endif "" JSDoc end
 "}}}
 syntax case match
 
-"" Syntax in the typeScript code"{{{
-syn match typeScriptSpecial "\\\d\d\d\|\\."
-syn region typeScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+	contains=typeScriptSpecial,@htmlPreproc
-syn region typeScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+	contains=typeScriptSpecial,@htmlPreproc
+"" Syntax in the typescript code"{{{
+syn match typescriptSpecial "\\\d\d\d\|\\."
+syn region typescriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+  contains=typescriptSpecial,@htmlPreproc extend
+syn region typescriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+  contains=typescriptSpecial,@htmlPreproc extend
+syn region typescriptStringB start=+`+ skip=+\\\\\|\\`+ end=+`+  contains=typescriptSpecial,@htmlPreproc extend
 
-syn match typeScriptSpecialCharacter "'\\.'"
-syn match typeScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
-syn region typeScriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
-" syntax match typeScriptSpecial "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\."
-" syntax region typeScriptStringD start=+"+ skip=+\\\\\|\\$"+ end=+"+ contains=typeScriptSpecial,@htmlPreproc
-" syntax region typeScriptStringS start=+'+ skip=+\\\\\|\\$'+ end=+'+ contains=typeScriptSpecial,@htmlPreproc
-" syntax region typeScriptRegexpString start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{,3}+ contains=typeScriptSpecial,@htmlPreproc oneline
-" syntax match typeScriptNumber /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
-syntax match typeScriptFloat /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-" syntax match typeScriptLabel /\(?\s*\)\@<!\<\w\+\(\s*:\)\@=/
+syn match typescriptSpecialCharacter "'\\.'"
+syn match typescriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
+syn region typescriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
+" syntax match typescriptSpecial "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\."
+" syntax region typescriptStringD start=+"+ skip=+\\\\\|\\$"+ end=+"+ contains=typescriptSpecial,@htmlPreproc
+" syntax region typescriptStringS start=+'+ skip=+\\\\\|\\$'+ end=+'+ contains=typescriptSpecial,@htmlPreproc
+" syntax region typescriptRegexpString start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{,3}+ contains=typescriptSpecial,@htmlPreproc oneline
+" syntax match typescriptNumber /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
+syntax match typescriptFloat /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+" syntax match typescriptLabel /\(?\s*\)\@<!\<\w\+\(\s*:\)\@=/
+
+syn match typescriptDecorators /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
 "}}}
-"" typeScript Prototype"{{{
-syntax keyword typeScriptPrototype prototype
+"" typescript Prototype"{{{
+syntax keyword typescriptPrototype contained prototype
 "}}}
 " DOM, Browser and Ajax Support {{{
 """"""""""""""""""""""""
-syntax keyword typeScriptBrowserObjects window navigator screen history location
+syntax keyword typescriptBrowserObjects window navigator screen history location
 
-syntax keyword typeScriptDOMObjects document event HTMLElement Anchor Area Base Body Button Form Frame Frameset Image Link Meta Option Select Style Table TableCell TableRow Textarea
-syntax keyword typeScriptDOMMethods createTextNode createElement insertBefore replaceChild removeChild appendChild hasChildNodes cloneNode normalize isSupported hasAttributes getAttribute setAttribute removeAttribute getAttributeNode setAttributeNode removeAttributeNode getElementsByTagName hasAttribute getElementById adoptNode close compareDocumentPosition createAttribute createCDATASection createComment createDocumentFragment createElementNS createEvent createExpression createNSResolver createProcessingInstruction createRange createTreeWalker elementFromPoint evaluate getBoxObjectFor getElementsByClassName getSelection getUserData hasFocus importNode
-syntax keyword typeScriptDOMProperties nodeName nodeValue nodeType parentNode childNodes firstChild lastChild previousSibling nextSibling attributes ownerDocument namespaceURI prefix localName tagName
+syntax keyword typescriptDOMObjects document event HTMLElement Anchor Area Base Body Button Form Frame Frameset Image Link Meta Option Select Style Table TableCell TableRow Textarea
+syntax keyword typescriptDOMMethods contained createTextNode createElement insertBefore replaceChild removeChild appendChild hasChildNodes cloneNode normalize isSupported hasAttributes getAttribute setAttribute removeAttribute getAttributeNode setAttributeNode removeAttributeNode getElementsByTagName hasAttribute getElementById adoptNode close compareDocumentPosition createAttribute createCDATASection createComment createDocumentFragment createElementNS createEvent createExpression createNSResolver createProcessingInstruction createRange createTreeWalker elementFromPoint evaluate getBoxObjectFor getElementsByClassName getSelection getUserData hasFocus importNode
+syntax keyword typescriptDOMProperties contained nodeName nodeValue nodeType parentNode childNodes firstChild lastChild previousSibling nextSibling attributes ownerDocument namespaceURI prefix localName tagName
 
-syntax keyword typeScriptAjaxObjects XMLHttpRequest
-syntax keyword typeScriptAjaxProperties readyState responseText responseXML statusText
-syntax keyword typeScriptAjaxMethods onreadystatechange abort getAllResponseHeaders getResponseHeader open send setRequestHeader
+syntax keyword typescriptAjaxObjects XMLHttpRequest
+syntax keyword typescriptAjaxProperties contained readyState responseText responseXML statusText
+syntax keyword typescriptAjaxMethods contained onreadystatechange abort getAllResponseHeaders getResponseHeader open send setRequestHeader
 
-syntax keyword typeScriptPropietaryObjects ActiveXObject
-syntax keyword typeScriptPropietaryMethods attachEvent detachEvent cancelBubble returnValue
+syntax keyword typescriptPropietaryObjects ActiveXObject
+syntax keyword typescriptPropietaryMethods contained attachEvent detachEvent cancelBubble returnValue
 
-syntax keyword typeScriptHtmlElemProperties className clientHeight clientLeft clientTop clientWidth dir href id innerHTML lang length offsetHeight offsetLeft offsetParent offsetTop offsetWidth scrollHeight scrollLeft scrollTop scrollWidth style tabIndex target title
+syntax keyword typescriptHtmlElemProperties contained className clientHeight clientLeft clientTop clientWidth dir href id innerHTML lang length offsetHeight offsetLeft offsetParent offsetTop offsetWidth scrollHeight scrollLeft scrollTop scrollWidth style tabIndex target title
 
-syntax keyword typeScriptEventListenerKeywords blur click focus mouseover mouseout load item
+syntax keyword typescriptEventListenerKeywords contained blur click focus mouseover mouseout load item
 
-syntax keyword typeScriptEventListenerMethods scrollIntoView addEventListener dispatchEvent removeEventListener preventDefault stopPropagation
+syntax keyword typescriptEventListenerMethods contained scrollIntoView addEventListener dispatchEvent removeEventListener preventDefault stopPropagation
 " }}}
 "" Programm Keywords"{{{
-syntax keyword typeScriptSource import export
-syntax keyword typeScriptIdentifier arguments this let var void yield
-syntax keyword typeScriptOperator delete new instanceof typeof
-syntax keyword typeScriptBoolean true false
-syntax keyword typeScriptNull null undefined
-syntax keyword typeScriptMessage alert confirm prompt status
-syntax keyword typeScriptGlobal self top parent
-syntax keyword typeScriptDeprecated escape unescape all applets alinkColor bgColor fgColor linkColor vlinkColor xmlEncoding
+syntax keyword typescriptSource import export
+syntax keyword typescriptIdentifier arguments this let var void yield
+syntax keyword typescriptOperator delete new instanceof typeof
+syntax keyword typescriptBoolean true false
+syntax keyword typescriptNull null undefined
+syntax keyword typescriptMessage alert confirm prompt status
+syntax keyword typescriptGlobal self top parent
+syntax keyword typescriptDeprecated escape unescape all applets alinkColor bgColor fgColor linkColor vlinkColor xmlEncoding
 "}}}
 "" Statement Keywords"{{{
-syntax keyword typeScriptConditional if else switch
-syntax keyword typeScriptRepeat do while for in
-syntax keyword typeScriptBranch break continue
-syntax keyword typeScriptLabel case default
-syntax keyword typeScriptStatement return with
+syntax keyword typescriptConditional if else switch
+syntax keyword typescriptRepeat do while for in
+syntax keyword typescriptBranch break continue
+syntax keyword typescriptLabel case default
+syntax keyword typescriptStatement return with
 
-syntax keyword typeScriptGlobalObjects Array Boolean Date Function Infinity Math Number NaN Object Packages RegExp String netscape
+syntax keyword typescriptGlobalObjects Array Boolean Date Function Infinity Math Number NaN Object Packages RegExp String netscape
 
-syntax keyword typeScriptExceptions try catch throw finally Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
+syntax keyword typescriptExceptions try catch throw finally Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
 
-syntax keyword typeScriptReserved constructor declare as interface module abstract enum int short export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public type
+syntax keyword typescriptReserved constructor declare as interface module abstract enum int short export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public type
 "}}}
-"" TypeScript/DOM/HTML/CSS specified things"{{{
+"" typescript/DOM/HTML/CSS specified things"{{{
 
-" TypeScript Objects"{{{
-  syn match typeScriptFunction "(super\s*|constructor\s*)" contained nextgroup=typeScriptVars
-  syn region typeScriptVars start="(" end=")" contained contains=typeScriptParameters transparent keepend
-  syn match typeScriptParameters "([a-zA-Z0-9_?.$][\w?.$]*)\s*:\s*([a-zA-Z0-9_?.$][\w?.$]*)" contained skipwhite
+" typescript Objects"{{{
+  syn match typescriptFunction "(super\s*|constructor\s*)" contained nextgroup=typescriptVars
+  syn region typescriptVars start="(" end=")" contained contains=typescriptParameters transparent keepend
+  syn match typescriptParameters "([a-zA-Z0-9_?.$][\w?.$]*)\s*:\s*([a-zA-Z0-9_?.$][\w?.$]*)" contained skipwhite
 "}}}
 " DOM2 Objects"{{{
-  syntax keyword typeScriptType DOMImplementation DocumentFragment Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction void any string boolean number
-  syntax keyword typeScriptExceptions DOMException
+  syntax keyword typescriptType DOMImplementation DocumentFragment Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction void any string boolean number
+  syntax keyword typescriptExceptions DOMException
 "}}}
 " DOM2 CONSTANT"{{{
-  syntax keyword typeScriptDomErrNo INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
-  syntax keyword typeScriptDomNodeConsts ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
+  syntax keyword typescriptDomErrNo INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
+  syntax keyword typescriptDomNodeConsts ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 "}}}
 " HTML events and internal variables"{{{
   syntax case ignore
-  syntax keyword typeScriptHtmlEvents onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize onload onsubmit
+  syntax keyword typescriptHtmlEvents onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize onload onsubmit
   syntax case match
 "}}}
 
 " Follow stuff should be highligh within a special context
 " While it can't be handled with context depended with Regex based highlight
 " So, turn it off by default
-if exists("typeScript_enable_domhtmlcss")
+if exists("typescript_enable_domhtmlcss")
 
 " DOM2 things"{{{
-    syntax match typeScriptDomElemAttrs contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
-    syntax match typeScriptDomElemFuncs contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=typeScriptParen skipwhite
+    syntax match typescriptDomElemAttrs contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
+    syntax match typescriptDomElemFuncs contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=typescriptParen skipwhite
 "}}}
 " HTML things"{{{
-    syntax match typeScriptHtmlElemAttrs contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
-    syntax match typeScriptHtmlElemFuncs contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=typeScriptParen skipwhite
+    syntax match typescriptHtmlElemAttrs contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
+    syntax match typescriptHtmlElemFuncs contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=typescriptParen skipwhite
 "}}}
-" CSS Styles in typeScript"{{{
-    syntax keyword typeScriptCssStyles contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition
-    syntax keyword typeScriptCssStyles contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition
-    syntax keyword typeScriptCssStyles contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode
-    syntax keyword typeScriptCssStyles contained bottom height left position right top width zIndex
-    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 listStyle listStyleImage listStylePosition listStyleType
-    syntax keyword typeScriptCssStyles contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition 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 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
-"}}}
-" Highlight ways"{{{
-    syntax match typeScriptDotNotation "\." nextgroup=typeScriptPrototype,typeScriptDomElemAttrs,typeScriptDomElemFuncs,typeScriptHtmlElemAttrs,typeScriptHtmlElemFuncs
-    syntax match typeScriptDotNotation "\.style\." nextgroup=typeScriptCssStyles
+" CSS Styles in typescript"{{{
+    syntax keyword typescriptCssStyles contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition
+    syntax keyword typescriptCssStyles contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition
+    syntax keyword typescriptCssStyles contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode
+    syntax keyword typescriptCssStyles contained bottom height left position right top width zIndex
+    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 listStyle listStyleImage listStylePosition listStyleType
+    syntax keyword typescriptCssStyles contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition 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 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
 "}}}
 endif "DOM/HTML/CSS
 
+" Highlight ways"{{{
+syntax match typescriptDotNotation "\."        nextgroup=typescriptPrototype,typescriptDomElemAttrs,typescriptDomElemFuncs,typescriptDOMMethods,typescriptDOMProperties,typescriptHtmlElemAttrs,typescriptHtmlElemFuncs,typescriptHtmlElemProperties,typescriptAjaxProperties,typescriptAjaxMethods,typescriptPropietaryMethods,typescriptEventListenerMethods skipwhite skipnl
+syntax match typescriptDotNotation "\.style\." nextgroup=typescriptCssStyles
+"}}}
+
 "" end DOM/HTML/CSS specified things""}}}
 
 
 "" Code blocks
-syntax cluster typeScriptAll contains=typeScriptComment,typeScriptLineComment,typeScriptDocComment,typeScriptStringD,typeScriptStringS,typeScriptRegexpString,typeScriptNumber,typeScriptFloat,typeScriptLabel,typeScriptSource,typeScriptType,typeScriptOperator,typeScriptBoolean,typeScriptNull,typeScriptFuncKeyword,typeScriptConditional,typeScriptGlobal,typeScriptRepeat,typeScriptBranch,typeScriptStatement,typeScriptGlobalObjects,typeScriptMessage,typeScriptIdentifier,typeScriptExceptions,typeScriptReserved,typeScriptDeprecated,typeScriptDomErrNo,typeScriptDomNodeConsts,typeScriptHtmlEvents,typeScriptDotNotation,typeScriptBrowserObjects,typeScriptDOMObjects,typeScriptAjaxObjects,typeScriptPropietaryObjects,typeScriptDOMMethods,typeScriptHtmlElemProperties,typeScriptDOMProperties,typeScriptEventListenerKeywords,typeScriptEventListenerMethods,typeScriptAjaxProperties,typeScriptAjaxMethods,typeScriptFuncArg
+syntax cluster typescriptAll contains=typescriptComment,typescriptLineComment,typescriptDocComment,typescriptStringD,typescriptStringS,typescriptStringB,typescriptRegexpString,typescriptNumber,typescriptFloat,typescriptDecorators,typescriptLabel,typescriptSource,typescriptType,typescriptOperator,typescriptBoolean,typescriptNull,typescriptFuncKeyword,typescriptConditional,typescriptGlobal,typescriptRepeat,typescriptBranch,typescriptStatement,typescriptGlobalObjects,typescriptMessage,typescriptIdentifier,typescriptExceptions,typescriptReserved,typescriptDeprecated,typescriptDomErrNo,typescriptDomNodeConsts,typescriptHtmlEvents,typescriptDotNotation,typescriptBrowserObjects,typescriptDOMObjects,typescriptAjaxObjects,typescriptPropietaryObjects,typescriptDOMMethods,typescriptHtmlElemProperties,typescriptDOMProperties,typescriptEventListenerKeywords,typescriptEventListenerMethods,typescriptAjaxProperties,typescriptAjaxMethods,typescriptFuncArg
 
-if main_syntax == "typeScript"
+if main_syntax == "typescript"
   syntax sync clear
-  syntax sync ccomment typeScriptComment minlines=200
-" syntax sync match typeScriptHighlight grouphere typeScriptBlock /{/
+  syntax sync ccomment typescriptComment minlines=200
+" syntax sync match typescriptHighlight grouphere typescriptBlock /{/
 endif
 
-syntax keyword typeScriptFuncKeyword function contained
-syntax region typeScriptFuncDef start="function" end="\([^)]*\)" contains=typeScriptFuncKeyword,typeScriptFuncArg keepend
-syntax match typeScriptFuncArg "\(([^()]*)\)" contains=typeScriptParens,typeScriptFuncComma contained
-syntax match typeScriptFuncComma /,/ contained
-" syntax region typeScriptFuncBlock contained matchgroup=typeScriptFuncBlock start="{" end="}" contains=@typeScriptAll,typeScriptParensErrA,typeScriptParensErrB,typeScriptParen,typeScriptBracket,typeScriptBlock fold
+syntax keyword typescriptFuncKeyword function
+"syntax region typescriptFuncDef start="function" end="\(.*\)" contains=typescriptFuncKeyword,typescriptFuncArg keepend
+"syntax match typescriptFuncArg "\(([^()]*)\)" contains=typescriptParens,typescriptFuncComma contained
+"syntax match typescriptFuncComma /,/ contained
+" syntax region typescriptFuncBlock contained matchgroup=typescriptFuncBlock start="{" end="}" contains=@typescriptAll,typescriptParensErrA,typescriptParensErrB,typescriptParen,typescriptBracket,typescriptBlock fold
 
-syn match	typeScriptBraces "[{}\[\]]"
-syn match	typeScriptParens "[()]"
-syn match	typeScriptOpSymbols "=\{1,3}\|!==\|!=\|<\|>\|>=\|<=\|++\|+=\|--\|-="
-syn match typeScriptEndColons "[;,]"
-syn match typeScriptLogicSymbols "\(&&\)\|\(||\)"
+syn match typescriptBraces "[{}\[\]]"
+syn match typescriptParens "[()]"
+syn match typescriptOpSymbols "=\{1,3}\|!==\|!=\|<\|>\|>=\|<=\|++\|+=\|--\|-="
+syn match typescriptEndColons "[;,]"
+syn match typescriptLogicSymbols "\(&&\)\|\(||\)"
 
-" typeScriptFold Function {{{
+" typescriptFold Function {{{
 
-function! TypeScriptFold()
-setl foldlevelstart=1
+" function! typescriptFold()
 syn region foldBraces start=/{/ end=/}/ transparent fold keepend extend
 
 setl foldtext=FoldText()
-endfunction
+" endfunction
 
-au FileType typeScript call TypeScriptFold()
+" au FileType typescript call typescriptFold()
 
 " }}}
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_typeScript_syn_inits")
+if version >= 508 || !exists("did_typescript_syn_inits")
   if version < 508
-    let did_typeScript_syn_inits = 1
+    let did_typescript_syn_inits = 1
     command -nargs=+ HiLink hi link <args>
   else
     command -nargs=+ HiLink hi def link <args>
   endif
 
-  "Typescript highlighting
-  HiLink typeScriptParameters Operator
+  "typescript highlighting
+  HiLink typescriptParameters Operator
   HiLink typescriptSuperBlock Operator
 
-  HiLink typeScriptEndColons Exception
-  HiLink typeScriptOpSymbols Operator
-  HiLink typeScriptLogicSymbols Boolean
-  HiLink typeScriptBraces Function
-  HiLink typeScriptParens Operator
-  HiLink typeScriptComment Comment
-  HiLink typeScriptLineComment Comment
-  HiLink typeScriptRef Include
-  HiLink typeScriptRefS String
-  HiLink typeScriptRefD String
-  HiLink typeScriptDocComment Comment
-  HiLink typeScriptCommentTodo Todo
-  HiLink typeScriptCvsTag Function
-  HiLink typeScriptDocTags Special
-  HiLink typeScriptDocSeeTag Function
-  HiLink typeScriptDocParam Function
-  HiLink typeScriptStringS String
-  HiLink typeScriptStringD String
-  HiLink typeScriptRegexpString String
-  HiLink typeScriptGlobal Constant
-  HiLink typeScriptCharacter Character
-  HiLink typeScriptPrototype Type
-  HiLink typeScriptConditional Conditional
-  HiLink typeScriptBranch Conditional
-  HiLink typeScriptIdentifier Identifier
-  HiLink typeScriptRepeat Repeat
-  HiLink typeScriptStatement Statement
-  HiLink typeScriptFuncKeyword Type
-  HiLink typeScriptMessage Keyword
-  HiLink typeScriptDeprecated Exception
-  HiLink typeScriptError Error
-  HiLink typeScriptParensError Error
-  HiLink typeScriptParensErrA Error
-  HiLink typeScriptParensErrB Error
-  HiLink typeScriptParensErrC Error
-  HiLink typeScriptReserved Keyword
-  HiLink typeScriptOperator Operator
-  HiLink typeScriptType Type
-  HiLink typeScriptNull Type
-  HiLink typeScriptNumber Number
-  HiLink typeScriptFloat Number
-  HiLink typeScriptBoolean Boolean
-  HiLink typeScriptLabel Label
-  HiLink typeScriptSpecial Special
-  HiLink typeScriptSource Special
-  HiLink typeScriptGlobalObjects Special
-  HiLink typeScriptExceptions Special
+  HiLink typescriptEndColons Exception
+  HiLink typescriptOpSymbols Operator
+  HiLink typescriptLogicSymbols Boolean
+  HiLink typescriptBraces Function
+  HiLink typescriptParens Operator
+  HiLink typescriptComment Comment
+  HiLink typescriptLineComment Comment
+  HiLink typescriptRef Include
+  HiLink typescriptRefS String
+  HiLink typescriptRefD String
+  HiLink typescriptDocComment Comment
+  HiLink typescriptCommentTodo Todo
+  HiLink typescriptCvsTag Function
+  HiLink typescriptDocTags Special
+  HiLink typescriptDocSeeTag Function
+  HiLink typescriptDocParam Function
+  HiLink typescriptStringS String
+  HiLink typescriptStringD String
+  HiLink typescriptStringB String
+  HiLink typescriptRegexpString String
+  HiLink typescriptGlobal Constant
+  HiLink typescriptCharacter Character
+  HiLink typescriptPrototype Type
+  HiLink typescriptConditional Conditional
+  HiLink typescriptBranch Conditional
+  HiLink typescriptIdentifier Identifier
+  HiLink typescriptRepeat Repeat
+  HiLink typescriptStatement Statement
+  HiLink typescriptFuncKeyword Function
+  HiLink typescriptMessage Keyword
+  HiLink typescriptDeprecated Exception
+  HiLink typescriptError Error
+  HiLink typescriptParensError Error
+  HiLink typescriptParensErrA Error
+  HiLink typescriptParensErrB Error
+  HiLink typescriptParensErrC Error
+  HiLink typescriptReserved Keyword
+  HiLink typescriptOperator Operator
+  HiLink typescriptType Type
+  HiLink typescriptNull Type
+  HiLink typescriptNumber Number
+  HiLink typescriptFloat Number
+  HiLink typescriptDecorators Special
+  HiLink typescriptBoolean Boolean
+  HiLink typescriptLabel Label
+  HiLink typescriptSpecial Special
+  HiLink typescriptSource Special
+  HiLink typescriptGlobalObjects Special
+  HiLink typescriptExceptions Special
 
-  HiLink typeScriptDomErrNo Constant
-  HiLink typeScriptDomNodeConsts Constant
-  HiLink typeScriptDomElemAttrs Label
-  HiLink typeScriptDomElemFuncs PreProc
+  HiLink typescriptDomErrNo Constant
+  HiLink typescriptDomNodeConsts Constant
+  HiLink typescriptDomElemAttrs Label
+  HiLink typescriptDomElemFuncs PreProc
 
-  HiLink typeScriptHtmlElemAttrs Label
-  HiLink typeScriptHtmlElemFuncs PreProc
+  HiLink typescriptHtmlElemAttrs Label
+  HiLink typescriptHtmlElemFuncs PreProc
 
-  HiLink typeScriptCssStyles Label
-" Ajax Highlighting
-HiLink typeScriptBrowserObjects Constant
+  HiLink typescriptCssStyles Label
 
-HiLink typeScriptDOMObjects Constant
-HiLink typeScriptDOMMethods Exception
-HiLink typeScriptDOMProperties Type
+  " Ajax Highlighting
+  HiLink typescriptBrowserObjects Constant
 
-HiLink typeScriptAjaxObjects htmlH1
-HiLink typeScriptAjaxMethods Exception
-HiLink typeScriptAjaxProperties Type
+  HiLink typescriptDOMObjects Constant
+  HiLink typescriptDOMMethods Function
+  HiLink typescriptDOMProperties Special
 
-HiLink typeScriptFuncDef Title
-    HiLink typeScriptFuncArg Special
-    HiLink typeScriptFuncComma Operator
+  HiLink typescriptAjaxObjects Constant
+  HiLink typescriptAjaxMethods Function
+  HiLink typescriptAjaxProperties Special
 
-HiLink typeScriptHtmlEvents Special
-HiLink typeScriptHtmlElemProperties Type
+  HiLink typescriptFuncDef Title
+  HiLink typescriptFuncArg Special
+  HiLink typescriptFuncComma Operator
 
-HiLink typeScriptEventListenerKeywords Keyword
+  HiLink typescriptHtmlEvents Special
+  HiLink typescriptHtmlElemProperties Special
 
-HiLink typeScriptNumber Number
-HiLink typeScriptPropietaryObjects Constant
+  HiLink typescriptEventListenerKeywords Keyword
+
+  HiLink typescriptNumber Number
+  HiLink typescriptPropietaryObjects Constant
 
   delcommand HiLink
 endif
 
-" Define the htmltypeScript for HTML syntax html.vim
-"syntax clear htmltypeScript
-"syntax clear typeScriptExpression
-syntax cluster htmltypeScript contains=@typeScriptAll,typeScriptBracket,typeScriptParen,typeScriptBlock,typeScriptParenError
-syntax cluster typeScriptExpression contains=@typeScriptAll,typeScriptBracket,typeScriptParen,typeScriptBlock,typeScriptParenError,@htmlPreproc
+" Define the htmltypescript for HTML syntax html.vim
+"syntax clear htmltypescript
+"syntax clear typescriptExpression
+syntax cluster htmltypescript contains=@typescriptAll,typescriptBracket,typescriptParen,typescriptBlock,typescriptParenError
+syntax cluster typescriptExpression contains=@typescriptAll,typescriptBracket,typescriptParen,typescriptBlock,typescriptParenError,@htmlPreproc
 
-let b:current_syntax = "typeScript"
-if main_syntax == 'typeScript'
+let b:current_syntax = "typescript"
+if main_syntax == 'typescript'
   unlet main_syntax
 endif
 

syntax/velocity.vim

@@ -0,0 +1,67 @@
+" Vim syntax file
+" Language:	Velocity HTML template
+" Maintainer:	Hsiaoming Young <http://lepture.com>
+" Last Change:	2012 Jan 09
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'html'
+endif
+
+if version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+  unlet b:current_syntax
+endif
+
+syn keyword velocityTodo FIXME TODO contained
+syn region velocitySpec start="@" end=" " oneline contained
+syn region velocityComment start="#\*" end="\*#" contains=velocityTodo,velocitySpec
+syn match velocityComment /##.*/ contains=velocityTodo,velocitySpec
+syn region velocityString start='"' end='"' oneline display
+syn region velocityString start="'" end="'" oneline display
+syn match velocityNumber "[-+]\=\d\+\(\.\d*\)\=" display
+syn region velocityList start='\[' end='\]' oneline contained contains=velocityString,velocityNumber
+syn match velocityMath /=\|-\|+\|\/\|\*\|%/ contained
+syn match velocityBlock /#[a-z]\{2,\}/ contains=velocityStatement
+syn match velocityBlock /#[a-z]\{2,\}(.\+)/ contains=velocityStatement,velocityVar,velocityString,velocityNumber,velocityMath,velocityList
+syn keyword velocityStatement in set if else elseif end foreach include parse macro cmsparse stop break evaluate define contained
+
+syn match velocityVar /$!\?[a-zA-Z][a-zA-Z0-9_-]\+\(\.\?[a-zA-Z0-9]*\)\+/ contains=velocityFunction display containedin=ALL
+syn match velocityVar /$!\?{[a-zA-Z][a-zA-Z0-9_-]\+}/ display containedin=ALL
+syn match velocityFunction /[a-zA-Z][a-zA-Z0-9_-]\+\(\.[a-zA-Z][a-zA-Z0-9_-]\+\)\+([^)]*)/ contains=velocityString,velocityNumber,velocityList,velocityMath,velocityVar,velocityFunction display containedin=velocityBlock
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_velocity_syn_inits")
+  if version < 508
+    let did_velocity_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink velocityString String
+  HiLink velocityNumber Number
+  HiLink velocityList Constant
+  HiLink velocityBlock PreProc
+  HiLink velocitySpec Special
+  HiLink velocityVar Identifier
+  HiLink velocityFunction Function
+  HiLink velocityStatement Statement
+  HiLink velocityComment Comment
+  HiLink velocityTodo Todo
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "velocity"