Mercurial > vim
annotate runtime/indent/vim.vim @ 24520:5bda4653aced
Update runtime files
Commit: https://github.com/vim/vim/commit/11e3c5ba820325b69cb56f70e13c21d7b8808d33
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Apr 21 18:09:37 2021 +0200
Update runtime files
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 21 Apr 2021 18:15:04 +0200 |
| parents | ef454a7f485d |
| children | babd9f1dbe12 |
| rev | line source |
|---|---|
| 7 | 1 " Vim indent file |
| 2 " Language: Vim script | |
| 3 " Maintainer: Bram Moolenaar <Bram@vim.org> | |
| 24520 | 4 " Last Change: 2021 Apr 18 |
| 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 | |
| 23737 | 41 " The previous line, ignoring line continuation |
| 42 let prev_text_end = lnum > 0 ? getline(lnum) : '' | |
| 43 | |
|
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
44 " 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
|
45 " starts with '\' or '"\ ', use the indent of the line above it. |
| 6238 | 46 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
|
47 if cur_text !~ s:lineContPat |
|
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
48 while lnum > 0 && getline(lnum) =~ s:lineContPat |
| 7 | 49 let lnum = lnum - 1 |
| 50 endwhile | |
| 51 endif | |
| 52 | |
| 53 " At the start of the file use zero indent. | |
| 54 if lnum == 0 | |
| 55 return 0 | |
| 56 endif | |
| 23737 | 57 |
| 58 " the start of the previous line, skipping over line continuation | |
| 6238 | 59 let prev_text = getline(lnum) |
| 23573 | 60 let found_cont = 0 |
| 7 | 61 |
| 62 " 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
|
63 " 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
|
64 " after a line that doesn't (or g:vim_indent_cont if it exists). |
| 7 | 65 let ind = indent(lnum) |
| 18489 | 66 |
| 67 " In heredoc indenting works completely differently. | |
| 68 if has('syntax_items') | |
| 69 let syn_here = synIDattr(synID(v:lnum, 1, 1), "name") | |
| 70 if syn_here =~ 'vimLetHereDocStop' | |
| 71 " End of heredoc: use indent of matching start line | |
| 72 let lnum = v:lnum - 1 | |
| 73 while lnum > 0 | |
| 24520 | 74 let attr = synIDattr(synID(lnum, 1, 1), "name") |
| 75 if attr != '' && attr !~ 'vimLetHereDoc' | |
| 18489 | 76 return indent(lnum) |
| 77 endif | |
| 78 let lnum -= 1 | |
| 79 endwhile | |
| 80 return 0 | |
| 81 endif | |
| 82 if syn_here =~ 'vimLetHereDoc' | |
| 83 if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc' | |
| 84 " First line in heredoc: increase indent | |
| 85 return ind + shiftwidth() | |
| 86 endif | |
| 87 " Heredoc continues: no change in indent | |
| 88 return ind | |
| 89 endif | |
| 90 endif | |
| 91 | |
|
14714
bdbb049c2aa8
patch 8.1.0369: continuation lines cannot contain comments
Christian Brabandt <cb@256bit.org>
parents:
9407
diff
changeset
|
92 if cur_text =~ s:lineContPat && v:lnum > 1 && prev_text !~ s:lineContPat |
| 23573 | 93 let found_cont = 1 |
| 22 | 94 if exists("g:vim_indent_cont") |
| 95 let ind = ind + g:vim_indent_cont | |
| 96 else | |
|
7742
5f6f35a3cb12
commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents:
6447
diff
changeset
|
97 let ind = ind + shiftwidth() * 3 |
| 22 | 98 endif |
|
9407
619a98a67f67
commit https://github.com/vim/vim/commit/e18dbe865d190e74fb5d43ac8bc6ac22507d0223
Christian Brabandt <cb@256bit.org>
parents:
8951
diff
changeset
|
99 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
|
100 let ind = ind + shiftwidth() |
|
2729
12f838be9c59
Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents:
395
diff
changeset
|
101 else |
| 6238 | 102 " A line starting with :au does not increment/decrement indent. |
| 23931 | 103 " A { may start a block or a dict. Assume that when a } follows it's a |
| 104 " terminated dict. | |
| 105 if prev_text !~ '^\s*au\%[tocmd]' && prev_text !~ '^\s*{.*}' | |
| 22441 | 106 let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|fu\%[nction]\|def\|el\%[seif]\)\>\)') |
| 6238 | 107 if i >= 0 |
|
7742
5f6f35a3cb12
commit https://github.com/vim/vim/commit/705ada1aff27ecd9c47c690df817d043c2ceb5e2
Christian Brabandt <cb@256bit.org>
parents:
6447
diff
changeset
|
108 let ind += shiftwidth() |
| 6238 | 109 if strpart(prev_text, i, 1) == '|' && has('syntax_items') |
| 110 \ && 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
|
111 let ind -= shiftwidth() |
| 6238 | 112 endif |
|
2729
12f838be9c59
Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents:
395
diff
changeset
|
113 endif |
|
12f838be9c59
Updated runtime file. Fix Italian translations.
Bram Moolenaar <bram@vim.org>
parents:
395
diff
changeset
|
114 endif |
| 7 | 115 endif |
| 116 | |
| 117 " If the previous line contains an "end" after a pipe, but not in an ":au" | |
| 333 | 118 " command. And not when there is a backslash before the pipe. |
| 395 | 119 " And when syntax HL is enabled avoid a match inside a string. |
| 6238 | 120 let i = match(prev_text, '[^\\]|\s*\(ene\@!\)') |
| 121 if i > 0 && prev_text !~ '^\s*au\%[tocmd]' | |
| 395 | 122 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
|
123 let ind = ind - shiftwidth() |
| 395 | 124 endif |
| 7 | 125 endif |
| 126 | |
| 23573 | 127 " For a line starting with "}" find the matching "{". If it is at the start |
| 128 " of the line align with it, probably end of a block. | |
| 129 " Use the mapped "%" from matchit to find the match, otherwise we may match | |
| 130 " a { inside a comment or string. | |
| 131 if cur_text =~ '^\s*}' | |
| 132 if maparg('%') != '' | |
| 133 exe v:lnum | |
| 134 silent! normal % | |
| 135 if line('.') < v:lnum && getline('.') =~ '^\s*{' | |
| 136 let ind = indent('.') | |
| 137 endif | |
| 138 else | |
| 139 " todo: use searchpair() to find a match | |
| 140 endif | |
| 141 endif | |
| 142 | |
| 143 " Below a line starting with "}" find the matching "{". If it is at the | |
| 144 " end of the line we must be below the end of a dictionary. | |
| 145 if prev_text =~ '^\s*}' | |
| 146 if maparg('%') != '' | |
| 147 exe lnum | |
| 148 silent! normal % | |
| 149 if line('.') == lnum || getline('.') !~ '^\s*{' | |
| 150 let ind = ind - shiftwidth() | |
| 151 endif | |
| 152 else | |
| 153 " todo: use searchpair() to find a match | |
| 154 endif | |
| 155 endif | |
| 156 | |
| 157 " Below a line starting with "]" we must be below the end of a list. | |
| 23931 | 158 " Include a "}" and "},} in case a dictionary ends too. |
| 159 if prev_text_end =~ '^\s*\(},\=\s*\)\=]' | |
| 23573 | 160 let ind = ind - shiftwidth() |
| 161 endif | |
| 162 | |
| 23931 | 163 let ends_in_comment = has('syntax_items') |
| 24024 | 164 \ && synIDattr(synID(lnum, len(getline(lnum)), 1), "name") =~ '\(Comment\|String\)$' |
| 23931 | 165 |
| 24024 | 166 " A line ending in "{" or "[" is most likely the start of a dict/list literal, |
| 23931 | 167 " indent the next line more. Not for a continuation line or {{{. |
| 168 if !ends_in_comment && prev_text_end =~ '\s[{[]\s*$' && !found_cont | |
| 23573 | 169 let ind = ind + shiftwidth() |
| 170 endif | |
| 7 | 171 |
| 172 " 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
|
173 " :endfun, :enddef, :else and :augroup END. |
| 23573 | 174 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
|
175 let ind = ind - shiftwidth() |
| 7 | 176 endif |
| 177 | |
| 178 return ind | |
| 179 endfunction | |
| 180 | |
|
3526
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
181 let &cpo = s:keepcpo |
|
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
182 unlet s:keepcpo |
|
dd6c2497c997
Fix more 'cpo' issues in runtime files.
Bram Moolenaar <bram@vim.org>
parents:
2729
diff
changeset
|
183 |
| 7 | 184 " vim:sw=2 |