diff vendor/vim-syntax/json.vim @ 562:6f57f959cc0b

Update vim syntaxes.
author nanaya <me@myconan.net>
date Thu, 04 Jun 2015 18:25:29 +0900
parents 351bd965bc1f
children 7fbadf8bd22e
line wrap: on
line diff
--- a/vendor/vim-syntax/json.vim	Thu Jun 04 17:48:28 2015 +0900
+++ b/vendor/vim-syntax/json.vim	Thu Jun 04 18:25:29 2015 +0900
@@ -36,9 +36,9 @@
 " Separated into a match and region because a region by itself is always greedy
 syn match  jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
 if has('conceal') && g:vim_json_syntax_conceal == 1
-   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ concealends contained
+   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ concealends contains=jsonEscape contained
 else
-   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contained
+   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contains=jsonEscape contained
 endif
 
 " Syntax: Escape sequences
@@ -101,10 +101,10 @@
   hi def link jsonString		String
   hi def link jsonTest			Label
   hi def link jsonEscape		Special
-  hi def link jsonNumber		Number
+  hi def link jsonNumber		Delimiter
   hi def link jsonBraces		Delimiter
   hi def link jsonNull			Function
-  hi def link jsonBoolean		Boolean
+  hi def link jsonBoolean		Delimiter
   hi def link jsonKeyword		Label
 
 	if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)