thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.195

Browse Source 
Problem:    "} else" causes following lines to be indented too much. (Rouben
            Rostamian)
Solution:   Better detection for the "else". (Lech Lorens)
This commit is contained in:
Bram Moolenaar
2011-05-19 16:35:09 +02:00
parent 1385c3ee7f
commit 496f9517cb
4 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/misc1.c
View File

@@ -5482,8 +5482,8 @@ cin_islinecomment(p)
* Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or
* '}'.
* Don't consider "} else" a terminated line.
* Don't consider a line where there are unmatched opening braces before '}',
* ';' or ',' a terminated line.
* If a line begins with an "else", only consider it terminated if no unmatched
* opening braces follow (handle "else { foo();" correctly).
* Return the character terminating the line (ending char's have precedence if
* both apply in order to determine initializations).
*/
@@ -5493,21 +5493,25 @@ cin_isterminated(s, incl_open, incl_comma)
int incl_open; /* include '{' at the end as terminator */
int incl_comma; /* recognize a trailing comma */
{
char_u found_start = 0;
unsigned n_open = 0;
char_u found_start = 0;
unsigned n_open = 0;
int is_else = FALSE;
s = cin_skipcomment(s);
if (*s == '{' || (*s == '}' && !cin_iselse(s)))
found_start = *s;
if (!found_start)
is_else = cin_iselse(s);
while (*s)
{
/* skip over comments, "" strings and 'c'haracters */
s = skip_string(cin_skipcomment(s));
if (*s == '}' && n_open > 0)
--n_open;
if (n_open == 0
if ((!is_else || n_open == 0)
&& (*s == ';' || *s == '}' || (incl_comma && *s == ','))
&& cin_nocode(s + 1))
return *s;