Mercurial > vim
changeset 2843:8dbea5adc937 v7.3.195
updated for version 7.3.195
Problem: "} else" causes following lines to be indented too much. (Rouben
Rostamian)
Solution: Better detection for the "else". (Lech Lorens)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 19 May 2011 16:35:09 +0200 |
| parents | d26e38796007 |
| children | 3059bacf05a5 |
| files | src/misc1.c src/testdir/test3.in src/testdir/test3.ok src/version.c |
| diffstat | 4 files changed, 68 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -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_comm 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;
--- a/src/testdir/test3.in +++ b/src/testdir/test3.in @@ -1345,7 +1345,7 @@ func(int a STARTTEST :set cino& -2kdd=][ +2kdd=4][ ENDTEST void func(void) @@ -1359,6 +1359,34 @@ void func(void) printf("Foo!\n"); } +void func1(void) +{ + char* tab[] = {"foo", "bar", + "baz", "quux", + "this line used", "to be indented incorrectly"}; + foo(); +} + +void func2(void) +{ + int tab[] = + {1, 2, + 3, 4, + 5, 6}; + + printf("This line used to be indented incorrectly.\n"); +} + +void func3(void) +{ + int tab[] = { + 1, 2, + 3, 4, + 5, 6}; + +printf("Don't you dare indent this line incorrectly!\n); +} + STARTTEST :set cino& 2kdd=][
--- a/src/testdir/test3.ok +++ b/src/testdir/test3.ok @@ -1216,6 +1216,34 @@ void func(void) printf("Foo!\n"); } +void func1(void) +{ + char* tab[] = {"foo", "bar", + "baz", "quux", + "this line used", "to be indented incorrectly"}; + foo(); +} + +void func2(void) +{ + int tab[] = + {1, 2, + 3, 4, + 5, 6}; + + printf("This line used to be indented incorrectly.\n"); +} + +void func3(void) +{ + int tab[] = { + 1, 2, + 3, 4, + 5, 6}; + + printf("Don't you dare indent this line incorrectly!\n); +} + void func(void) {