Mercurial > vim

comparison runtime/syntax/html.vim @ 10051:46763b01cd9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 31 22:22:10 2016 +0200 Updated runtime files. Remove HiLink commands.
author Christian Brabandt <cb@256bit.org>
date Wed, 31 Aug 2016 22:30:08 +0200
parents 43efa4f5a8ea
children 883396809b45
comparison
equal deleted inserted replaced
10050:b702edc4b2b8 10051:46763b01cd9a
15 let main_syntax = 'html' 15 let main_syntax = 'html'
16 endif 16 endif
17 17
18 let s:cpo_save = &cpo 18 let s:cpo_save = &cpo
19 set cpo&vim 19 set cpo&vim
20
21 " don't use standard HiLink, it will not work with included syntax files
22 command! -nargs=+ HtmlHiLink hi def link <args>
23 20
24 syntax spell toplevel 21 syntax spell toplevel
25 22
26 syn case ignore 23 syn case ignore
27 24
162 " JAVA SCRIPT 159 " JAVA SCRIPT
163 syn include @htmlJavaScript syntax/javascript.vim 160 syn include @htmlJavaScript syntax/javascript.vim
164 unlet b:current_syntax 161 unlet b:current_syntax
165 syn region javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc 162 syn region javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
166 syn region htmlScriptTag contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent 163 syn region htmlScriptTag contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
167 HtmlHiLink htmlScriptTag htmlTag 164 hi def link htmlScriptTag htmlTag
168 165
169 " html events (i.e. arguments that include javascript commands) 166 " html events (i.e. arguments that include javascript commands)
170 if exists("html_extended_events") 167 if exists("html_extended_events")
171 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ contains=htmlEventSQ 168 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ contains=htmlEventSQ
172 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ contains=htmlEventDQ 169 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ contains=htmlEventDQ
174 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ keepend contains=htmlEventSQ 171 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ keepend contains=htmlEventSQ
175 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ keepend contains=htmlEventDQ 172 syn region htmlEvent contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ keepend contains=htmlEventDQ
176 endif 173 endif
177 syn region htmlEventSQ contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript 174 syn region htmlEventSQ contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript
178 syn region htmlEventDQ contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript 175 syn region htmlEventDQ contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript
179 HtmlHiLink htmlEventSQ htmlEvent 176 hi def link htmlEventSQ htmlEvent
180 HtmlHiLink htmlEventDQ htmlEvent 177 hi def link htmlEventDQ htmlEvent
181 178
182 " a javascript expression is used as an arg value 179 " a javascript expression is used as an arg value
183 syn region javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc 180 syn region javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc
184 endif 181 endif
185 182
198 syn include @htmlCss syntax/css.vim 195 syn include @htmlCss syntax/css.vim
199 unlet b:current_syntax 196 unlet b:current_syntax
200 syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc 197 syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
201 syn match htmlCssStyleComment contained "\(<!--\|-->\)" 198 syn match htmlCssStyleComment contained "\(<!--\|-->\)"
202 syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc 199 syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc
203 HtmlHiLink htmlStyleArg htmlString 200 hi def link htmlStyleArg htmlString
204 endif 201 endif
205 202
206 if main_syntax == "html" 203 if main_syntax == "html"
207 " synchronizing (does not always work if a comment includes legal 204 " synchronizing (does not always work if a comment includes legal
208 " html tags, but doing it right would mean to always start 205 " html tags, but doing it right would mean to always start
212 syn sync match htmlHighlightSkip "^.*['\"].*$" 209 syn sync match htmlHighlightSkip "^.*['\"].*$"
213 syn sync minlines=10 210 syn sync minlines=10
214 endif 211 endif
215 212
216 " The default highlighting. 213 " The default highlighting.
217 HtmlHiLink htmlTag Function 214 hi def link htmlTag Function
218 HtmlHiLink htmlEndTag Identifier 215 hi def link htmlEndTag Identifier
219 HtmlHiLink htmlArg Type 216 hi def link htmlArg Type
220 HtmlHiLink htmlTagName htmlStatement 217 hi def link htmlTagName htmlStatement
221 HtmlHiLink htmlSpecialTagName Exception 218 hi def link htmlSpecialTagName Exception
222 HtmlHiLink htmlValue String 219 hi def link htmlValue String
223 HtmlHiLink htmlSpecialChar Special 220 hi def link htmlSpecialChar Special
224 221
225 if !exists("html_no_rendering") 222 if !exists("html_no_rendering")
226 HtmlHiLink htmlH1 Title 223 hi def link htmlH1 Title
227 HtmlHiLink htmlH2 htmlH1 224 hi def link htmlH2 htmlH1
228 HtmlHiLink htmlH3 htmlH2 225 hi def link htmlH3 htmlH2
229 HtmlHiLink htmlH4 htmlH3 226 hi def link htmlH4 htmlH3
230 HtmlHiLink htmlH5 htmlH4 227 hi def link htmlH5 htmlH4
231 HtmlHiLink htmlH6 htmlH5 228 hi def link htmlH6 htmlH5
232 HtmlHiLink htmlHead PreProc 229 hi def link htmlHead PreProc
233 HtmlHiLink htmlTitle Title 230 hi def link htmlTitle Title
234 HtmlHiLink htmlBoldItalicUnderline htmlBoldUnderlineItalic 231 hi def link htmlBoldItalicUnderline htmlBoldUnderlineItalic
235 HtmlHiLink htmlUnderlineBold htmlBoldUnderline 232 hi def link htmlUnderlineBold htmlBoldUnderline
236 HtmlHiLink htmlUnderlineItalicBold htmlBoldUnderlineItalic 233 hi def link htmlUnderlineItalicBold htmlBoldUnderlineItalic
237 HtmlHiLink htmlUnderlineBoldItalic htmlBoldUnderlineItalic 234 hi def link htmlUnderlineBoldItalic htmlBoldUnderlineItalic
238 HtmlHiLink htmlItalicUnderline htmlUnderlineItalic 235 hi def link htmlItalicUnderline htmlUnderlineItalic
239 HtmlHiLink htmlItalicBold htmlBoldItalic 236 hi def link htmlItalicBold htmlBoldItalic
240 HtmlHiLink htmlItalicBoldUnderline htmlBoldUnderlineItalic 237 hi def link htmlItalicBoldUnderline htmlBoldUnderlineItalic
241 HtmlHiLink htmlItalicUnderlineBold htmlBoldUnderlineItalic 238 hi def link htmlItalicUnderlineBold htmlBoldUnderlineItalic
242 HtmlHiLink htmlLink Underlined 239 hi def link htmlLink Underlined
243 HtmlHiLink htmlLeadingSpace None 240 hi def link htmlLeadingSpace None
244 if !exists("html_my_rendering") 241 if !exists("html_my_rendering")
245 hi def htmlBold term=bold cterm=bold gui=bold 242 hi def htmlBold term=bold cterm=bold gui=bold
246 hi def htmlBoldUnderline term=bold,underline cterm=bold,underline gui=bold,underline 243 hi def htmlBoldUnderline term=bold,underline cterm=bold,underline gui=bold,underline
247 hi def htmlBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic 244 hi def htmlBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
248 hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline 245 hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
250 hi def htmlUnderlineItalic term=italic,underline cterm=italic,underline gui=italic,underline 247 hi def htmlUnderlineItalic term=italic,underline cterm=italic,underline gui=italic,underline
251 hi def htmlItalic term=italic cterm=italic gui=italic 248 hi def htmlItalic term=italic cterm=italic gui=italic
252 endif 249 endif
253 endif 250 endif
254 251
255 HtmlHiLink htmlPreStmt PreProc 252 hi def link htmlPreStmt PreProc
256 HtmlHiLink htmlPreError Error 253 hi def link htmlPreError Error
257 HtmlHiLink htmlPreProc PreProc 254 hi def link htmlPreProc PreProc
258 HtmlHiLink htmlPreAttr String 255 hi def link htmlPreAttr String
259 HtmlHiLink htmlPreProcAttrName PreProc 256 hi def link htmlPreProcAttrName PreProc
260 HtmlHiLink htmlPreProcAttrError Error 257 hi def link htmlPreProcAttrError Error
261 HtmlHiLink htmlSpecial Special 258 hi def link htmlSpecial Special
262 HtmlHiLink htmlSpecialChar Special 259 hi def link htmlSpecialChar Special
263 HtmlHiLink htmlString String 260 hi def link htmlString String
264 HtmlHiLink htmlStatement Statement 261 hi def link htmlStatement Statement
265 HtmlHiLink htmlComment Comment 262 hi def link htmlComment Comment
266 HtmlHiLink htmlCommentPart Comment 263 hi def link htmlCommentPart Comment
267 HtmlHiLink htmlValue String 264 hi def link htmlValue String
268 HtmlHiLink htmlCommentError htmlError 265 hi def link htmlCommentError htmlError
269 HtmlHiLink htmlTagError htmlError 266 hi def link htmlTagError htmlError
270 HtmlHiLink htmlEvent javaScript 267 hi def link htmlEvent javaScript
271 HtmlHiLink htmlError Error 268 hi def link htmlError Error
272 269
273 HtmlHiLink javaScript Special 270 hi def link javaScript Special
274 HtmlHiLink javaScriptExpression javaScript 271 hi def link javaScriptExpression javaScript
275 HtmlHiLink htmlCssStyleComment Comment 272 hi def link htmlCssStyleComment Comment
276 HtmlHiLink htmlCssDefinition Special 273 hi def link htmlCssDefinition Special
277
278 delcommand HtmlHiLink
279 274
280 let b:current_syntax = "html" 275 let b:current_syntax = "html"
281 276
282 if main_syntax == 'html' 277 if main_syntax == 'html'
283 unlet main_syntax 278 unlet main_syntax