Mercurial > vim

comparison runtime/syntax/yaml.vim @ 18053:8ac85adee561

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update runtime files Commit: https://github.com/vim/vim/commit/8fe1000e9c3438d0ff36cf2340f0f0e48f8fb89f Author: Bram Moolenaar <Bram@vim.org> Date: Wed Sep 11 22:56:44 2019 +0200 Update runtime files
author Bram Moolenaar <Bram@vim.org>
date Wed, 11 Sep 2019 23:00:05 +0200
parents fbc1131f0ba5
children b9b335997b26
comparison
equal deleted inserted replaced
18052:5023a656f85e 18053:8ac85adee561
1 " Vim syntax file 1 " Vim syntax file
2 " Language: YAML (YAML Ain't Markup Language) 1.2 2 " Language: YAML (YAML Ain't Markup Language) 1.2
3 " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> 3 " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com>
4 " First author: Nikolai Weibull <now@bitwi.se> 4 " First author: Nikolai Weibull <now@bitwi.se>
5 " Latest Revision: 2015-03-28 5 " Latest Revision: 2015-03-28
6 " removed duplicate yamlKeyValueDelimiter (pull #4799)
6 7
7 if exists('b:current_syntax') 8 if exists('b:current_syntax')
8 finish 9 finish
9 endif 10 endif
10 11
147 execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ contained '. 148 execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ contained '.
148 \'nextgroup=yamlKeyValueDelimiter' 149 \'nextgroup=yamlKeyValueDelimiter'
149 syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter 150 syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
150 syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained 151 syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained
151 152
152 syn match yamlKeyValueDelimiter /\s*:/ contained
153 syn match yamlKeyValueDelimiter /\s*:/ contained 153 syn match yamlKeyValueDelimiter /\s*:/ contained
154 154
155 syn cluster yamlScalarWithSpecials contains=yamlPlainScalar,yamlBlockMappingKey,yamlFlowMappingKey 155 syn cluster yamlScalarWithSpecials contains=yamlPlainScalar,yamlBlockMappingKey,yamlFlowMappingKey
156 156
157 let s:_bounder = s:SimplifyToAssumeAllPrintable('\%([[\]{}, \t]\@!\p\)') 157 let s:_bounder = s:SimplifyToAssumeAllPrintable('\%([[\]{}, \t]\@!\p\)')