comparison runtime/syntax/xml.vim @ 18456:6d11fc4aa683

Update runtime files Commit: https://github.com/vim/vim/commit/96f45c0b6fc9e9d404e6805593ed1e0e6795e470 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 26 19:53:45 2019 +0200 Update runtime files
author Bram Moolenaar <Bram@vim.org>
date Sat, 26 Oct 2019 20:00:04 +0200
parents a5352e73dc00
children 8dde7ced3344
comparison
equal deleted inserted replaced
18455:3c98dfd2380c 18456:6d11fc4aa683
1 " Vim syntax file 1 " Vim syntax file
2 " Language: XML 2 " Language: XML
3 " Maintainer: Johannes Zellner <johannes@zellner.org> 3 " Maintainer: Christian Brabandt <cb@256bit.org>
4 " Author and previous maintainer: 4 " Repository: https://github.com/chrisbra/vim-xml-ftplugin
5 " Paul Siegmann <pauls@euronet.nl> 5 " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
6 " Last Change: 2013 Jun 07 6 " Author: Paul Siegmann <pauls@euronet.nl>
7 " Last Changed: Sept 24, 2019
7 " Filenames: *.xml 8 " Filenames: *.xml
8 " $Id: xml.vim,v 1.3 2006/04/11 21:32:00 vimboss Exp $ 9 " Last Change:
10 " 20190923 - Fix xmlEndTag to match xmlTag (vim/vim#884)
11 " 20190924 - Fix xmlAttribute property (amadeus/vim-xml@d8ce1c946)
9 12
10 " CONFIGURATION: 13 " CONFIGURATION:
11 " syntax folding can be turned on by 14 " syntax folding can be turned on by
12 " 15 "
13 " let g:xml_syntax_folding = 1 16 " let g:xml_syntax_folding = 1
79 " 82 "
80 " <tag foo.attribute = "value"> 83 " <tag foo.attribute = "value">
81 " ^^^^^^^^^^^^^ 84 " ^^^^^^^^^^^^^
82 " 85 "
83 syn match xmlAttrib 86 syn match xmlAttrib
84 \ +[-'"<]\@1<!\<[a-zA-Z:_][-.0-9a-zA-Z:_]*\>\%(['">]\@!\|$\)+ 87 \ +[-'"<]\@1<!\<[a-zA-Z:_][-.0-9a-zA-Z:_]*\>\%(['"]\@!\|$\)+
85 \ contained 88 \ contained
86 \ contains=xmlAttribPunct,@xmlAttribHook 89 \ contains=xmlAttribPunct,@xmlAttribHook
87 \ display 90 \ display
88 91
89 92
120 " 123 "
121 " <tag foo.attribute = "value"> 124 " <tag foo.attribute = "value">
122 " ^^^ 125 " ^^^
123 " 126 "
124 syn match xmlTagName 127 syn match xmlTagName
125 \ +<\@1<=[^ /!?<>"']\++ 128 \ +\%(<\|</\)\@2<=[^ /!?<>"']\++
126 \ contained 129 \ contained
127 \ contains=xmlNamespace,xmlAttribPunct,@xmlTagHook 130 \ contains=xmlNamespace,xmlAttribPunct,@xmlTagHook
128 \ display 131 \ display
129 132
130 133
155 " EXAMPLE: 158 " EXAMPLE:
156 " 159 "
157 " </tag> 160 " </tag>
158 " ^^^^^^ 161 " ^^^^^^
159 " 162 "
160 syn match xmlEndTag 163 syn region xmlEndTag
161 \ +</[^ /!?<>"']\+>+ 164 \ matchgroup=xmlTag start=+</[^ /!?<>"']\@=+
165 \ matchgroup=xmlTag end=+>+
162 \ contained 166 \ contained
163 \ contains=xmlNamespace,xmlAttribPunct,@xmlTagHook 167 \ contains=xmlTagName,xmlNamespace,xmlAttribPunct,@xmlTagHook
164
165 168
166 " tag elements with syntax-folding. 169 " tag elements with syntax-folding.
167 " NOTE: NO HIGHLIGHTING -- highlighting is done by contained elements 170 " NOTE: NO HIGHLIGHTING -- highlighting is done by contained elements
168 " 171 "
169 " PROVIDES: @xmlRegionHook 172 " PROVIDES: @xmlRegionHook
179 " 182 "
180 syn region xmlRegion 183 syn region xmlRegion
181 \ start=+<\z([^ /!?<>"']\+\)+ 184 \ start=+<\z([^ /!?<>"']\+\)+
182 \ skip=+<!--\_.\{-}-->+ 185 \ skip=+<!--\_.\{-}-->+
183 \ end=+</\z1\_\s\{-}>+ 186 \ end=+</\z1\_\s\{-}>+
184 \ matchgroup=xmlEndTag end=+/>+ 187 \ end=+/>+
185 \ fold 188 \ fold
186 \ contains=xmlTag,xmlEndTag,xmlCdata,xmlRegion,xmlComment,xmlEntity,xmlProcessing,@xmlRegionHook,@Spell 189 \ contains=xmlTag,xmlEndTag,xmlCdata,xmlRegion,xmlComment,xmlEntity,xmlProcessing,@xmlRegionHook,@Spell
187 \ keepend 190 \ keepend
188 \ extend 191 \ extend
189 192
196 syn region xmlTag 199 syn region xmlTag
197 \ matchgroup=xmlTag start=+<[^ /!?<>"']\@=+ 200 \ matchgroup=xmlTag start=+<[^ /!?<>"']\@=+
198 \ matchgroup=xmlTag end=+>+ 201 \ matchgroup=xmlTag end=+>+
199 \ contains=xmlError,xmlTagName,xmlAttrib,xmlEqual,xmlString,@xmlStartTagHook 202 \ contains=xmlError,xmlTagName,xmlAttrib,xmlEqual,xmlString,@xmlStartTagHook
200 203
201 syn match xmlEndTag 204 syn region xmlEndTag
202 \ +</[^ /!?<>"']\+>+ 205 \ matchgroup=xmlTag start=+</[^ /!?<>"']\@=+
203 \ contains=xmlNamespace,xmlAttribPunct,@xmlTagHook 206 \ matchgroup=xmlTag end=+>+
207 \ contains=xmlTagName,xmlNamespace,xmlAttribPunct,@xmlTagHook
204 208
205 endif 209 endif
206 210
207 211
208 " &entities; compare with dtd 212 " &entities; compare with dtd