jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/vim-7.4-yamlsyntax.patch

59d897
diff -up vim74/runtime/syntax/yaml.vim.yamlsyntax vim74/runtime/syntax/yaml.vim
59d897
--- vim74/runtime/syntax/yaml.vim.yamlsyntax	2016-11-25 13:08:38.621772847 +0100
59d897
+++ vim74/runtime/syntax/yaml.vim	2016-11-25 15:04:38.170017620 +0100
59d897
@@ -103,14 +103,15 @@ execute 'syn match yamlPlainScalar conta
59d897
 syn match yamlMappingKeyStart '?\ze\s'
59d897
 syn match yamlMappingKeyStart '?' contained
59d897
 
59d897
-execute 'syn match yamlFlowMappingKey /'.s:ns_plain_in.'\ze\s*:/ contained '.
59d897
+execute 'syn match yamlFlowMappingKey /\%#=1'.s:ns_plain_in.'\%(\s\+'.s:ns_plain_in.'\)*\ze\s*:/ contained '.
59d897
             \'nextgroup=yamlKeyValueDelimiter'
59d897
 syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
59d897
 
59d897
 syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge
59d897
-execute 'syn match yamlBlockMappingKey /^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '.
59d897
+" Use the old regexp engine, the NFA engine doesn't like all the \@ items.
59d897
+execute 'syn match yamlBlockMappingKey /\%#=1^\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ '.
59d897
             \'nextgroup=yamlKeyValueDelimiter'
59d897
-execute 'syn match yamlBlockMappingKey /\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '.
59d897
+execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ contained '.
59d897
             \'nextgroup=yamlKeyValueDelimiter'
59d897
 syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
59d897
 syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained