Mercurial > vim
annotate runtime/indent/vim.vim @ 23573:e2e2cc5d0856
Update runtime files.
Commit: https://github.com/vim/vim/commit/82be4849eed0b8fbee45bc8da99b685ec89af59a
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 11 19:40:15 2021 +0100
Update runtime files.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 11 Jan 2021 19:45:05 +0100 |
parents | a3bb84cd0f59 |
children | 34b4eb3a8458 |
rev | line source |
---|---|
7 | 1 " Vim indent file |
2 " Language: Vim script | |
3 " Maintainer: Bram Moolenaar <Bram@vim.org> | |
23573 | 4 " Last Change: 2021 Jan 06 |
7 | 5 |
6 " Only load this indent file when no other was loaded. | |
7 if exists("b:did_indent") | |
8 finish | |
9 endif | |
10 let b:did_indent = 1 | |
11 | |
12 setlocal indentexpr=GetVimIndent() | |
22441 | 13 setlocal indentkeys+==end,=},=else,=cat,=finall,=END,0\\,0=\"\\\ |
21499 | 14 setlocal indentkeys-=0# |
7 | 15 |
3557 | 16 let b:undo_indent = "setl indentkeys< indentexpr<" |
17 | |
7 | 18 " Only define the function once. |
19 if exists("*GetVimIndent") | |
20 finish | |
21 endif | |
3526
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
22 let s:keepcpo= &cpo |
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
23 set cpo&vim |
7 | 24 |
25 function GetVimIndent() | |
3750 | 26 let ignorecase_save = &ignorecase |
27 try | |
28 let &ignorecase = 0 | |
29 return GetVimIndentIntern() | |
30 finally | |
31 let &ignorecase = ignorecase_save | |
32 endtry | |
33 endfunc | |
34 | |
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
35 let s:lineContPat = '^\s*\(\\\|"\\ \)' |
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
36 |
3750 | 37 function GetVimIndentIntern() |
7 | 38 " Find a non-blank line above the current line. |
39 let lnum = prevnonblank(v:lnum - 1) | |
40 | |
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
41 " If the current line doesn't start with '\' or '"\ ' and below a line that |
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
42 " starts with '\' or '"\ ', use the indent of the line above it. |
6238 | 43 let cur_text = getline(v:lnum) |
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
44 if cur_text !~ s:lineContPat |
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
45 while lnum > 0 && getline(lnum) =~ s:lineContPat |
7 | 46 let lnum = lnum - 1 |
47 endwhile | |
48 endif | |
49 | |
50 " At the start of the file use zero indent. | |
51 if lnum == 0 | |
52 return 0 | |
53 endif | |
6238 | 54 let prev_text = getline(lnum) |
23573 | 55 let found_cont = 0 |
7 | 56 |
57 " Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function | |
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
58 " and :else. Add it three times for a line that starts with '\' or '"\ ' |
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
59 " after a line that doesn't (or g:vim_indent_cont if it exists). |
7 | 60 let ind = indent(lnum) |
18489 | 61 |
62 " In heredoc indenting works completely differently. | |
63 if has('syntax_items') | |
64 let syn_here = synIDattr(synID(v:lnum, 1, 1), "name") | |
65 if syn_here =~ 'vimLetHereDocStop' | |
66 " End of heredoc: use indent of matching start line | |
67 let lnum = v:lnum - 1 | |
68 while lnum > 0 | |
69 if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc' | |
70 return indent(lnum) | |
71 endif | |
72 let lnum -= 1 | |
73 endwhile | |
74 return 0 | |
75 endif | |
76 if syn_here =~ 'vimLetHereDoc' | |
77 if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc' | |
78 " First line in heredoc: increase indent | |
79 return ind + shiftwidth() | |
80 endif | |
81 " Heredoc continues: no change in indent | |
82 return ind | |
83 endif | |
84 endif | |
85 | |
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
86 if cur_text =~ s:lineContPat && v:lnum > 1 && prev_text !~ s:lineContPat |
23573 | 87 let found_cont = 1 |
22 | 88 if exists("g:vim_indent_cont") |
89 let ind = ind + g:vim_indent_cont | |
90 else | |
7742
5f6f35a3cb12
commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents:
6447
diff
changeset
|
91 let ind = ind + shiftwidth() * 3 |
22 | 92 endif |
9407
619a98a67f67
commit https://github.com/vim/vim/commit/e18dbe865d190e74fb5d43ac8bc6ac22507d0223
Christian Brabandt <cb@256bit.org>
parents:
8951
diff
changeset
|
93 elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>' |
7742
5f6f35a3cb12
commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents:
6447
diff
changeset
|
94 let ind = ind + shiftwidth() |
2729
12f838be9c59
Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents:
395
diff
changeset
|
95 else |
6238 | 96 " A line starting with :au does not increment/decrement indent. |
97 if prev_text !~ '^\s*au\%[tocmd]' | |
22441 | 98 let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|fu\%[nction]\|def\|el\%[seif]\)\>\)') |
6238 | 99 if i >= 0 |
7742
5f6f35a3cb12
commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents:
6447
diff
changeset
|
100 let ind += shiftwidth() |
6238 | 101 if strpart(prev_text, i, 1) == '|' && has('syntax_items') |
102 \ && 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
|
103 let ind -= shiftwidth() |
6238 | 104 endif |
2729
12f838be9c59
Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents:
395
diff
changeset
|
105 endif |
12f838be9c59
Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents:
395
diff
changeset
|
106 endif |
7 | 107 endif |
108 | |
109 " If the previous line contains an "end" after a pipe, but not in an ":au" | |
333 | 110 " command. And not when there is a backslash before the pipe. |
395 | 111 " And when syntax HL is enabled avoid a match inside a string. |
6238 | 112 let i = match(prev_text, '[^\\]|\s*\(ene\@!\)') |
113 if i > 0 && prev_text !~ '^\s*au\%[tocmd]' | |
395 | 114 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
|
115 let ind = ind - shiftwidth() |
395 | 116 endif |
7 | 117 endif |
118 | |
23573 | 119 " For a line starting with "}" find the matching "{". If it is at the start |
120 " of the line align with it, probably end of a block. | |
121 " Use the mapped "%" from matchit to find the match, otherwise we may match | |
122 " a { inside a comment or string. | |
123 if cur_text =~ '^\s*}' | |
124 if maparg('%') != '' | |
125 exe v:lnum | |
126 silent! normal % | |
127 if line('.') < v:lnum && getline('.') =~ '^\s*{' | |
128 let ind = indent('.') | |
129 endif | |
130 else | |
131 " todo: use searchpair() to find a match | |
132 endif | |
133 endif | |
134 | |
135 " Below a line starting with "}" find the matching "{". If it is at the | |
136 " end of the line we must be below the end of a dictionary. | |
137 if prev_text =~ '^\s*}' | |
138 if maparg('%') != '' | |
139 exe lnum | |
140 silent! normal % | |
141 if line('.') == lnum || getline('.') !~ '^\s*{' | |
142 let ind = ind - shiftwidth() | |
143 endif | |
144 else | |
145 " todo: use searchpair() to find a match | |
146 endif | |
147 endif | |
148 | |
149 " Below a line starting with "]" we must be below the end of a list. | |
150 if prev_text =~ '^\s*]' | |
151 let ind = ind - shiftwidth() | |
152 endif | |
153 | |
154 " A line ending in "{"/"[} is most likely the start of a dict/list literal, | |
155 " indent the next line more. Not for a continuation line. | |
156 if prev_text =~ '[{[]\s*$' && !found_cont | |
157 let ind = ind + shiftwidth() | |
158 endif | |
7 | 159 |
160 " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry, | |
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
18489
diff
changeset
|
161 " :endfun, :enddef, :else and :augroup END. |
23573 | 162 if cur_text =~ '^\s*\(ene\@!\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)' |
7742
5f6f35a3cb12
commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents:
6447
diff
changeset
|
163 let ind = ind - shiftwidth() |
7 | 164 endif |
165 | |
166 return ind | |
167 endfunction | |
168 | |
3526
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
169 let &cpo = s:keepcpo |
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
170 unlet s:keepcpo |
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
171 |
7 | 172 " vim:sw=2 |