mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:e0e391755432

Browse Source 
Update runtime files.
e0e3917554
This commit is contained in:
Jan Edmund Lazo
2021-05-01 23:05:15 -04:00
parent 8f8602d2df
commit ac83c6eba6
20 changed files with 416 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
runtime/compiler/fbc.vim Normal file
View File

@@ -0,0 +1,27 @@
" Vim compiler file
" Compiler: FreeBASIC Compiler
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2015 Jan 10
if exists("current_compiler")
finish
endif
let current_compiler = "fbc"
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif
let s:cpo_save = &cpo
set cpo&vim
CompilerSet makeprg=fbc
CompilerSet errorformat=%-G%.%#Too\ many\ errors\\,\ exiting,
\%f(%l)\ %tarning\ %n(%\\d%\\+):\ %m,
\%E%f(%l)\ error\ %n:\ %m,
\%-Z%p^,
\%-C%.%#,
\%-G%.%#
let &cpo = s:cpo_save
unlet s:cpo_save

17
runtime/compiler/tidy.vim
View File

@@ -1,7 +1,7 @@
" Vim compiler file " Vim compiler file
" Compiler: HTML Tidy " Compiler: HTML Tidy
" Maintainer: Doug Kearns <dougkearns@gmail.com> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2016 Apr 21 " Last Change: 2020 Sep 4
if exists("current_compiler") if exists("current_compiler")
finish finish
@@ -12,8 +12,15 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args> command -nargs=* CompilerSet setlocal <args>
endif endif
CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S let s:cpo_save = &cpo
set cpo&vim
" foo.html:8:1: Warning: inserting missing 'foobar' element CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes
" foo.html:9:2: Error: <foobar> is not recognized! CompilerSet errorformat=%f:%l:%c:\ %trror:\ %m,
CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%# \%f:%l:%c:\ %tarning:\ %m,
\%f:%l:%c:\ %tnfo:\ %m,
\%f:%l:%c:\ %m,
\%-G%.%#
let &cpo = s:cpo_save
unlet s:cpo_save

19
runtime/doc/change.txt
View File

@@ -1575,23 +1575,31 @@ can separate the option letters with commas for readability.
letter meaning when present in 'formatoptions' ~ letter meaning when present in 'formatoptions' ~
*fo-t*
t Auto-wrap text using textwidth t Auto-wrap text using textwidth
*fo-c*
c Auto-wrap comments using textwidth, inserting the current comment c Auto-wrap comments using textwidth, inserting the current comment
leader automatically. leader automatically.
*fo-r*
r Automatically insert the current comment leader after hitting r Automatically insert the current comment leader after hitting
<Enter> in Insert mode. <Enter> in Insert mode.
*fo-o*
o Automatically insert the current comment leader after hitting 'o' or o Automatically insert the current comment leader after hitting 'o' or
'O' in Normal mode. 'O' in Normal mode.
*fo-q*
q Allow formatting of comments with "gq". q Allow formatting of comments with "gq".
Note that formatting will not change blank lines or lines containing Note that formatting will not change blank lines or lines containing
only the comment leader. A new paragraph starts after such a line, only the comment leader. A new paragraph starts after such a line,
or when the comment leader changes. or when the comment leader changes.
*fo-w*
w Trailing white space indicates a paragraph continues in the next line. w Trailing white space indicates a paragraph continues in the next line.
A line that ends in a non-white character ends a paragraph. A line that ends in a non-white character ends a paragraph.
*fo-a*
a Automatic formatting of paragraphs. Every time text is inserted or a Automatic formatting of paragraphs. Every time text is inserted or
deleted the paragraph will be reformatted. See |auto-format|. deleted the paragraph will be reformatted. See |auto-format|.
When the 'c' flag is present this only happens for recognized When the 'c' flag is present this only happens for recognized
comments. comments.
*fo-n*
n When formatting text, recognize numbered lists. This actually uses n When formatting text, recognize numbered lists. This actually uses
the 'formatlistpat' option, thus any kind of list can be used. The the 'formatlistpat' option, thus any kind of list can be used. The
indent of the text after the number is used for the next line. The indent of the text after the number is used for the next line. The
@@ -1602,6 +1610,7 @@ n When formatting text, recognize numbered lists. This actually uses
1. the first item 1. the first item
wraps wraps
2. the second item 2. the second item
< *fo-2*
2 When formatting text, use the indent of the second line of a paragraph 2 When formatting text, use the indent of the second line of a paragraph
for the rest of the paragraph, instead of the indent of the first for the rest of the paragraph, instead of the indent of the first
line. This supports paragraphs in which the first line has a line. This supports paragraphs in which the first line has a
@@ -1611,36 +1620,46 @@ n When formatting text, recognize numbered lists. This actually uses
second line of the same paragraph second line of the same paragraph
third line. third line.
< This also works inside comments, ignoring the comment leader. < This also works inside comments, ignoring the comment leader.
*fo-v*
v Vi-compatible auto-wrapping in insert mode: Only break a line at a v Vi-compatible auto-wrapping in insert mode: Only break a line at a
blank that you have entered during the current insert command. (Note: blank that you have entered during the current insert command. (Note:
this is not 100% Vi compatible. Vi has some "unexpected features" or this is not 100% Vi compatible. Vi has some "unexpected features" or
bugs in this area. It uses the screen column instead of the line bugs in this area. It uses the screen column instead of the line
column.) column.)
*fo-b*
b Like 'v', but only auto-wrap if you enter a blank at or before b Like 'v', but only auto-wrap if you enter a blank at or before
the wrap margin. If the line was longer than 'textwidth' when you the wrap margin. If the line was longer than 'textwidth' when you
started the insert, or you do not enter a blank in the insert before started the insert, or you do not enter a blank in the insert before
reaching 'textwidth', Vim does not perform auto-wrapping. reaching 'textwidth', Vim does not perform auto-wrapping.
*fo-l*
l Long lines are not broken in insert mode: When a line was longer than l Long lines are not broken in insert mode: When a line was longer than
'textwidth' when the insert command started, Vim does not 'textwidth' when the insert command started, Vim does not
automatically format it. automatically format it.
*fo-m*
m Also break at a multibyte character above 255. This is useful for m Also break at a multibyte character above 255. This is useful for
Asian text where every character is a word on its own. Asian text where every character is a word on its own.
*fo-M*
M When joining lines, don't insert a space before or after a multibyte M When joining lines, don't insert a space before or after a multibyte
character. Overrules the 'B' flag. character. Overrules the 'B' flag.
*fo-B*
B When joining lines, don't insert a space between two multibyte B When joining lines, don't insert a space between two multibyte
characters. Overruled by the 'M' flag. characters. Overruled by the 'M' flag.
*fo-1*
1 Don't break a line after a one-letter word. It's broken before it 1 Don't break a line after a one-letter word. It's broken before it
instead (if possible). instead (if possible).
*fo-]*
] Respect textwidth rigorously. With this flag set, no line can be ] Respect textwidth rigorously. With this flag set, no line can be
longer than textwidth, unless line-break-prohibition rules make this longer than textwidth, unless line-break-prohibition rules make this
impossible. Mainly for CJK scripts and works only if 'encoding' is impossible. Mainly for CJK scripts and works only if 'encoding' is
"utf-8". "utf-8".
*fo-j*
j Where it makes sense, remove a comment leader when joining lines. For j Where it makes sense, remove a comment leader when joining lines. For
example, joining: example, joining:
int i; // the index ~ int i; // the index ~
// in the list ~ // in the list ~
Becomes: Becomes:
int i; // the index in the list ~ int i; // the index in the list ~
*fo-p*
p Don't break lines at single spaces that follow periods. This is p Don't break lines at single spaces that follow periods. This is
intended to complement 'joinspaces' and |cpo-J|, for prose with intended to complement 'joinspaces' and |cpo-J|, for prose with
sentences separated by two spaces. For example, with 'textwidth' set sentences separated by two spaces. For example, with 'textwidth' set

2
runtime/doc/eval.txt
View File

@@ -1808,7 +1808,7 @@ v:null Special value used to put "null" in JSON and NIL in msgpack.
*v:numbermax* *numbermax-variable* *v:numbermax* *numbermax-variable*
v:numbermax Maximum value of a number. v:numbermax Maximum value of a number.
*v:numbermix* *numbermix-variable* *v:numbermin* *numbermin-variable*
v:numbermin Minimum value of a number (negative) v:numbermin Minimum value of a number (negative)
*v:numbersize* *numbersize-variable* *v:numbersize* *numbersize-variable*

67
runtime/ftplugin/ada.vim
View File

@@ -155,40 +155,41 @@ if exists("g:ada_abbrev")
endif endif
" Section: Commands, Mapping, Menus {{{1 " Section: Commands, Mapping, Menus {{{1
" if !exists(':AdaTagFile')
call ada#Map_Popup ( call ada#Map_Popup (
\ 'Tag.List', \ 'Tag.List',
\ 'l', \ 'l',
\ 'call ada#List_Tag ()') \ 'call ada#List_Tag ()')
call ada#Map_Popup ( call ada#Map_Popup (
\'Tag.Jump', \'Tag.Jump',
\'j', \'j',
\'call ada#Jump_Tag ()') \'call ada#Jump_Tag ()')
call ada#Map_Menu ( call ada#Map_Menu (
\'Tag.Create File', \'Tag.Create File',
\':AdaTagFile', \':AdaTagFile',
\'call ada#Create_Tags (''file'')') \'call ada#Create_Tags (''file'')')
call ada#Map_Menu ( call ada#Map_Menu (
\'Tag.Create Dir', \'Tag.Create Dir',
\':AdaTagDir', \':AdaTagDir',
\'call ada#Create_Tags (''dir'')') \'call ada#Create_Tags (''dir'')')
call ada#Map_Menu ( call ada#Map_Menu (
\'Highlight.Toggle Space Errors', \'Highlight.Toggle Space Errors',
\ ':AdaSpaces', \ ':AdaSpaces',
\'call ada#Switch_Syntax_Option (''space_errors'')') \'call ada#Switch_Syntax_Option (''space_errors'')')
call ada#Map_Menu ( call ada#Map_Menu (
\'Highlight.Toggle Lines Errors', \'Highlight.Toggle Lines Errors',
\ ':AdaLines', \ ':AdaLines',
\'call ada#Switch_Syntax_Option (''line_errors'')') \'call ada#Switch_Syntax_Option (''line_errors'')')
call ada#Map_Menu ( call ada#Map_Menu (
\'Highlight.Toggle Rainbow Color', \'Highlight.Toggle Rainbow Color',
\ ':AdaRainbow', \ ':AdaRainbow',
\'call ada#Switch_Syntax_Option (''rainbow_color'')') \'call ada#Switch_Syntax_Option (''rainbow_color'')')
call ada#Map_Menu ( call ada#Map_Menu (
\'Highlight.Toggle Standard Types', \'Highlight.Toggle Standard Types',
\ ':AdaTypes', \ ':AdaTypes',
\'call ada#Switch_Syntax_Option (''standard_types'')') \'call ada#Switch_Syntax_Option (''standard_types'')')
endif
" 1}}} " 1}}}
" Reset cpoptions " Reset cpoptions

27
runtime/ftplugin/basic.vim Normal file
View File

@@ -0,0 +1,27 @@
" Vim filetype plugin file
" Language: BASIC
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2015 Jan 10
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
setlocal comments=:REM,:'
setlocal commentstring='\ %s
setlocal formatoptions-=t formatoptions+=croql
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
let b:browsefilter = "BASIC Source Files (*.bas)\t*.bas\n" .
\ "All Files (*.*)\t*.*\n"
endif
let b:undo_ftplugin = "setl fo< com< cms< sua<" .
\ " | unlet! b:browsefilter"
let &cpo = s:cpo_save
unlet s:cpo_save

4
runtime/ftplugin/bzl.vim
View File

