annotate runtime/indent/vim.vim @ 7742:5f6f35a3cb12

commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 24 17:56:50 2016 +0100 Update a few runtime files.
author Christian Brabandt <cb@256bit.org>
date Sun, 24 Jan 2016 18:00:06 +0100
parents 0550be8fc7f6
children 0bdeaf7092bc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 " Vim indent file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 " Language: Vim script
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 " Maintainer: Bram Moolenaar <Bram@vim.org>
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
4 " Last Change: 2016 Jan 24
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 " Only load this indent file when no other was loaded.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 if exists("b:did_indent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 let b:did_indent = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 setlocal indentexpr=GetVimIndent()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 setlocal indentkeys+==end,=else,=cat,=fina,=END,0\\
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14
3557
9cb3a75a20b9 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3526
diff changeset
15 let b:undo_indent = "setl indentkeys< indentexpr<"
9cb3a75a20b9 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3526
diff changeset
16
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 " Only define the function once.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 if exists("*GetVimIndent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 endif
3526
dd6c2497c997 Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2729
diff changeset
21 let s:keepcpo= &cpo
dd6c2497c997 Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2729
diff changeset
22 set cpo&vim
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 function GetVimIndent()
3750
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
25 let ignorecase_save = &ignorecase
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
26 try
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
27 let &ignorecase = 0
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
28 return GetVimIndentIntern()
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
29 finally
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
30 let &ignorecase = ignorecase_save
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
31 endtry
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
32 endfunc
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
33
536aa8b0c934 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3557
diff changeset
34 function GetVimIndentIntern()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 " Find a non-blank line above the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 let lnum = prevnonblank(v:lnum - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 " If the current line doesn't start with '\' and below a line that starts
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 " with '\', use the indent of the line above it.
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
40 let cur_text = getline(v:lnum)
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
41 if cur_text !~ '^\s*\\'
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 while lnum > 0 && getline(lnum) =~ '^\s*\\'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 let lnum = lnum - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 endwhile
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 " At the start of the file use zero indent.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 if lnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 return 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 endif
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
51 let prev_text = getline(lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
53 " Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54 " and :else. Add it three times for a line that starts with '\' after
22
cc049b00ee70 updated for version 7.0014
vimboss
parents: 7
diff changeset
55 " a line that doesn't (or g:vim_indent_cont if it exists).
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 let ind = indent(lnum)
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
57 if cur_text =~ '^\s*\\' && v:lnum > 1 && prev_text !~ '^\s*\\'
22
cc049b00ee70 updated for version 7.0014
vimboss
parents: 7
diff changeset
58 if exists("g:vim_indent_cont")
cc049b00ee70 updated for version 7.0014
vimboss
parents: 7
diff changeset
59 let ind = ind + g:vim_indent_cont
cc049b00ee70 updated for version 7.0014
vimboss
parents: 7
diff changeset
60 else
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
61 let ind = ind + shiftwidth() * 3
22
cc049b00ee70 updated for version 7.0014
vimboss
parents: 7
diff changeset
62 endif
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
63 elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+END'
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
64 let ind = ind + shiftwidth()
2729
12f838be9c59 Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents: 395
diff changeset
65 else
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
66 " A line starting with :au does not increment/decrement indent.
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
67 if prev_text !~ '^\s*au\%[tocmd]'
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
68 let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
69 if i >= 0
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
70 let ind += shiftwidth()
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
71 if strpart(prev_text, i, 1) == '|' && has('syntax_items')
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
72 \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
73 let ind -= shiftwidth()
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
74 endif
2729
12f838be9c59 Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents: 395
diff changeset
75 endif
12f838be9c59 Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents: 395
diff changeset
76 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
77 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
78
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79 " If the previous line contains an "end" after a pipe, but not in an ":au"
333
18f024844150 updated for version 7.0086
vimboss
parents: 170
diff changeset
80 " command. And not when there is a backslash before the pipe.
395
339c55711247 updated for version 7.0104
vimboss
parents: 333
diff changeset
81 " And when syntax HL is enabled avoid a match inside a string.
6238
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
82 let i = match(prev_text, '[^\\]|\s*\(ene\@!\)')
47b1887483da Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3750
diff changeset
83 if i > 0 && prev_text !~ '^\s*au\%[tocmd]'
395
339c55711247 updated for version 7.0104
vimboss
parents: 333
diff changeset
84 if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
85 let ind = ind - shiftwidth()
395
339c55711247 updated for version 7.0104
vimboss
parents: 333
diff changeset
86 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
87 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
88
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
89
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
90 " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
91 " :endfun, :else and :augroup END.
6447
0550be8fc7f6 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 6238
diff changeset
92 if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)'
7742
5f6f35a3cb12 commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents: 6447
diff changeset
93 let ind = ind - shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 return ind
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97 endfunction
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98
3526
dd6c2497c997 Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2729
diff changeset
99 let &cpo = s:keepcpo
dd6c2497c997 Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2729
diff changeset
100 unlet s:keepcpo
dd6c2497c997 Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2729
diff changeset
101
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
102 " vim:sw=2