aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

updated for version 7.4.350

Browse Source 
Problem:    Using C indenting for Javascript does not work well for a {} block
            inside parenthesis.
Solution:   When looking for a matching paren ignore one that is before the
            start of a {} block.
This commit is contained in:
Bram Moolenaar
2014-07-02 18:27:48 +02:00
parent dab70c63e1
commit 81439a6d1b
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/misc1.c
View File

@@ -6614,7 +6614,7 @@ find_start_brace() /* XXX */
}
/*
* Find the matching '(', failing if it is in a comment.
* Find the matching '(', ignoring it if it is in a comment.
* Return NULL if no match found.
*/
static pos_T *
@@ -6644,6 +6644,32 @@ find_match_paren(ind_maxparen) /* XXX */
return trypos;
}
/*
* Find the matching '(', ignoring it if it is in a comment or before an
* unmatched {.
* Return NULL if no match found.
*/
static pos_T *
find_match_paren_after_brace(ind_maxparen) /* XXX */
int ind_maxparen;
{
pos_T *trypos = find_match_paren(ind_maxparen);
if (trypos != NULL)
{
pos_T *tryposBrace = find_start_brace();
/* If both an unmatched '(' and '{' is found. Ignore the '('
* position if the '{' is further down. */
if (tryposBrace != NULL
&& (trypos->lnum != tryposBrace->lnum
? trypos->lnum < tryposBrace->lnum
: trypos->col < tryposBrace->col))
trypos = NULL;
}
return trypos;
}
/*
* Return ind_maxparen corrected for the difference in line number between the
* cursor position and "startpos". This makes sure that searching for a
@@ -7419,7 +7445,8 @@ get_c_indent()
{
curwin->w_cursor.lnum = our_paren_pos.lnum;
curwin->w_cursor.col = col;
if (find_match_paren(curbuf->b_ind_maxparen) != NULL)
if (find_match_paren_after_brace(curbuf->b_ind_maxparen)
!= NULL)
amount += curbuf->b_ind_unclosed2;
else
{