diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-22 22:53:42 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-27 09:21:27 -0400 |
| commit | 766a10783982936da8f1eaf61280338fcd85019a (patch) | |
| tree | e897baaf11ef239333136aa6d10a46423e2bbfba /runtime/syntax/json.vim | |
| parent | d6cef4ef9d75556d9ae1c39c3fd0becb3939f621 (diff) | |
| download | rneovim-766a10783982936da8f1eaf61280338fcd85019a.tar.gz rneovim-766a10783982936da8f1eaf61280338fcd85019a.tar.bz2 rneovim-766a10783982936da8f1eaf61280338fcd85019a.zip | |
vim-patch:589edb340454
Updte runtime files
https://github.com/vim/vim/commit/589edb340454e7f1b19358f129287a636d53d0e1
Omit state() changes in eval.txt because patch v8.1.2047 is not merged.
Diffstat (limited to 'runtime/syntax/json.vim')
| -rw-r--r-- | runtime/syntax/json.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/syntax/json.vim b/runtime/syntax/json.vim index e3210a9702..3f49b0c5ea 100644 --- a/runtime/syntax/json.vim +++ b/runtime/syntax/json.vim @@ -2,7 +2,7 @@ " Language: JSON " Maintainer: vacancy " Previous Maintainer: Eli Parra <eli@elzr.com> -" Last Change: 2019 Jul 08 +" Last Change: 2019 Sep 17 " Version: 0.12 if !exists("main_syntax") @@ -20,7 +20,7 @@ syntax match jsonNoise /\%(:\|,\)/ " 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 -if has('conceal') +if has('conceal') && (!exists("g:vim_json_conceal") || g:vim_json_conceal==1) syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ concealends contained else syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contained @@ -31,7 +31,7 @@ endif " Needs to come after keywords or else a json encoded string will break the " syntax syn match jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString -if has('conceal') +if has('conceal') && (!exists("g:vim_json_conceal") || g:vim_json_conceal==1) syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ concealends contains=jsonEscape contained else syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=jsonEscape contained |