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

updated for version 7.0014

Browse Source
This commit is contained in:
Bram Moolenaar
2004-09-02 19:12:26 +00:00
parent 269ec658f0
commit d4755bb0e0
59 changed files with 3091 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/indent/lua.vim
View File

@ -1,11 +1,13 @@
" Vim indent file
" Language: Lua script
" Maintainer: Marcus Aurelius Farias <marcuscf@vant.com.br>
" First Author: Max Ischenko <mfi@ukr.net>
" Last Change: 2003 Jan 20
" Maintainer: Marcus Aurelius Farias <marcus.cf 'at' bol.com.br>
" First Author: Max Ischenko <mfi 'at' ukr.net>
" Last Change: 2004 Aug 29
" Only define the function once.
if exists("*GetLuaIndent") | finish | endif
if exists("*GetLuaIndent")
finish
endif
setlocal indentexpr=GetLuaIndent()
@ -28,21 +30,22 @@ function! GetLuaIndent()
" function, if, for, while, repeat, else, elseif, '{'
let ind = indent(lnum)
let flag = 0
if getline(lnum) =~ '^\s*\(function\>\|if\>\|for\>\|while\>\|repeat\>\|else\>\|elseif\>\|do\>\)' || getline(lnum) =~ '{\s*$' || getline(lnum) =~ '\s*=\s*function'
let ind = ind + &sw
let prevline = getline(lnum)
if prevline =~ '^\s*\%(if\>\|for\>\|while\>\|repeat\>\|else\>\|elseif\>\|do\>\)' || prevline =~ '{\s*$' || prevline =~ '\<function\>\s*\%(\k\|[.:]\)\{-}\s*('
let ind = ind + &shiftwidth
let flag = 1
endif
" Subtract a 'shiftwidth' after lines ending with
" 'end' when they begin with while, if, for, etc.
if flag == 1 && getline(lnum) =~ '\<end\>\|\<until\>'
let ind = ind - &sw
if flag == 1 && prevline =~ '\<end\>\|\<until\>'
let ind = ind - &shiftwidth
endif
" Subtract a 'shiftwidth' on end, else (and elseif), until and '}'
" This is the part that requires 'indentkeys'.
if getline(v:lnum) =~ '^\s*\(end\|else\|until\|}\)'
let ind = ind - &sw
if getline(v:lnum) =~ '^\s*\%(end\|else\|until\|}\)'
let ind = ind - &shiftwidth
endif
return ind

10
runtime/indent/vim.vim
View File

@ -1,7 +1,7 @@
" Vim indent file
" Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2003 May 25
" Last Change: 2004 Sep 02
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@ -36,10 +36,14 @@ function GetVimIndent()
" Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function
" and :else. Add it three times for a line that starts with '\' after
" a line that doesn't.
" a line that doesn't (or g:vim_indent_cont if it exists).
let ind = indent(lnum)
if getline(v:lnum) =~ '^\s*\\' && v:lnum > 1 && getline(lnum) !~ '^\s*\\'
let ind = ind + &sw * 3
if exists("g:vim_indent_cont")
let ind = ind + g:vim_indent_cont
else
let ind = ind + &sw * 3
endif
elseif getline(lnum) =~ '\(^\||\)\s*\(if\|wh\%[ile]\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>'
let ind = ind + &sw
elseif getline(lnum) =~ '^\s*aug\%[roup]' && getline(lnum) !~ '^\s*aug\%[roup]\s*!\=\s\+END'