annotate runtime/indent/php.vim @ 10982:5e20c9f96cd5 v8.0.0380

patch 8.0.0380: with 'linebreak' double wide char wraps badly commit https://github.com/vim/vim/commit/38632faf635f6434441827e136bceb5a930c59ad Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 26 19:40:59 2017 +0100 patch 8.0.0380: with 'linebreak' double wide char wraps badly Problem: With 'linebreak' set and 'breakat' includes ">" a double-wide character results in "<<" displayed. Solution: Check for the character not to be replaced. (Ozaki Kiichi, closes #1456)
author Christian Brabandt <cb@256bit.org>
date Sun, 26 Feb 2017 19:45:04 +0100
parents 78106b0f2c56
children 214f228718cf
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: PHP
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
3 " Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr>
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
4 " URL: http://www.2072productions.com/vim/indent/php.vim
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
5 " Home: https://github.com/2072/PHP-Indenting-for-VIm
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
6 " Last Change: 2015 September 8th
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
7 " Version: 1.60
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
8 "
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
9 "
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
10 " Type :help php-indent for available options
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
11 "
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
12 " A fully commented version of this file is available on github
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
13 "
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
14 "
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
15 " If you find a bug, please open a ticket on github.org
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
16 " ( https://github.com/2072/PHP-Indenting-for-VIm/issues ) with an example of
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
17 " code that breaks the algorithm.
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
18 "
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
19
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
20 " NOTE: This script must be used with PHP syntax ON and with the php syntax
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
21 " script by Lutz Eymers (http://www.isp.de/data/php.vim ) or with the
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
22 " script by Peter Hodge (http://www.vim.org/scripts/script.php?script_id=1571 )
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
23 " the later is bunbdled by default with Vim 7.
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
24 "
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
25 "
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
26 " In the case you have syntax errors in your script such as HereDoc end
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
27 " identifiers not at col 1 you'll have to indent your file 2 times (This
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
28 " script will automatically put HereDoc end identifiers at col 1 if
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
29 " they are followed by a ';').
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
30 "
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
31
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
32 " NOTE: If you are editing files in Unix file format and that (by accident)
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
33 " there are '\r' before new lines, this script won't be able to proceed
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
34 " correctly and will make many mistakes because it won't be able to match
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
35 " '\s*$' correctly.
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
36 " So you have to remove those useless characters first with a command like:
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
37 "
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
38 " :%s /\r$//g
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 "
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
40 " or simply 'let' the option PHP_removeCRwhenUnix to 1 and the script will
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
41 " silently remove them when VIM load this script (at each bufread).
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
42
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
43
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
44
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 if exists("b:did_indent")
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
46 finish
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 let b:did_indent = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
50
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
51 let g:php_sync_method = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
52
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
53 if exists('*shiftwidth')
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
54 function! s:sw()
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
55 return shiftwidth()
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
56 endfunction
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
57 else
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
58 function! s:sw()
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
59 return &shiftwidth
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
60 endfunction
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
61 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
62
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
63
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
64 if exists("PHP_default_indenting")
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
65 let b:PHP_default_indenting = PHP_default_indenting * s:sw()
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
66 else
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
67 let b:PHP_default_indenting = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
68 endif
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
69
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
70 if exists("PHP_outdentSLComments")
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
71 let b:PHP_outdentSLComments = PHP_outdentSLComments * s:sw()
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
72 else
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
73 let b:PHP_outdentSLComments = 0
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
74 endif
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
75
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
76 if exists("PHP_BracesAtCodeLevel")
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
77 let b:PHP_BracesAtCodeLevel = PHP_BracesAtCodeLevel
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
78 else
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
79 let b:PHP_BracesAtCodeLevel = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
80 endif
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
81
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
82
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
83 if exists("PHP_autoformatcomment")
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
84 let b:PHP_autoformatcomment = PHP_autoformatcomment
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
85 else
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
86 let b:PHP_autoformatcomment = 1
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
87 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
88
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
89 if exists("PHP_outdentphpescape")
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
90 let b:PHP_outdentphpescape = PHP_outdentphpescape
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
91 else
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
92 let b:PHP_outdentphpescape = 1
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
93 endif
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
94
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
95
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
96 if exists("PHP_vintage_case_default_indent") && PHP_vintage_case_default_indent
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
97 let b:PHP_vintage_case_default_indent = 1
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
98 else
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
99 let b:PHP_vintage_case_default_indent = 0
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
100 endif
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
101
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
102
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
103
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
104 let b:PHP_lastindented = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
105 let b:PHP_indentbeforelast = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
106 let b:PHP_indentinghuge = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
107 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
108 let b:PHP_LastIndentedWasComment = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
109 let b:PHP_InsideMultilineComment = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
110 let b:InPHPcode = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
111 let b:InPHPcode_checked = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
112 let b:InPHPcode_and_script = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
113 let b:InPHPcode_tofind = ""
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
114 let b:PHP_oldchangetick = b:changedtick
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
115 let b:UserIsTypingComment = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
116 let b:optionsset = 0
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
117
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
118 setlocal nosmartindent
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
119 setlocal noautoindent
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
120 setlocal nocindent
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
121 setlocal nolisp
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
122
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
123 setlocal indentexpr=GetPhpIndent()
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
124 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e,*<Return>,=?>,=<?,=*/
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
125
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
126
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
127
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
128 let s:searchpairflags = 'bWr'
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
129
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
130 if &fileformat == "unix" && exists("PHP_removeCRwhenUnix") && PHP_removeCRwhenUnix
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
131 silent! %s/\r$//g
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
132 endif
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
133
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134 if exists("*GetPhpIndent")
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
135 call ResetPhpOptions()
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
136 finish
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
137 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
138
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
139
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
140 let s:PHP_validVariable = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
141 let s:notPhpHereDoc = '\%(break\|return\|continue\|exit\|die\|else\)'
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
142 let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|\%(}\s*\)\?else\>\|do\>\|while\>\|switch\>\|case\>\|default\>\|for\%(each\)\=\>\|declare\>\|class\>\|trait\>\|use\>\|interface\>\|abstract\>\|final\>\|try\>\|\%(}\s*\)\=catch\>\|\%(}\s*\)\=finally\>\)'
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
143 let s:functionDecl = '\<function\>\%(\s\+'.s:PHP_validVariable.'\)\=\s*(.*'
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
144 let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$'
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
145
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
146
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
147 let s:terminated = '\%(\%(;\%(\s*\%(?>\|}\)\)\=\|<<<\s*[''"]\=\a\w*[''"]\=$\|^\s*}\|^\s*'.s:PHP_validVariable.':\)'.s:endline.'\)\|^[^''"`]*[''"`]$'
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
148 let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
149
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
150
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
151
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
152 let s:escapeDebugStops = 0
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
153 function! DebugPrintReturn(scriptLine)
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
154
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
155 if ! s:escapeDebugStops
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
156 echo "debug:" . a:scriptLine
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
157 let c = getchar()
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
158 if c == "\<Del>"
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
159 let s:escapeDebugStops = 1
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
160 end
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
161 endif
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
162
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
163 endfunction
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
164
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
165 function! GetLastRealCodeLNum(startline) " {{{
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
166
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
167 let lnum = a:startline
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
168
631
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
169 if b:GetLastRealCodeLNum_ADD && b:GetLastRealCodeLNum_ADD == lnum + 1
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
170 let lnum = b:GetLastRealCodeLNum_ADD
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
171 endif
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
172
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
173 while lnum > 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
174 let lnum = prevnonblank(lnum)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
175 let lastline = getline(lnum)
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
176
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
177 if b:InPHPcode_and_script && lastline =~ '?>\s*$'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
178 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
179 elseif lastline =~ '^\s*?>.*<?\%(php\)\=\s*$'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
180 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
181 elseif lastline =~ '^\s*\%(//\|#\|/\*.*\*/\s*$\)'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
182 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
183 elseif lastline =~ '\*/\s*$'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
184 call cursor(lnum, 1)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
185 if lastline !~ '^\*/'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
186 call search('\*/', 'W')
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
187 endif
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
188 let lnum = searchpair('/\*', '', '\*/', s:searchpairflags, 'Skippmatch2()')
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
189
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
190 let lastline = getline(lnum)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
191 if lastline =~ '^\s*/\*'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
192 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
193 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
194 break
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
195 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
196
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
197
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
198 elseif lastline =~? '\%(//\s*\|?>.*\)\@<!<?\%(php\)\=\s*$\|^\s*<script\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
199
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
200 while lastline !~ '\(<?.*\)\@<!?>' && lnum > 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
201 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
202 let lastline = getline(lnum)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
203 endwhile
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
204 if lastline =~ '^\s*?>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
205 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
206 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
207 break
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
208 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
209
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
210
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
211 elseif lastline =~? '^\a\w*;\=$' && lastline !~? s:notPhpHereDoc
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
212 let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<\\s*[''"]\\=\1[''"]\\=$', '')
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
213 while getline(lnum) !~? tofind && lnum > 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
214 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
215 endwhile
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
216 elseif lastline =~ '^[^''"`]*[''"`][;,]'.s:endline
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
217 let tofind=substitute( lastline, '^.*\([''"`]\)[;,].*$', '^[^\1]\\+[\1]$', '')
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
218 while getline(lnum) !~? tofind && lnum > 1
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
219 let lnum = lnum - 1
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
220 endwhile
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
221 else
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
222 break
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
223 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
224 endwhile
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
225
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
226 if lnum==1 && getline(lnum) !~ '<?'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
227 let lnum=0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
228 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
229
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
230 if b:InPHPcode_and_script && 1 > b:InPHPcode
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
231 let b:InPHPcode_and_script = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
232 endif
1120
e6db096b07a1 updated for version 7.1a
vimboss
parents: 856
diff changeset
233
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
234 return lnum
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
235 endfunction " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
236
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
237 function! Skippmatch2()
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
238
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
239 let line = getline(".")
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
240
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
241 if line =~ "\\([\"']\\).*/\\*.*\\1" || line =~ '\%(//\|#\).*/\*'
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
242 return 1
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
243 else
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
244 return 0
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
245 endif
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
246 endfun
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
247
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
248 function! Skippmatch() " {{{
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
249 let synname = synIDattr(synID(line("."), col("."), 0), "name")
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
250 if synname == "Delimiter" || synname == "phpRegionDelimiter" || synname =~# "^phpParent" || synname == "phpArrayParens" || synname =~# '^php\%(Block\|Brace\)' || synname == "javaScriptBraces" || synname =~# '^php\%(Doc\)\?Comment' && b:UserIsTypingComment
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
251 return 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
252 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
253 return 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
254 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
255 endfun " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
256
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
257 function! FindOpenBracket(lnum, blockStarter) " {{{
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
258 call cursor(a:lnum, 1)
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
259 let line = searchpair('{', '', '}', 'bW', 'Skippmatch()')
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
260
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
261 if a:blockStarter == 1
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
262 while line > 1
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
263 let linec = getline(line)
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
264
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
265 if linec =~ s:terminated || linec =~ '^\s*\%(' . s:blockstart . '\)\|'. s:functionDecl . s:endline
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
266 break
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
267 endif
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
268
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
269 let line = GetLastRealCodeLNum(line - 1)
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
270 endwhile
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
271 endif
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
272
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
273 return line
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
274 endfun " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
275
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
276 function! FindTheIfOfAnElse (lnum, StopAfterFirstPrevElse) " {{{
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
277
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
278 if getline(a:lnum) =~# '^\s*}\s*else\%(if\)\=\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
279 let beforeelse = a:lnum
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
280 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
281 let beforeelse = GetLastRealCodeLNum(a:lnum - 1)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
282 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
283
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
284 if !s:level
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
285 let s:iftoskip = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
286 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
287
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
288 if getline(beforeelse) =~# '^\s*\%(}\s*\)\=else\%(\s*if\)\@!\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
289 let s:iftoskip = s:iftoskip + 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
290 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
291
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
292 if getline(beforeelse) =~ '^\s*}'
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
293 let beforeelse = FindOpenBracket(beforeelse, 0)
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
294
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
295 if getline(beforeelse) =~ '^\s*{'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
296 let beforeelse = GetLastRealCodeLNum(beforeelse - 1)
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
297 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
298 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
299
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
300
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
301 if !s:iftoskip && a:StopAfterFirstPrevElse && getline(beforeelse) =~# '^\s*\%([}]\s*\)\=else\%(if\)\=\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
302 return beforeelse
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
303 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
304
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
305 if getline(beforeelse) !~# '^\s*if\>' && beforeelse>1 || s:iftoskip && beforeelse>1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
306
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
307 if s:iftoskip && getline(beforeelse) =~# '^\s*if\>'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
308 let s:iftoskip = s:iftoskip - 1
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
309 endif
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
310
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
311 let s:level = s:level + 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
312 let beforeelse = FindTheIfOfAnElse(beforeelse, a:StopAfterFirstPrevElse)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
313 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
314
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
315 return beforeelse
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
316
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
317 endfunction " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
318
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
319 let s:defaultORcase = '^\s*\%(default\|case\).*:'
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
320
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
321 function! FindTheSwitchIndent (lnum) " {{{
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
322
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
323 let test = GetLastRealCodeLNum(a:lnum - 1)
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
324
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
325 if test <= 1
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
326 return indent(1) - s:sw() * b:PHP_vintage_case_default_indent
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
327 end
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
328
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
329 while getline(test) =~ '^\s*}' && test > 1
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
330 let test = GetLastRealCodeLNum(FindOpenBracket(test, 0) - 1)
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
331
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
332 if getline(test) =~ '^\s*switch\>'
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
333 let test = GetLastRealCodeLNum(test - 1)
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
334 endif
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
335 endwhile
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
336
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
337 if getline(test) =~# '^\s*switch\>'
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
338 return indent(test)
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
339 elseif getline(test) =~# s:defaultORcase
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
340 return indent(test) - s:sw() * b:PHP_vintage_case_default_indent
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
341 else
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
342 return FindTheSwitchIndent(test)
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
343 endif
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
344
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
345 endfunction "}}}
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
346
5294
359743c1f59a release version 7.4
Bram Moolenaar <bram@vim.org>
parents: 5277
diff changeset
347 let s:SynPHPMatchGroups = {'phpParent':1, 'Delimiter':1, 'Define':1, 'Storageclass':1, 'StorageClass':1, 'Structure':1, 'Exception':1}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
348 function! IslinePHP (lnum, tofind) " {{{
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
349 let cline = getline(a:lnum)
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
350
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
351 if a:tofind==""
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
352 let tofind = "^\\s*[\"'`]*\\s*\\zs\\S"
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
353 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
354 let tofind = a:tofind
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
355 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
356
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
357 let tofind = tofind . '\c'
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
358
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
359 let coltotest = match (cline, tofind) + 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
360
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
361 let synname = synIDattr(synID(a:lnum, coltotest, 0), "name")
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
362
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
363 if synname == 'phpStringSingle' || synname == 'phpStringDouble' || synname == 'phpBacktick'
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
364 if cline !~ '^\s*[''"`]'
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
365 return "SpecStringEntrails"
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
366 else
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
367 return synname
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
368 end
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
369 end
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
370
5277
42bf9264e64e Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 4502
diff changeset
371 if get(s:SynPHPMatchGroups, synname) || synname =~ '^php' || synname =~? '^javaScript'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
372 return synname
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
373 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
374 return ""
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
375 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
376 endfunction " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
377
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
378 let s:autoresetoptions = 0
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
379 if ! s:autoresetoptions
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
380 let s:autoresetoptions = 1
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
381 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
383 function! ResetPhpOptions()
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
384 if ! b:optionsset && &filetype =~ "php"
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
385 if b:PHP_autoformatcomment
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
386
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
387 setlocal comments=s1:/*,mb:*,ex:*/,://,:#
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
388
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
389 setlocal formatoptions-=t
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
390 setlocal formatoptions+=q
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
391 setlocal formatoptions+=r
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
392 setlocal formatoptions+=o
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
393 setlocal formatoptions+=c
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
394 setlocal formatoptions+=b
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
395 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
396 let b:optionsset = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
397 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
398 endfunc
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
399
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
400 call ResetPhpOptions()
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
401
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
402 function! GetPhpIndent()
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
403
631
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
404 let b:GetLastRealCodeLNum_ADD = 0
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
405
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
406 let UserIsEditing=0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
407 if b:PHP_oldchangetick != b:changedtick
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
408 let b:PHP_oldchangetick = b:changedtick
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
409 let UserIsEditing=1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
410 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
411
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
412 if b:PHP_default_indenting
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
413 let b:PHP_default_indenting = g:PHP_default_indenting * s:sw()
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
414 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
415
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
416 let cline = getline(v:lnum)
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
417
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
418 if !b:PHP_indentinghuge && b:PHP_lastindented > b:PHP_indentbeforelast
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
419 if b:PHP_indentbeforelast
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
420 let b:PHP_indentinghuge = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
421 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
422 let b:PHP_indentbeforelast = b:PHP_lastindented
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
423 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
424
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
425 if b:InPHPcode_checked && prevnonblank(v:lnum - 1) != b:PHP_lastindented
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
426 if b:PHP_indentinghuge
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
427 let b:PHP_indentinghuge = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
428 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
429 endif
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
430 let real_PHP_lastindented = v:lnum
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
431 let b:PHP_LastIndentedWasComment=0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
432 let b:PHP_InsideMultilineComment=0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
433 let b:PHP_indentbeforelast = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
434
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
435 let b:InPHPcode = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
436 let b:InPHPcode_checked = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
437 let b:InPHPcode_and_script = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
438 let b:InPHPcode_tofind = ""
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
439
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
440 elseif v:lnum > b:PHP_lastindented
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
441 let real_PHP_lastindented = b:PHP_lastindented
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
442 else
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
443 let real_PHP_lastindented = v:lnum
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
444 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
445
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
446 let b:PHP_lastindented = v:lnum
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
447
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
448
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
449 if !b:InPHPcode_checked " {{{ One time check
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
450 let b:InPHPcode_checked = 1
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
451 let b:UserIsTypingComment = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
452
631
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
453 let synname = ""
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
454 if cline !~ '<?.*?>'
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
455 let synname = IslinePHP (prevnonblank(v:lnum), "")
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
456 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
457
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
458 if synname!=""
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
459 if synname == "SpecStringEntrails"
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
460 let b:InPHPcode = -1
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
461 let b:InPHPcode_tofind = ""
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
462 elseif synname != "phpHereDoc" && synname != "phpHereDocDelimiter"
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
463 let b:InPHPcode = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
464 let b:InPHPcode_tofind = ""
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
465
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
466 if synname =~# '^php\%(Doc\)\?Comment'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
467 let b:UserIsTypingComment = 1
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
468 let b:InPHPcode_checked = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
469 endif
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
470
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
471 if synname =~? '^javaScript'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
472 let b:InPHPcode_and_script = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
473 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
474
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
475 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
476 let b:InPHPcode = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
477
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
478 let lnum = v:lnum - 1
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
479 while getline(lnum) !~? '<<<\s*[''"]\=\a\w*[''"]\=$' && lnum > 1
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
480 let lnum = lnum - 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
481 endwhile
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
482
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
483 let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<\s*[''"]\=\(\a\w*\)[''"]\=$', '^\\s*\1;\\=$', '')
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
484 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
485 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
486 let b:InPHPcode = 0
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
487 let b:InPHPcode_tofind = s:PHP_startindenttag
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
488 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
489 endif "!b:InPHPcode_checked }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
490
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
491
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
492 " Test if we are indenting PHP code {{{
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
493 let lnum = prevnonblank(v:lnum - 1)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
494 let last_line = getline(lnum)
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
495 let endline= s:endline
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
496
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
497 if b:InPHPcode_tofind!=""
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
498 if cline =~? b:InPHPcode_tofind
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
499 let b:InPHPcode_tofind = ""
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
500 let b:UserIsTypingComment = 0
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
501
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
502 if b:InPHPcode == -1
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
503 let b:InPHPcode = 1
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
504 return -1
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
505 end
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
506
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
507 let b:InPHPcode = 1
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
508
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
509 if cline =~ '\*/'
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
510 call cursor(v:lnum, 1)
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
511 if cline !~ '^\*/'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
512 call search('\*/', 'W')
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
513 endif
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
514 let lnum = searchpair('/\*', '', '\*/', s:searchpairflags, 'Skippmatch2()')
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
515
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
516 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
517
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
518 let b:PHP_LastIndentedWasComment = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
519
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
520 if cline =~ '^\s*\*/'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
521 return indent(lnum) + 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
522 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
523 return indent(lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
525
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
526 elseif cline =~? '<script\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
527 let b:InPHPcode_and_script = 1
631
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
528 let b:GetLastRealCodeLNum_ADD = v:lnum
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
529 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
531 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
532
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
533 if 1 == b:InPHPcode
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
534
1120
e6db096b07a1 updated for version 7.1a
vimboss
parents: 856
diff changeset
535 if !b:InPHPcode_and_script && last_line =~ '\%(<?.*\)\@<!?>\%(.*<?\)\@!' && IslinePHP(lnum, '?>')=~"Delimiter"
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
536 if cline !~? s:PHP_startindenttag
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
537 let b:InPHPcode = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
538 let b:InPHPcode_tofind = s:PHP_startindenttag
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
539 elseif cline =~? '<script\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
540 let b:InPHPcode_and_script = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
541 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
542
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
543 elseif last_line =~ '^[^''"`]\+[''"`]$'
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
544 let b:InPHPcode = -1
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
545 let b:InPHPcode_tofind = substitute( last_line, '^.*\([''"`]\).*$', '^[^\1]*\1[;,]$', '')
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
546 elseif last_line =~? '<<<\s*[''"]\=\a\w*[''"]\=$'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
547 let b:InPHPcode = 0
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
548 let b:InPHPcode_tofind = substitute( last_line, '^.*<<<\s*[''"]\=\(\a\w*\)[''"]\=$', '^\\s*\1;\\=$', '')
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
549
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
550 elseif !UserIsEditing && cline =~ '^\s*/\*\%(.*\*/\)\@!' && getline(v:lnum + 1) !~ '^\s*\*'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
551 let b:InPHPcode = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
552 let b:InPHPcode_tofind = '\*/'
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
553
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
554 elseif cline =~? '^\s*</script>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
555 let b:InPHPcode = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
556 let b:InPHPcode_tofind = s:PHP_startindenttag
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
557 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
558 endif " }}}
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
559
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
560
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
561 if 1 > b:InPHPcode && !b:InPHPcode_and_script
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
562 return -1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
563 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
564
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
565 " Indent successive // or # comment the same way the first is {{{
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
566 let addSpecial = 0
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
567 if cline =~ '^\s*\%(//\|#\|/\*.*\*/\s*$\)'
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
568 let addSpecial = b:PHP_outdentSLComments
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
569 if b:PHP_LastIndentedWasComment == 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
570 return indent(real_PHP_lastindented)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
571 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
572 let b:PHP_LastIndentedWasComment = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
573 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
574 let b:PHP_LastIndentedWasComment = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
575 endif " }}}
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
576
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
577 " Indent multiline /* comments correctly {{{
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
578
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
579 if b:PHP_InsideMultilineComment || b:UserIsTypingComment
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
580 if cline =~ '^\s*\*\%(\/\)\@!'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
581 if last_line =~ '^\s*/\*'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
582 return indent(lnum) + 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
583 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
584 return indent(lnum)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
585 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
586 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
587 let b:PHP_InsideMultilineComment = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
588 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
589 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
590
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
591 if !b:PHP_InsideMultilineComment && cline =~ '^\s*/\*\%(.*\*/\)\@!'
631
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
592 if getline(v:lnum + 1) !~ '^\s*\*'
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
593 return -1
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
594 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
595 let b:PHP_InsideMultilineComment = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
596 endif " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
597
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
598
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
599 " Things always indented at col 1 (PHP delimiter: <?, ?>, Heredoc end) {{{
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
600 if cline =~# '^\s*<?' && cline !~ '?>' && b:PHP_outdentphpescape
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
601 return 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
602 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
603
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
604 if cline =~ '^\s*?>' && cline !~# '<?' && b:PHP_outdentphpescape
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
605 return 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
606 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
607
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
608 if cline =~? '^\s*\a\w*;$\|^\a\w*$\|^\s*[''"`][;,]' && cline !~? s:notPhpHereDoc
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
609 return 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
610 endif " }}}
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
611
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
612 let s:level = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
613
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
614 let lnum = GetLastRealCodeLNum(v:lnum - 1)
631
68a196b7504d updated for version 7.0182
vimboss
parents: 557
diff changeset
615
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
616 let last_line = getline(lnum)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
617 let ind = indent(lnum)
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
618
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
619 if ind==0 && b:PHP_default_indenting
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
620 let ind = b:PHP_default_indenting
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
621 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
622
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
623 if lnum == 0
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
624 return b:PHP_default_indenting + addSpecial
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
625 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
626
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
627
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
628 if cline =~ '^\s*}\%(}}\)\@!'
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
629 let ind = indent(FindOpenBracket(v:lnum, 1))
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
630 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
631 return ind
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
632 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
633
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
634 if cline =~ '^\s*\*/'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
635 call cursor(v:lnum, 1)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
636 if cline !~ '^\*/'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
637 call search('\*/', 'W')
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
638 endif
557
862863033fdd updated for version 7.0158
vimboss
parents: 532
diff changeset
639 let lnum = searchpair('/\*', '', '\*/', s:searchpairflags, 'Skippmatch2()')
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
640
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
641 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
642
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
643 if cline =~ '^\s*\*/'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
644 return indent(lnum) + 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
645 else
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
646 return indent(lnum)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
647 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
648 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
649
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
650
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
651 if last_line =~ '[;}]'.endline && last_line !~ '^[)\]]' && last_line !~# s:defaultORcase
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
652 if ind==b:PHP_default_indenting
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
653 return b:PHP_default_indenting + addSpecial
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
654 elseif b:PHP_indentinghuge && ind==b:PHP_CurrentIndentLevel && cline !~# '^\s*\%(else\|\%(case\|default\).*:\|[})];\=\)' && last_line !~# '^\s*\%(\%(}\s*\)\=else\)' && getline(GetLastRealCodeLNum(lnum - 1))=~';'.endline
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
655 return b:PHP_CurrentIndentLevel + addSpecial
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
656 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
657 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
658
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
659 let LastLineClosed = 0
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
660
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
661 let terminated = s:terminated
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
662
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
663 let unstated = '\%(^\s*'.s:blockstart.'.*)\|\%(//.*\)\@<!\<e'.'lse\>\)'.endline
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
664
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
665 if ind != b:PHP_default_indenting && cline =~# '^\s*else\%(if\)\=\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
666 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
667 return indent(FindTheIfOfAnElse(v:lnum, 1))
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
668 elseif cline =~# s:defaultORcase
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
669 return FindTheSwitchIndent(v:lnum) + s:sw() * b:PHP_vintage_case_default_indent
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
670 elseif cline =~ '^\s*)\=\s*{'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
671 let previous_line = last_line
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
672 let last_line_num = lnum
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
673
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
674 while last_line_num > 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
675
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
676 if previous_line =~ terminated || previous_line =~ '^\s*\%(' . s:blockstart . '\)\|'. s:functionDecl . endline
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
677
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
678 let ind = indent(last_line_num)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
679
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
680 if b:PHP_BracesAtCodeLevel
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
681 let ind = ind + s:sw()
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
682 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
683
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
684 return ind
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
685 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
686
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
687 let last_line_num = GetLastRealCodeLNum(last_line_num - 1)
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
688 let previous_line = getline(last_line_num)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
689 endwhile
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
690
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
691 elseif last_line =~# unstated && cline !~ '^\s*);\='.endline
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
692 let ind = ind + s:sw()
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
693 return ind + addSpecial
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
694
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
695 elseif (ind != b:PHP_default_indenting || last_line =~ '^[)\]]' ) && last_line =~ terminated
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
696 let previous_line = last_line
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
697 let last_line_num = lnum
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
698 let LastLineClosed = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
699
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
700 let isSingleLineBlock = 0
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
701 while 1
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
702 if ! isSingleLineBlock && previous_line =~ '^\s*}\|;\s*}'.endline
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
703
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
704 call cursor(last_line_num, 1)
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
705 if previous_line !~ '^}'
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
706 call search('}\|;\s*}'.endline, 'W')
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
707 end
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
708 let oldLastLine = last_line_num
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
709 let last_line_num = searchpair('{', '', '}', 'bW', 'Skippmatch()')
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
710
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
711 if getline(last_line_num) =~ '^\s*{'
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
712 let last_line_num = GetLastRealCodeLNum(last_line_num - 1)
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
713 elseif oldLastLine == last_line_num
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
714 let isSingleLineBlock = 1
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
715 continue
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
716 endif
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
717
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
718 let previous_line = getline(last_line_num)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
719
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
720 continue
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
721 else
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
722 let isSingleLineBlock = 0
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
723
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
724 if getline(last_line_num) =~# '^\s*else\%(if\)\=\>'
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
725 let last_line_num = FindTheIfOfAnElse(last_line_num, 0)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
726 continue
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
727 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
728
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
729
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
730 let last_match = last_line_num
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
731
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
732 let one_ahead_indent = indent(last_line_num)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
733 let last_line_num = GetLastRealCodeLNum(last_line_num - 1)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
734 let two_ahead_indent = indent(last_line_num)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
735 let after_previous_line = previous_line
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
736 let previous_line = getline(last_line_num)
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
737
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
738
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
739 if previous_line =~# s:defaultORcase.'\|{'.endline
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
740 break
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
741 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
742
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
743 if after_previous_line=~# '^\s*'.s:blockstart.'.*)'.endline && previous_line =~# '[;}]'.endline
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
744 break
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
745 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
746
856
8cd729851562 updated for version 7.0g
vimboss
parents: 631
diff changeset
747 if one_ahead_indent == two_ahead_indent || last_line_num < 1
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
748 if previous_line =~# '\%(;\|^\s*}\)'.endline || last_line_num < 1
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
749 break
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
750 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
751 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
752 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
753 endwhile
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
754
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
755 if indent(last_match) != ind
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
756 let ind = indent(last_match)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
757 let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
758
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
759 return ind + addSpecial
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
760 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
761 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
762
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
763 if (last_line !~ '^\s*}\%(}}\)\@!')
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
764 let plinnum = GetLastRealCodeLNum(lnum - 1)
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
765 else
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
766 let plinnum = GetLastRealCodeLNum(FindOpenBracket(lnum, 1) - 1)
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
767 endif
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
768
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
769 let AntepenultimateLine = getline(plinnum)
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
770
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
771 let last_line = substitute(last_line,"\\(//\\|#\\)\\(\\(\\([^\"']*\\([\"']\\)[^\"']*\\5\\)\\+[^\"']*$\\)\\|\\([^\"']*$\\)\\)",'','')
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
772
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
773
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
774 if ind == b:PHP_default_indenting
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
775 if last_line =~ terminated && last_line !~# s:defaultORcase
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
776 let LastLineClosed = 1
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
777 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
778 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
779
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
780 if !LastLineClosed
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
781
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1668
diff changeset
782
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
783 if last_line =~# '[{(\[]'.endline || last_line =~? '\h\w*\s*(.*,$' && AntepenultimateLine !~ '[,(\[]'.endline
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
784
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
785 let dontIndent = 0
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
786 if last_line =~ '\S\+\s*{'.endline && last_line !~ '^\s*)\s*{'.endline && last_line !~ '^\s*\%(' . s:blockstart . '\)\|'. s:functionDecl . s:endline
5862
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
787 let dontIndent = 1
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
788 endif
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
789
306caa30d83b Runtime file updates.
Bram Moolenaar <bram@vim.org>
parents: 5618
diff changeset
790 if !dontIndent && (!b:PHP_BracesAtCodeLevel || last_line !~# '^\s*{')
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
791 let ind = ind + s:sw()
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
792 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
793
2442
14f01499dd16 More updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
794 if b:PHP_BracesAtCodeLevel || b:PHP_vintage_case_default_indent == 1
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
795 let b:PHP_CurrentIndentLevel = ind
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
796
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
797 return ind + addSpecial
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
798 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
799
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
800 elseif last_line =~ '\S\+\s*),'.endline
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
801 call cursor(lnum, 1)
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
802 call search('),'.endline, 'W')
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
803 let openedparent = searchpair('(', '', ')', 'bW', 'Skippmatch()')
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
804 if openedparent != lnum
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
805 let ind = indent(openedparent)
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
806 endif
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
807
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
808 elseif last_line =~ '^\s*'.s:blockstart
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
809 let ind = ind + s:sw()
1668
0b796e045c42 updated for version 7.2b-000
vimboss
parents: 1619
diff changeset
810
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
811
6421
5d89d9b40499 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 5862
diff changeset
812 elseif AntepenultimateLine =~ '{'.endline || AntepenultimateLine =~ terminated || AntepenultimateLine =~# s:defaultORcase
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
813 let ind = ind + s:sw()
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
814 endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
815
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
816 endif
409
e6fd82f42ba0 updated for version 7.0107
vimboss
parents: 227
diff changeset
817
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
818 if cline =~ '^\s*[)\]];\='
7992
78106b0f2c56 commit https://github.com/vim/vim/commit/cbebd4879cc78e670d79b2c57dc33d7b911c962a
Christian Brabandt <cb@256bit.org>
parents: 6421
diff changeset
819 let ind = ind - s:sw()
532
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
820 endif
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
821
7052f11a3dc9 updated for version 7.0150
vimboss
parents: 481
diff changeset
822 let b:PHP_CurrentIndentLevel = ind
4502
605c9ce57ec3 Updated runtime files, language files and translations.
Bram Moolenaar <bram@vim.org>
parents: 2442
diff changeset
823 return ind + addSpecial
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
824 endfunction