@@ -1,7 +1,7 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Bazel (http://bazel.io) " Language: Bazel (http://bazel.io)
" Maintainer: David Barnett (https://github.com/google/vim-ft-bzl) " Maintainer: David Barnett (https://github.com/google/vim-ft-bzl)
" Last Change: 2015 Aug 11 " Last Change: 2021 Jan 19
"" ""
" @section Introduction, intro " @section Introduction, intro
@@ -51,6 +51,8 @@ if get(g:, 'ft_bzl_fold', 0)
endif endif
if exists('*BzlFoldText') if exists('*BzlFoldText')
let &cpo = s:save_cpo
unlet s:save_cpo
finish finish
endif endif

6
runtime/ftplugin/framescript.vim
View File

@@ -3,14 +3,14 @@
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-19 " Latest Revision: 2008-07-19
let s:cpo_save = &cpo
set cpo&vim
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
endif endif
let b:did_ftplugin = 1 let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
let b:undo_ftplugin = "setl com< cms< fo< inc< | unlet! b:matchwords" let b:undo_ftplugin = "setl com< cms< fo< inc< | unlet! b:matchwords"
setlocal comments=s1:/*,mb:*,ex:*/,:// commentstring=/*\ %s\ */ setlocal comments=s1:/*,mb:*,ex:*/,:// commentstring=/*\ %s\ */

13
runtime/ftplugin/freebasic.vim Normal file
View File

@@ -0,0 +1,13 @@
" Vim filetype plugin file
" Language: FreeBasic
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2015 Jan 10
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
runtime! ftplugin/basic.vim
" vim: ts=8

7
runtime/ftplugin/hamster.vim
View File

@@ -2,7 +2,7 @@
" Language: Hamster Script " Language: Hamster Script
" Version: 2.0.6.0 " Version: 2.0.6.0
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com> " Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
" Last Change: 2017 Mar 18 " Last Change: 2021 Jan 19
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
@@ -57,6 +57,9 @@ if exists("loaded_matchit")
endif endif
setlocal ignorecase setlocal ignorecase
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save
setlocal cpo+=M " makes \%( match \)
" Disabled, 'cpo' is a global option.
" setlocal cpo+=M " makes \%( match \)

4
runtime/ftplugin/ocaml.vim
View File

@@ -159,6 +159,8 @@ let b:undo_ftplugin = "setlocal efm< foldmethod< foldexpr<"
" - Only definitions below, executed once ------------------------------------- " - Only definitions below, executed once -------------------------------------
if exists("*OMLetFoldLevel") if exists("*OMLetFoldLevel")
let &cpoptions = s:cposet
unlet s:cposet
finish finish
endif endif
@@ -635,7 +637,7 @@ endfunction
nnoremap <silent> <Plug>OCamlPrintType :<C-U>call Ocaml_print_type("normal")<CR> nnoremap <silent> <Plug>OCamlPrintType :<C-U>call Ocaml_print_type("normal")<CR>
xnoremap <silent> <Plug>OCamlPrintType :<C-U>call Ocaml_print_type("visual")<CR>`< xnoremap <silent> <Plug>OCamlPrintType :<C-U>call Ocaml_print_type("visual")<CR>`<
let &cpoptions=s:cposet let &cpoptions = s:cposet
unlet s:cposet unlet s:cposet
" vim:sw=2 fdm=indent " vim:sw=2 fdm=indent

32
runtime/ftplugin/tidy.vim Normal file
View File

@@ -0,0 +1,32 @@
" Vim filetype plugin file
" Language: HMTL Tidy Configuration
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2020 Sep 4
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
setlocal comments=:#,://
setlocal commentstring=#\ %s
setlocal formatoptions-=t formatoptions+=croql
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
let b:browsefilter = "HTML Tidy Files (tidyrc, .tidyrc, tidy.conf)\ttidyrc;.tidyrc;tidy.conf\n" .
\ "HTML Files (*.html, *.htm)\t*.html;*.htm\n" .
\ "XHTML Files (*.xhtml, *.xhtm)\t*.xhtml;*.xhtm\n" .
\ "XML Files (*.xml)\t*.xml\n" .
\ "All Files (*.*)\t*.*\n"
endif
let b:undo_ftplugin = "setl fo< com< cms<" .
\ " | unlet! b:browsefilter"
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: nowrap sw=2 sts=2 ts=8

9
runtime/ftplugin/vim.vim
View File

@@ -1,7 +1,7 @@
" Vim filetype plugin " Vim filetype plugin
" Language: Vim " Language: Vim
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2021 Jan 12 " Last Change: 2021 Jan 23
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
@@ -92,8 +92,13 @@ endif
" Let the matchit plugin know what items can be matched. " Let the matchit plugin know what items can be matched.
if exists("loaded_matchit") if exists("loaded_matchit")
let b:match_ignorecase = 0 let b:match_ignorecase = 0
" "func" can also be used as a type:
" var Ref: func
" or to list functions:
" func name
" require a parenthesis following, then there can be an "endfunc".
let b:match_words = let b:match_words =
\ '\<\%(fu\%[nction]\|def\)\>)\@!:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . \ '\<\%(fu\%[nction]\|def\)\s\+\S\+(:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' .
\ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' . \ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
\ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' . \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
\ '{:},' . \ '{:},' .

6
runtime/indent/fortran.vim
View File

@@ -74,11 +74,15 @@ endif
if (b:fortran_fixed_source == 1) if (b:fortran_fixed_source == 1)
setlocal indentexpr=FortranGetFixedIndent() setlocal indentexpr=FortranGetFixedIndent()
if exists("*FortranGetFixedIndent") if exists("*FortranGetFixedIndent")
let &cpoptions = s:cposet
unlet s:cposet
finish finish
endif endif
else else
setlocal indentexpr=FortranGetFreeIndent() setlocal indentexpr=FortranGetFreeIndent()
if exists("*FortranGetFreeIndent") if exists("*FortranGetFreeIndent")
let &cpoptions = s:cposet
unlet s:cposet
finish finish
endif endif
endif endif
@@ -213,7 +217,7 @@ function FortranGetFixedIndent()
return ind return ind
endfunction endfunction
let &cpoptions=s:cposet let &cpoptions = s:cposet
unlet s:cposet unlet s:cposet
" vim:sw=2 tw=130 " vim:sw=2 tw=130

5
runtime/indent/testdir/vim.in
View File

@@ -10,6 +10,11 @@ let cmd =
\ 'some ' \ 'some '
\ 'string' \ 'string'
if 1
let x = [
\ ]
endif
" END_INDENT " END_INDENT
" START_INDENT " START_INDENT

5
runtime/indent/testdir/vim.ok
View File

@@ -10,6 +10,11 @@ let cmd =
\ 'some ' \ 'some '
\ 'string' \ 'string'
if 1
let x = [
\ ]
endif
" END_INDENT " END_INDENT
" START_INDENT " START_INDENT

11
runtime/indent/vim.vim
View File

@@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: Vim script " Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2021 Jan 06 " Last Change: 2021 Jan 21
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@@ -38,6 +38,9 @@ function GetVimIndentIntern()
" Find a non-blank line above the current line. " Find a non-blank line above the current line.
let lnum = prevnonblank(v:lnum - 1) let lnum = prevnonblank(v:lnum - 1)
" The previous line, ignoring line continuation
let prev_text_end = lnum > 0 ? getline(lnum) : ''
" If the current line doesn't start with '\' or '"\ ' and below a line that " If the current line doesn't start with '\' or '"\ ' and below a line that
" starts with '\' or '"\ ', use the indent of the line above it. " starts with '\' or '"\ ', use the indent of the line above it.
let cur_text = getline(v:lnum) let cur_text = getline(v:lnum)
@@ -51,6 +54,8 @@ function GetVimIndentIntern()
if lnum == 0 if lnum == 0
return 0 return 0
endif endif
" the start of the previous line, skipping over line continuation
let prev_text = getline(lnum) let prev_text = getline(lnum)
let found_cont = 0 let found_cont = 0
@@ -147,13 +152,13 @@ function GetVimIndentIntern()
endif endif
" Below a line starting with "]" we must be below the end of a list. " Below a line starting with "]" we must be below the end of a list.
if prev_text =~ '^\s*]' if prev_text_end =~ '^\s*]'
let ind = ind - shiftwidth() let ind = ind - shiftwidth()
endif endif
" A line ending in "{"/"[} is most likely the start of a dict/list literal, " A line ending in "{"/"[} is most likely the start of a dict/list literal,
" indent the next line more. Not for a continuation line. " indent the next line more. Not for a continuation line.
if prev_text =~ '[{[]\s*$' && !found_cont if prev_text_end =~ '[{[]\s*$' && !found_cont
let ind = ind + shiftwidth() let ind = ind + shiftwidth()
endif endif

8
runtime/indent/yaml.vim
View File

@@ -2,16 +2,13 @@
" Language: YAML " Language: YAML
" Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com>
" Last Update: Lukas Reineke " Last Update: Lukas Reineke
" Last Change: 2020 Jun 07 " Last Change: 2021 Jan 19
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists('b:did_indent') if exists('b:did_indent')
finish finish
endif endif
let s:save_cpo = &cpo
set cpo&vim
let b:did_indent = 1 let b:did_indent = 1
setlocal indentexpr=GetYAMLIndent(v:lnum) setlocal indentexpr=GetYAMLIndent(v:lnum)
@@ -25,6 +22,9 @@ if exists('*GetYAMLIndent')
finish finish
endif endif
let s:save_cpo = &cpo
set cpo&vim
function s:FindPrevLessIndentedLine(lnum, ...) function s:FindPrevLessIndentedLine(lnum, ...)
let prevlnum = prevnonblank(a:lnum-1) let prevlnum = prevnonblank(a:lnum-1)
let curindent = a:0 ? a:1 : indent(a:lnum) let curindent = a:0 ? a:1 : indent(a:lnum)

62
runtime/syntax/basic.vim
View File

@@ -1,14 +1,16 @@
" Vim syntax file " Vim syntax file
" Language: BASIC " Language: BASIC
" Maintainer: Allan Kelly <allan@fruitloaf.co.uk> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2011 Dec 25 by Thilo Six " Previous Maintainer: Allan Kelly <allan@fruitloaf.co.uk>
" Contributors: Thilo Six
" Last Change: 2015 Jan 10
" First version based on Micro$soft QBASIC circa 1989, as documented in " First version based on Micro$soft QBASIC circa 1989, as documented in
" 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989. " 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
" This syntax file not a complete implementation yet. Send suggestions to the " This syntax file not a complete implementation yet. Send suggestions to the
" maintainer. " maintainer.
" quit when a syntax file was already loaded " Prelude {{{1
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
@@ -16,7 +18,7 @@ endif
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
" A bunch of useful BASIC keywords " Keywords {{{1
syn keyword basicStatement BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave syn keyword basicStatement BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave
syn keyword basicStatement CALL call Call ABSOLUTE absolute Absolute syn keyword basicStatement CALL call Call ABSOLUTE absolute Absolute
syn keyword basicStatement CHAIN chain Chain CHDIR chdir Chdir syn keyword basicStatement CHAIN chain Chain CHDIR chdir Chdir
@@ -116,32 +118,39 @@ syn keyword basicFunction RIGHT$ right$ Right$ RTRIM$ rtrim$ Rtrim$
syn keyword basicFunction SPACE$ space$ Space$ STR$ str$ Str$ syn keyword basicFunction SPACE$ space$ Space$ STR$ str$ Str$
syn keyword basicFunction STRING$ string$ String$ TIME$ time$ Time$ syn keyword basicFunction STRING$ string$ String$ TIME$ time$ Time$
syn keyword basicFunction UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$ syn keyword basicFunction UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$
syn keyword basicTodo contained TODO
"integer number, or floating point number without a dot. " Numbers {{{1
" Integer number, or floating point number without a dot.
syn match basicNumber "\<\d\+\>" syn match basicNumber "\<\d\+\>"
"floating point number, with dot " Floating point number, with dot
syn match basicNumber "\<\d\+\.\d*\>" syn match basicNumber "\<\d\+\.\d*\>"
"floating point number, starting with a dot " Floating point number, starting with a dot
syn match basicNumber "\.\d\+\>" syn match basicNumber "\.\d\+\>"
" String and Character contstants " String and Character constants {{{1
syn match basicSpecial contained "\\\d\d\d\|\\." syn match basicSpecial "\\\d\d\d\|\\." contained
syn region basicString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=basicSpecial syn region basicString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=basicSpecial
syn region basicComment start="REM" end="$" contains=basicTodo " Line numbers {{{1
syn region basicComment start="^[ \t]*'" end="$" contains=basicTodo
syn region basicLineNumber start="^\d" end="\s" syn region basicLineNumber start="^\d" end="\s"
syn match basicTypeSpecifier "[a-zA-Z0-9][\$%&!#]"ms=s+1
" Data-type suffixes {{{1
syn match basicTypeSpecifier "[a-zA-Z0-9][$%&!#]"ms=s+1
" Used with OPEN statement " Used with OPEN statement
syn match basicFilenumber "#\d\+" syn match basicFilenumber "#\d\+"
"syn sync ccomment basicComment
" Mathematical operators {{{1
" syn match basicMathsOperator "[<>+\*^/\\=-]" " syn match basicMathsOperator "[<>+\*^/\\=-]"
syn match basicMathsOperator "-\|=\|[:<>+\*^/\\]\|AND\|OR" syn match basicMathsOperator "-\|=\|[:<>+\*^/\\]\|AND\|OR"
" Define the default highlighting. " Comments {{{1
" Only when an item doesn't have highlighting yet syn keyword basicTodo TODO FIXME XXX NOTE contained
syn region basicComment start="^\s*\zsREM\>" start="\%(:\s*\)\@<=REM\>" end="$" contains=basicTodo
syn region basicComment start="'" end="$" contains=basicTodo
"syn sync ccomment basicComment
" Default Highlighting {{{1
hi def link basicLabel Label hi def link basicLabel Label
hi def link basicConditional Conditional hi def link basicConditional Conditional
hi def link basicRepeat Repeat hi def link basicRepeat Repeat
@@ -150,17 +159,18 @@ hi def link basicNumber Number
hi def link basicError Error hi def link basicError Error
hi def link basicStatement Statement hi def link basicStatement Statement
hi def link basicString String hi def link basicString String
hi def link basicComment Comment hi def link basicComment Comment
hi def link basicSpecial Special hi def link basicSpecial Special
hi def link basicTodo Todo hi def link basicTodo Todo
hi def link basicFunction Identifier hi def link basicFunction Identifier
hi def link basicTypeSpecifier Type hi def link basicTypeSpecifier Type
hi def link basicFilenumber basicTypeSpecifier hi def link basicFilenumber basicTypeSpecifier
"hi basicMathsOperator term=bold cterm=bold gui=bold "hi basicMathsOperator term=bold cterm=bold gui=bold
" Postscript {{{1
let b:current_syntax = "basic" let b:current_syntax = "basic"
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save
" vim: ts=8
" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:

193
runtime/syntax/tidy.vim
View File

@@ -1,8 +1,9 @@
" Vim syntax file " Vim syntax file
" Language: HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc) " Language: HMTL Tidy Configuration
" Maintainer: Doug Kearns <dougkearns@gmail.com> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Last Change: 2016 Apr 24 " Last Change: 2020 Sep 4
" Preamble {{{1
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
@@ -12,10 +13,15 @@ set cpo&vim
syn iskeyword @,48-57,-,_ syn iskeyword @,48-57,-,_
" Values {{{1
syn match tidyWordSeparator contained ",\|\s" nextgroup=tidyWord skipwhite skipnl
syn match tidyMuteIDSeparator contained ",\|\s" nextgroup=tidyMuteID skipwhite skipnl
syn case ignore syn case ignore
syn keyword tidyBoolean contained t[rue] f[alse] y[es] n[o] 1 0 syn keyword tidyBoolean contained t[rue] f[alse] y[es] n[o] 1 0
syn keyword tidyAutoBoolean contained t[rue] f[alse] y[es] n[o] 1 0 auto syn keyword tidyAutoBoolean contained t[rue] f[alse] y[es] n[o] 1 0 auto
syn case match syn case match
syn keyword tidyCustomTags contained no blocklevel empty inline pre
syn keyword tidyDoctype contained html5 omit auto strict loose transitional user syn keyword tidyDoctype contained html5 omit auto strict loose transitional user
syn keyword tidyEncoding contained raw ascii latin0 latin1 utf8 iso2022 mac win1252 ibm858 utf16le utf16be utf16 big5 shiftjis syn keyword tidyEncoding contained raw ascii latin0 latin1 utf8 iso2022 mac win1252 ibm858 utf16le utf16be utf16 big5 shiftjis
syn keyword tidyNewline contained LF CRLF CR syn keyword tidyNewline contained LF CRLF CR
@@ -24,36 +30,148 @@ syn keyword tidyRepeat contained keep-first keep-last
syn keyword tidySorter contained alpha none syn keyword tidySorter contained alpha none
syn region tidyString contained start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline syn region tidyString contained start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
syn region tidyString contained start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline syn region tidyString contained start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
syn match tidyTags contained "\<\w\+\(\s*,\s*\w\+\)*\>" " Tag and attribute lists
syn match tidyWord contained "\<\k\+\>:\@!" nextgroup=tidyWordSeparator skipwhite skipnl
syn keyword tidyBooleanOption add-xml-decl add-xml-pi add-xml-space " Mute Message IDs {{{2
\ anchor-as-name ascii-chars assume-xml-procins bare break-before-br syn keyword tidyMuteID ADDED_MISSING_CHARSET ANCHOR_DUPLICATED
\ clean coerce-endtags decorate-inferred-ul drop-empty-paras \ ANCHOR_NOT_UNIQUE APOS_UNDEFINED APPLET_MISSING_ALT AREA_MISSING_ALT
\ drop-empty-elements drop-font-tags drop-proprietary-attributes \ ASCII_REQUIRES_DESCRIPTION ASSOCIATE_LABELS_EXPLICITLY
\ enclose-block-text enclose-text escape-cdata escape-scripts \ ASSOCIATE_LABELS_EXPLICITLY_FOR ASSOCIATE_LABELS_EXPLICITLY_ID
\ fix-backslash fix-bad-comments fix-uri force-output gdoc gnu-emacs \ ATTRIBUTE_IS_NOT_ALLOWED ATTRIBUTE_VALUE_REPLACED
\ hide-comments hide-endtags indent-attributes indent-cdata \ ATTR_VALUE_NOT_LCASE AUDIO_MISSING_TEXT_AIFF AUDIO_MISSING_TEXT_AU
\ indent-with-tabs input-xml join-classes join-styles keep-time \ AUDIO_MISSING_TEXT_RA AUDIO_MISSING_TEXT_RM AUDIO_MISSING_TEXT_SND
\ language literal-attributes logical-emphasis lower-literals markup \ AUDIO_MISSING_TEXT_WAV BACKSLASH_IN_URI BAD_ATTRIBUTE_VALUE
\ merge-emphasis ncr numeric-entities omit-optional-tags output-html \ BAD_ATTRIBUTE_VALUE_REPLACED BAD_CDATA_CONTENT BAD_SUMMARY_HTML5
\ output-xhtml output-xml preserve-entities punctuation-wrap quiet \ BAD_SURROGATE_LEAD BAD_SURROGATE_PAIR BAD_SURROGATE_TAIL
\ quote-ampersand quote-marks quote-nbsp raw replace-color show-info \ CANT_BE_NESTED COERCE_TO_ENDTAG COLOR_CONTRAST_ACTIVE_LINK
\ show-warnings skip-nested split strict-tags-attributes tidy-mark \ COLOR_CONTRAST_LINK COLOR_CONTRAST_TEXT COLOR_CONTRAST_VISITED_LINK
\ uppercase-attributes uppercase-tags word-2000 wrap-asp \ CONTENT_AFTER_BODY CUSTOM_TAG_DETECTED DATA_TABLE_MISSING_HEADERS
\ wrap-attributes wrap-jste wrap-php wrap-script-literals \ DATA_TABLE_MISSING_HEADERS_COLUMN DATA_TABLE_MISSING_HEADERS_ROW
\ wrap-sections write-back \ DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS
\ DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS DISCARDING_UNEXPECTED
\ DOCTYPE_AFTER_TAGS DOCTYPE_MISSING DUPLICATE_FRAMESET
\ ELEMENT_NOT_EMPTY ELEMENT_VERS_MISMATCH_ERROR
\ ELEMENT_VERS_MISMATCH_WARN ENCODING_MISMATCH
\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET
\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED
\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT
\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT ESCAPED_ILLEGAL_URI
\ FILE_CANT_OPEN FILE_CANT_OPEN_CFG FILE_NOT_FILE FIXED_BACKSLASH
\ FOUND_STYLE_IN_BODY FRAME_MISSING_LONGDESC FRAME_MISSING_NOFRAMES
\ FRAME_MISSING_TITLE FRAME_SRC_INVALID FRAME_TITLE_INVALID_NULL
\ FRAME_TITLE_INVALID_SPACES HEADERS_IMPROPERLY_NESTED
\ HEADER_USED_FORMAT_TEXT ID_NAME_MISMATCH ILLEGAL_NESTING
\ ILLEGAL_URI_CODEPOINT ILLEGAL_URI_REFERENCE
\ IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION
\ IMG_ALT_SUSPICIOUS_FILENAME IMG_ALT_SUSPICIOUS_FILE_SIZE
\ IMG_ALT_SUSPICIOUS_PLACEHOLDER IMG_ALT_SUSPICIOUS_TOO_LONG
\ IMG_BUTTON_MISSING_ALT IMG_MAP_CLIENT_MISSING_TEXT_LINKS
\ IMG_MAP_SERVER_REQUIRES_TEXT_LINKS IMG_MISSING_ALT IMG_MISSING_DLINK
\ IMG_MISSING_LONGDESC IMG_MISSING_LONGDESC_DLINK
\ INFORMATION_NOT_CONVEYED_APPLET INFORMATION_NOT_CONVEYED_IMAGE
\ INFORMATION_NOT_CONVEYED_INPUT INFORMATION_NOT_CONVEYED_OBJECT
\ INFORMATION_NOT_CONVEYED_SCRIPT INSERTING_AUTO_ATTRIBUTE
\ INSERTING_TAG INVALID_ATTRIBUTE INVALID_NCR INVALID_SGML_CHARS
\ INVALID_UTF16 INVALID_UTF8 INVALID_XML_ID JOINING_ATTRIBUTE
\ LANGUAGE_INVALID LANGUAGE_NOT_IDENTIFIED
\ LAYOUT_TABLES_LINEARIZE_PROPERLY LAYOUT_TABLE_INVALID_MARKUP
\ LINK_TEXT_MISSING LINK_TEXT_NOT_MEANINGFUL
\ LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE LINK_TEXT_TOO_LONG
\ LIST_USAGE_INVALID_LI LIST_USAGE_INVALID_OL LIST_USAGE_INVALID_UL
\ MALFORMED_COMMENT MALFORMED_COMMENT_DROPPING MALFORMED_COMMENT_EOS
\ MALFORMED_COMMENT_WARN MALFORMED_DOCTYPE METADATA_MISSING
\ METADATA_MISSING_REDIRECT_AUTOREFRESH MISMATCHED_ATTRIBUTE_ERROR
\ MISMATCHED_ATTRIBUTE_WARN MISSING_ATTRIBUTE MISSING_ATTR_VALUE
\ MISSING_DOCTYPE MISSING_ENDTAG_BEFORE MISSING_ENDTAG_FOR
\ MISSING_ENDTAG_OPTIONAL MISSING_IMAGEMAP MISSING_QUOTEMARK
\ MISSING_QUOTEMARK_OPEN MISSING_SEMICOLON MISSING_SEMICOLON_NCR
\ MISSING_STARTTAG MISSING_TITLE_ELEMENT MOVED_STYLE_TO_HEAD
\ MULTIMEDIA_REQUIRES_TEXT NESTED_EMPHASIS NESTED_QUOTATION
\ NEWLINE_IN_URI NEW_WINDOWS_REQUIRE_WARNING_BLANK
\ NEW_WINDOWS_REQUIRE_WARNING_NEW NOFRAMES_CONTENT
\ NOFRAMES_INVALID_CONTENT NOFRAMES_INVALID_LINK
\ NOFRAMES_INVALID_NO_VALUE NON_MATCHING_ENDTAG OBJECT_MISSING_ALT
\ OBSOLETE_ELEMENT OPTION_REMOVED OPTION_REMOVED_APPLIED
\ OPTION_REMOVED_UNAPPLIED POTENTIAL_HEADER_BOLD
\ POTENTIAL_HEADER_ITALICS POTENTIAL_HEADER_UNDERLINE
\ PREVIOUS_LOCATION PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET
\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED
\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT
\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT PROPRIETARY_ATTRIBUTE
\ PROPRIETARY_ATTR_VALUE PROPRIETARY_ELEMENT REMOVED_HTML5
\ REMOVE_AUTO_REDIRECT REMOVE_AUTO_REFRESH REMOVE_BLINK_MARQUEE
\ REMOVE_FLICKER_ANIMATED_GIF REMOVE_FLICKER_APPLET
\ REMOVE_FLICKER_EMBED REMOVE_FLICKER_OBJECT REMOVE_FLICKER_SCRIPT
\ REPEATED_ATTRIBUTE REPLACE_DEPRECATED_HTML_APPLET
\ REPLACE_DEPRECATED_HTML_BASEFONT REPLACE_DEPRECATED_HTML_CENTER
\ REPLACE_DEPRECATED_HTML_DIR REPLACE_DEPRECATED_HTML_FONT
\ REPLACE_DEPRECATED_HTML_ISINDEX REPLACE_DEPRECATED_HTML_MENU
\ REPLACE_DEPRECATED_HTML_S REPLACE_DEPRECATED_HTML_STRIKE
\ REPLACE_DEPRECATED_HTML_U REPLACING_ELEMENT REPLACING_UNEX_ELEMENT
\ SCRIPT_MISSING_NOSCRIPT SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK
\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN
\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE
\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT
\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER
\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP SKIPOVER_ASCII_ART
\ SPACE_PRECEDING_XMLDECL STRING_ARGUMENT_BAD STRING_CONTENT_LOOKS
\ STRING_DOCTYPE_GIVEN STRING_MISSING_MALFORMED STRING_MUTING_TYPE
\ STRING_NO_SYSID STRING_UNKNOWN_OPTION
\ STYLESHEETS_REQUIRE_TESTING_LINK
\ STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR
\ STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT
\ STYLE_SHEET_CONTROL_PRESENTATION SUSPECTED_MISSING_QUOTE
\ TABLE_MAY_REQUIRE_HEADER_ABBR TABLE_MAY_REQUIRE_HEADER_ABBR_NULL
\ TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES TABLE_MISSING_CAPTION
\ TABLE_MISSING_SUMMARY TABLE_SUMMARY_INVALID_NULL
\ TABLE_SUMMARY_INVALID_PLACEHOLDER TABLE_SUMMARY_INVALID_SPACES
\ TAG_NOT_ALLOWED_IN TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET
\ TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT
\ TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT TOO_MANY_ELEMENTS
\ TOO_MANY_ELEMENTS_IN TRIM_EMPTY_ELEMENT UNESCAPED_AMPERSAND
\ UNEXPECTED_ENDTAG UNEXPECTED_ENDTAG_ERR UNEXPECTED_ENDTAG_IN
\ UNEXPECTED_END_OF_FILE UNEXPECTED_END_OF_FILE_ATTR
\ UNEXPECTED_EQUALSIGN UNEXPECTED_GT UNEXPECTED_QUOTEMARK
\ UNKNOWN_ELEMENT UNKNOWN_ELEMENT_LOOKS_CUSTOM UNKNOWN_ENTITY
\ USING_BR_INPLACE_OF VENDOR_SPECIFIC_CHARS WHITE_IN_URI
\ XML_DECLARATION_DETECTED XML_ID_SYNTAX
\ contained nextgroup=tidyMuteIDSeparator skipwhite skipnl
" Options {{{1
syn keyword tidyCustomTagsOption custom-tags contained nextgroup=tidyCustomTagsDelimiter
syn match tidyCustomTagsDelimiter ":" nextgroup=tidyCustomTags contained skipwhite
syn keyword tidyBooleanOption add-meta-charset add-xml-decl
\ add-xml-pi add-xml-space anchor-as-name ascii-chars
\ assume-xml-procins bare break-before-br clean coerce-endtags
\ decorate-inferred-ul drop-empty-paras drop-empty-elements
\ drop-font-tags drop-proprietary-attributes enclose-block-text
\ enclose-text escape-cdata escape-scripts fix-backslash
\ fix-style-tags fix-uri force-output gdoc gnu-emacs hide-comments
\ hide-endtags indent-attributes indent-cdata indent-with-tabs
\ input-xml join-classes join-styles keep-tabs keep-time language
\ literal-attributes logical-emphasis lower-literals markup
\ merge-emphasis mute-id ncr numeric-entities omit-optional-tags
\ output-html output-xhtml output-xml preserve-entities
\ punctuation-wrap quiet quote-ampersand quote-marks quote-nbsp raw
\ replace-color show-filename show-info show-meta-change show-warnings
\ skip-nested split strict-tags-attributes tidy-mark
\ uppercase-attributes uppercase-tags warn-proprietary-attributes
\ word-2000 wrap-asp wrap-attributes wrap-jste wrap-php
\ wrap-script-literals wrap-sections write-back
\ contained nextgroup=tidyBooleanDelimiter \ contained nextgroup=tidyBooleanDelimiter
syn match tidyBooleanDelimiter ":" nextgroup=tidyBoolean contained skipwhite syn match tidyBooleanDelimiter ":" nextgroup=tidyBoolean contained skipwhite
syn keyword tidyAutoBooleanOption indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter syn keyword tidyAutoBooleanOption fix-bad-comments indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
syn match tidyAutoBooleanDelimiter ":" nextgroup=tidyAutoBoolean contained skipwhite syn match tidyAutoBooleanDelimiter ":" nextgroup=tidyAutoBoolean contained skipwhite
syn keyword tidyCSSSelectorOption css-prefix contained nextgroup=tidyCSSSelectorDelimiter syn keyword tidyCSSSelectorOption css-prefix contained nextgroup=tidyCSSSelectorDelimiter
syn match tidyCSSSelectorDelimiter ":" nextgroup=tidyCSSSelector contained skipwhite syn match tidyCSSSelectorDelimiter ":" nextgroup=tidyCSSSelector contained skipwhite
syn keyword tidyDoctypeOption doctype contained nextgroup=tidyDoctypeDelimiter syn keyword tidyDoctypeOption doctype contained nextgroup=tidyDoctypeDelimiter
syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype contained skipwhite syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype,tidyString contained skipwhite
syn keyword tidyEncodingOption char-encoding input-encoding output-encoding contained nextgroup=tidyEncodingDelimiter syn keyword tidyEncodingOption char-encoding input-encoding output-encoding contained nextgroup=tidyEncodingDelimiter
syn match tidyEncodingDelimiter ":" nextgroup=tidyEncoding contained skipwhite syn match tidyEncodingDelimiter ":" nextgroup=tidyEncoding contained skipwhite
@@ -67,8 +185,11 @@ syn match tidyNameDelimiter ":" nextgroup=tidyName contained skipwhite
syn keyword tidyNewlineOption newline contained nextgroup=tidyNewlineDelimiter syn keyword tidyNewlineOption newline contained nextgroup=tidyNewlineDelimiter
syn match tidyNewlineDelimiter ":" nextgroup=tidyNewline contained skipwhite syn match tidyNewlineDelimiter ":" nextgroup=tidyNewline contained skipwhite
syn keyword tidyAttributesOption priority-attributes contained nextgroup=tidyAttributesDelimiter
syn match tidyAttributesDelimiter ":" nextgroup=tidyWord contained skipwhite
syn keyword tidyTagsOption new-blocklevel-tags new-empty-tags new-inline-tags new-pre-tags contained nextgroup=tidyTagsDelimiter syn keyword tidyTagsOption new-blocklevel-tags new-empty-tags new-inline-tags new-pre-tags contained nextgroup=tidyTagsDelimiter
syn match tidyTagsDelimiter ":" nextgroup=tidyTags contained skipwhite syn match tidyTagsDelimiter ":" nextgroup=tidyWord contained skipwhite
syn keyword tidyRepeatOption repeated-attributes contained nextgroup=tidyRepeatDelimiter syn keyword tidyRepeatOption repeated-attributes contained nextgroup=tidyRepeatDelimiter
syn match tidyRepeatDelimiter ":" nextgroup=tidyRepeat contained skipwhite syn match tidyRepeatDelimiter ":" nextgroup=tidyRepeat contained skipwhite
@@ -79,57 +200,77 @@ syn match tidySorterDelimiter ":" nextgroup=tidySorter contained skipwhite
syn keyword tidyStringOption alt-text error-file gnu-emacs-file output-file contained nextgroup=tidyStringDelimiter syn keyword tidyStringOption alt-text error-file gnu-emacs-file output-file contained nextgroup=tidyStringDelimiter
syn match tidyStringDelimiter ":" nextgroup=tidyString contained skipwhite syn match tidyStringDelimiter ":" nextgroup=tidyString contained skipwhite
syn keyword tidyMuteOption mute contained nextgroup=tidyMuteDelimiter
syn match tidyMuteDelimiter ":" nextgroup=tidyMuteID contained skipwhite
syn cluster tidyOptions contains=tidy.*Option syn cluster tidyOptions contains=tidy.*Option
" Option line anchor {{{1
syn match tidyStart "^" nextgroup=@tidyOptions syn match tidyStart "^" nextgroup=@tidyOptions
" Long standing bug - option lines (except the first) with leading whitespace
" are silently ignored.
syn match tidyErrorStart '^\s\+\ze\S'
" Comments {{{1
syn match tidyComment "^\s*//.*$" contains=tidyTodo syn match tidyComment "^\s*//.*$" contains=tidyTodo
syn match tidyComment "^\s*#.*$" contains=tidyTodo syn match tidyComment "^\s*#.*$" contains=tidyTodo
syn keyword tidyTodo TODO NOTE FIXME XXX contained syn keyword tidyTodo TODO NOTE FIXME XXX contained
" Default highlighting {{{1
hi def link tidyAttributesOption Identifier
hi def link tidyAutoBooleanOption Identifier hi def link tidyAutoBooleanOption Identifier
hi def link tidyBooleanOption Identifier hi def link tidyBooleanOption Identifier
hi def link tidyCSSSelectorOption Identifier hi def link tidyCSSSelectorOption Identifier
hi def link tidyCustomTagsOption Identifier
hi def link tidyDoctypeOption Identifier hi def link tidyDoctypeOption Identifier
hi def link tidyEncodingOption Identifier hi def link tidyEncodingOption Identifier
hi def link tidyIntegerOption Identifier hi def link tidyIntegerOption Identifier
hi def link tidyMuteOption Identifier
hi def link tidyNameOption Identifier hi def link tidyNameOption Identifier
hi def link tidyNewlineOption Identifier hi def link tidyNewlineOption Identifier
hi def link tidyTagsOption Identifier
hi def link tidyRepeatOption Identifier hi def link tidyRepeatOption Identifier
hi def link tidySorterOption Identifier hi def link tidySorterOption Identifier
hi def link tidyStringOption Identifier hi def link tidyStringOption Identifier
hi def link tidyTagsOption Identifier
hi def link tidyAttributesDelimiter Special
hi def link tidyAutoBooleanDelimiter Special hi def link tidyAutoBooleanDelimiter Special
hi def link tidyBooleanDelimiter Special hi def link tidyBooleanDelimiter Special
hi def link tidyCSSSelectorDelimiter Special hi def link tidyCSSSelectorDelimiter Special
hi def link tidyCustomTagsDelimiter Special
hi def link tidyDoctypeDelimiter Special hi def link tidyDoctypeDelimiter Special
hi def link tidyEncodingDelimiter Special hi def link tidyEncodingDelimiter Special
hi def link tidyIntegerDelimiter Special hi def link tidyIntegerDelimiter Special
hi def link tidyMuteDelimiter Special
hi def link tidyNameDelimiter Special hi def link tidyNameDelimiter Special
hi def link tidyNewlineDelimiter Special hi def link tidyNewlineDelimiter Special
hi def link tidyTagsDelimiter Special
hi def link tidyRepeatDelimiter Special hi def link tidyRepeatDelimiter Special
hi def link tidySorterDelimiter Special hi def link tidySorterDelimiter Special
hi def link tidyStringDelimiter Special hi def link tidyStringDelimiter Special
hi def link tidyTagsDelimiter Special
hi def link tidyAutoBoolean Boolean hi def link tidyAutoBoolean Boolean
hi def link tidyBoolean Boolean hi def link tidyBoolean Boolean
hi def link tidyCustomTags Constant
hi def link tidyDoctype Constant hi def link tidyDoctype Constant
hi def link tidyEncoding Constant hi def link tidyEncoding Constant
hi def link tidyMuteID Constant
hi def link tidyNewline Constant hi def link tidyNewline Constant
hi def link tidyTags Constant
hi def link tidyNumber Number hi def link tidyNumber Number
hi def link tidyRepeat Constant hi def link tidyRepeat Constant
hi def link tidySorter Constant hi def link tidySorter Constant
hi def link tidyString String hi def link tidyString String
hi def link tidyWord Constant
hi def link tidyComment Comment hi def link tidyComment Comment
hi def link tidyTodo Todo hi def link tidyTodo Todo
hi def link tidyErrorStart Error
" Postscript {{{1
let b:current_syntax = "tidy" let b:current_syntax = "tidy"
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save
" vim: ts=8 " vim: ts=8 fdm=marker