From 089af18d1fd0961ff504ee72db0156bbfe509cdf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 7 Oct 2015 11:41:49 +0200 Subject: patch 7.4.891 Problem: Indentation of array initializer is wrong. Solution: Avoid that calling find_start_rawstring() changes the position returned by find_start_comment(), add a test. (Hirohito Higashi) --- src/misc1.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/misc1.c') diff --git a/src/misc1.c b/src/misc1.c index 7eb3dce8b..60e814694 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -5345,8 +5345,19 @@ find_start_comment(ind_maxcomment) /* XXX */ static pos_T * ind_find_start_CORS() /* XXX */ { - pos_T *comment_pos = find_start_comment(curbuf->b_ind_maxcomment); - pos_T *rs_pos = find_start_rawstring(curbuf->b_ind_maxcomment); + static pos_T comment_pos_copy; + pos_T *comment_pos; + pos_T *rs_pos; + + comment_pos = find_start_comment(curbuf->b_ind_maxcomment); + if (comment_pos != NULL) + { + /* Need to make a copy of the static pos in findmatchlimit(), + * calling find_start_rawstring() may change it. */ + comment_pos_copy = *comment_pos; + comment_pos = &comment_pos_copy; + } + rs_pos = find_start_rawstring(curbuf->b_ind_maxcomment); /* If comment_pos is before rs_pos the raw string is inside the comment. * If rs_pos is before comment_pos the comment is inside the raw string. */ @@ -8334,7 +8345,8 @@ get_c_indent() if (terminated == 0 || (lookfor != LOOKFOR_UNTERM && terminated == ',')) { - if (*skipwhite(l) == '[' || l[STRLEN(l) - 1] == '[') + if (lookfor != LOOKFOR_ENUM_OR_INIT && + (*skipwhite(l) == '[' || l[STRLEN(l) - 1] == '[')) amount += ind_continuation; /* * if we're in the middle of a paren thing, @@ -8576,7 +8588,10 @@ get_c_indent() */ l = ml_get_curline(); amount = cur_amount; - if (*skipwhite(l) == ']' || l[STRLEN(l) - 1] == ']') + + n = (int)STRLEN(l); + if (terminated == ',' && (*skipwhite(l) == ']' + || (n >=2 && l[n - 2] == ']'))) break; /* -- cgit v1.2.1