annotate runtime/indent/python.vim @ 24178:d5328b2b0edf v8.2.2630

patch 8.2.2630: hard to see where a test gets stuck Commit: https://github.com/vim/vim/commit/592f57f5fec1064cc276a0d7992cc543bed04fd5 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 20 16:44:25 2021 +0100 patch 8.2.2630: hard to see where a test gets stuck Problem: Hard to see where a test gets stuck. Solution: Print the executed test function. (Dominique Pell?, closes https://github.com/vim/vim/issues/7975)
author Bram Moolenaar <Bram@vim.org>
date Sat, 20 Mar 2021 16:45:02 +0100
parents 7f88f6a3ed4c
children e69e7133c9cf
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
164
8b0ee9d57d7f updated for version 7.0050
vimboss
parents: 20
diff changeset
2 " Language: Python
8b0ee9d57d7f updated for version 7.0050
vimboss
parents: 20
diff changeset
3 " Maintainer: Bram Moolenaar <Bram@vim.org>
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 " Original Author: David Bustos <bustos@caltech.edu>
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
5 " Last Change: 2019 Feb 21
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 " Only load this indent file when no other was loaded.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 if exists("b:did_indent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 let b:did_indent = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 " Some preliminary settings
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 setlocal nolisp " Make sure lisp indenting doesn't supersede us
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 setlocal autoindent " indentexpr isn't much help otherwise
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 setlocal indentexpr=GetPythonIndent(v:lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 setlocal indentkeys+=<:>,=elif,=except
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 " Only define the function once.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 if exists("*GetPythonIndent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 endif
3507
8201108e9cf0 More runtime file fixes for 'compatible' mode.
Bram Moolenaar <bram@vim.org>
parents: 3496
diff changeset
24 let s:keepcpo= &cpo
8201108e9cf0 More runtime file fixes for 'compatible' mode.
Bram Moolenaar <bram@vim.org>
parents: 3496
diff changeset
25 set cpo&vim
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26
170
8c60f65311fa updated for version 7.0052
vimboss
parents: 164
diff changeset
27 " Come here when loading the script the first time.
8c60f65311fa updated for version 7.0052
vimboss
parents: 164
diff changeset
28
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 let s:maxoff = 50 " maximum number of lines to look backwards for ()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30
20379
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
31 " See if the specified line is already user-dedented from the expected value.
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
32 function s:Dedented(lnum, expected)
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
33 return indent(a:lnum) <= a:expected - shiftwidth()
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
34 endfunction
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
35
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 function GetPythonIndent(lnum)
856
8cd729851562 updated for version 7.0g
vimboss
parents: 840
diff changeset
37
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 " If this line is explicitly joined: If the previous line was also joined,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 " line it up with that one, otherwise add two 'shiftwidth'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 if getline(a:lnum - 1) =~ '\\$'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 if a:lnum > 1 && getline(a:lnum - 2) =~ '\\$'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 return indent(a:lnum - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 endif
4992
ceb5f21cda79 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3507
diff changeset
44 return indent(a:lnum - 1) + (exists("g:pyindent_continue") ? eval(g:pyindent_continue) : (shiftwidth() * 2))
7
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 " If the start of the line is in a string don't change the indent.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 if has('syntax_items')
8
7edf9b6e4c36 Various changes
vimboss
parents: 7
diff changeset
49 \ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 return -1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
53 " Search backwards for the previous non-empty line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54 let plnum = prevnonblank(v:lnum - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 if plnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57 " This is the first non-empty line, use zero indent.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58 return 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
61 call cursor(plnum, 1)
14945
4ee65b4150fd Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 5220
diff changeset
62
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
63 " Identing inside parentheses can be very slow, regardless of the searchpair()
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
64 " timeout, so let the user disable this feature if he doesn't need it
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
65 let disable_parentheses_indenting = get(g:, "pyindent_disable_parentheses_indenting", 0)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
66
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
67 if disable_parentheses_indenting == 1
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
68 let plindent = indent(plnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
69 let plnumstart = plnum
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
70 else
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
71 " searchpair() can be slow sometimes, limit the time to 150 msec or what is
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
72 " put in g:pyindent_searchpair_timeout
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
73 let searchpair_stopline = 0
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
74 let searchpair_timeout = get(g:, 'pyindent_searchpair_timeout', 150)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
75
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
76 " If the previous line is inside parenthesis, use the indent of the starting
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
77 " line.
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
78 " Trick: use the non-existing "dummy" variable to break out of the loop when
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
79 " going too far back.
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
80 let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
81 \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
82 \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
83 \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
84 \ searchpair_stopline, searchpair_timeout)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
85 if parlnum > 0
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
86 let plindent = indent(parlnum)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
87 let plnumstart = parlnum
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
88 else
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
89 let plindent = indent(plnum)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
90 let plnumstart = plnum
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
91 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
93 " When inside parenthesis: If at the first line below the parenthesis add
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
94 " two 'shiftwidth', otherwise same as previous line.
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
95 " i = (a
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
96 " + b
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
97 " + c)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
98 call cursor(a:lnum, 1)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
99 let p = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
100 \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
101 \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
102 \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
103 \ searchpair_stopline, searchpair_timeout)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
104 if p > 0
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
105 if p == plnum
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
106 " When the start is inside parenthesis, only indent one 'shiftwidth'.
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
107 let pp = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
108 \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
109 \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
110 \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
111 \ searchpair_stopline, searchpair_timeout)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
112 if pp > 0
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
113 return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : shiftwidth())
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
114 endif
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
115 return indent(plnum) + (exists("g:pyindent_open_paren") ? eval(g:pyindent_open_paren) : (shiftwidth() * 2))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 endif
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
117 if plnumstart == p
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
118 return indent(plnum)
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
119 endif
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
120 return plindent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121 endif
15932
c3c1abe7aff2 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14945
diff changeset
122
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 " Get the line and remove a trailing comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 " Use syntax highlighting attributes when possible.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128 let pline = getline(plnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 let pline_len = strlen(pline)
20
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
130 if has('syntax_items')
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
131 " If the last character in the line is a comment, do a binary search for
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
132 " the start of the comment. synID() is slow, a linear search would take
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
133 " too long on a long line.
5220
050893d44c33 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4992
diff changeset
134 if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)$"
20
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
135 let min = 1
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
136 let max = pline_len
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
137 while min < max
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
138 let col = (min + max) / 2
5220
050893d44c33 Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4992
diff changeset
139 if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)$"
20
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
140 let max = col
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
141 else
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
142 let min = col + 1
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
143 endif
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
144 endwhile
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
145 let pline = strpart(pline, 0, min - 1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
146 endif
20
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
147 else
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
148 let col = 0
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
149 while col < pline_len
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
150 if pline[col] == '#'
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
151 let pline = strpart(pline, 0, col)
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
152 break
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
153 endif
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
154 let col = col + 1
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
155 endwhile
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 8
diff changeset
156 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
157
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
158 " If the previous line ended with a colon, indent this line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
159 if pline =~ ':\s*$'
4992
ceb5f21cda79 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3507
diff changeset
160 return plindent + shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
161 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
162
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
163 " If the previous line was a stop-execution statement...
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 856
diff changeset
164 if getline(plnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
165 " See if the user has already dedented
20379
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
166 if s:Dedented(a:lnum, indent(plnum))
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
167 " If so, trust the user
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
168 return -1
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
169 endif
20379
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
170 " If not, recommend one dedent
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
171 return indent(plnum) - shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
172 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
173
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174 " If the current line begins with a keyword that lines up with "try"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 if getline(a:lnum) =~ '^\s*\(except\|finally\)\>'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
176 let lnum = a:lnum - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
177 while lnum >= 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
178 if getline(lnum) =~ '^\s*\(try\|except\)\>'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
179 let ind = indent(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
180 if ind >= indent(a:lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
181 return -1 " indent is already less than this
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
182 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
183 return ind " line up with previous try or except
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
184 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
185 let lnum = lnum - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
186 endwhile
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
187 return -1 " no matching "try"!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
188 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
189
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
190 " If the current line begins with a header keyword, dedent
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
191 if getline(a:lnum) =~ '^\s*\(elif\|else\)\>'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
192
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
193 " Unless the previous line was a one-liner
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
194 if getline(plnumstart) =~ '^\s*\(for\|if\|try\)\>'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
195 return plindent
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
196 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
197
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
198 " Or the user has already dedented
20379
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
199 if s:Dedented(a:lnum, plindent)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
200 return -1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
201 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
202
4992
ceb5f21cda79 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 3507
diff changeset
203 return plindent - shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
204 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
205
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
206 " When after a () construct we probably want to go back to the start line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
207 " a = (b
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
208 " + c)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
209 " here
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
210 if parlnum > 0
20379
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
211 " ...unless the user has already dedented
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
212 if s:Dedented(a:lnum, plindent)
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
213 return -1
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
214 else
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
215 return plindent
7f88f6a3ed4c Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 15932
diff changeset
216 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
217 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
218
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
219 return -1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
220
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
221 endfunction
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
222
3496
d1e4abe8342c Fixed compatible mode in most runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
223 let &cpo = s:keepcpo
d1e4abe8342c Fixed compatible mode in most runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
224 unlet s:keepcpo
d1e4abe8342c Fixed compatible mode in most runtime files.
Bram Moolenaar <bram@vim.org>
parents: 1121
diff changeset
225
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
226 " vim:sw=2