adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update runtime files

Browse Source
This commit is contained in:
Bram Moolenaar
2018-11-04 14:45:49 +01:00
parent dcd71cbaed
commit ba3ff53930
28 changed files with 432 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/indent/html.vim
View File

@ -625,7 +625,7 @@ func! s:CSSIndent()
return eval(b:hi_css1indent)
endif
" If the current line starts with "}" align with it's match.
" If the current line starts with "}" align with its match.
if curtext =~ '^\s*}'
call cursor(v:lnum, 1)
try

12
runtime/indent/raml.vim Normal file
View File

@ -0,0 +1,12 @@
" Vim indent file
" Language: RAML (RESTful API Modeling Language)
" Maintainer: mucheng <leisurelicht@gmail.com>
" License: VIM LICENSE
" Latest Revision: 2018-11-03
if exists("b:did_indent")
finish
endif
" Same as yaml indenting.
runtime! indent/yaml.vim

17
runtime/indent/testdir/README.txt
View File

@ -22,8 +22,12 @@ First of all, create a FILETYPE.in file. It should contain:
endfunc
" END_INDENT
- Optionally, a line with INDENT_EXE, followed by a Vim command. This will be
executed before indenting the lines. Example:
If you just want to test normal indenting with default options, you can make
this a large number of lines. Just add all kinds of language constructs,
nested statements, etc. with valid syntax.
- Optionally, add lines with INDENT_EXE after START_INDENT, followed by a Vim
command. This will be executed before indenting the lines. Example:
" START_INDENT
" INDENT_EXE let g:vim_indent_cont = 6
@ -36,8 +40,8 @@ First of all, create a FILETYPE.in file. It should contain:
the next block of lines.
- Alternatively to indenting all the lines between START_INDENT and
END_INDENT, use a INDENT_AT line, which specifies a pattern to find the line
to indent. Example:
END_INDENT, use an INDENT_AT line, which specifies a pattern to find the
line to indent. Example:
" START_INDENT
" INDENT_AT this-line
@ -47,7 +51,8 @@ First of all, create a FILETYPE.in file. It should contain:
" END_INDENT
Alternatively you can use INDENT_NEXT to indent the line below the matching
pattern:
pattern. Keep in mind that quite often it will indent relative to the
matching line:
" START_INDENT
" INDENT_NEXT next-line
@ -84,7 +89,7 @@ different from the FILETYPE.ok file.
Check the contents of the FILETYPE.fail file. If it is perfectly OK, then
rename it to overwrite the FILETYPE.ok file. If you now run "make test" again,
the test will pass and create a FILETYPE.out file, which is identical to the
FILETYPE.ok file.
FILETYPE.ok file. The FILETYPE.fail file will be deleted.
If you try to run "make test" again you will notice that nothing happens,
because the FILETYPE.out file already exists. Delete it, or do "make clean",

6
runtime/indent/xml.vim
View File

@ -2,7 +2,9 @@
" Repository: https://github.com/chrisbra/vim-xml-ftplugin
" Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
" Last Change: 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
" Last Change: 20181022 - Do not overwrite indentkeys setting
" https://github.com/chrisbra/vim-xml-ftplugin/issues/1
" 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
" Notes: 1) does not indent pure non-xml code (e.g. embedded scripts)
" 2) will be confused by unbalanced tags in comments
" or CDATA sections.
@ -19,7 +21,7 @@ set cpo&vim
" [-- local settings (must come before aborting the script) --]
setlocal indentexpr=XmlIndentGet(v:lnum,1)
setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,},!^F
if !exists('b:xml_indent_open')
let b:xml_indent_open = '.\{-}<\a'