IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1247 from splinterofchaos/350

Browse Source 
vim-patch:7.4.350 + vim-patch:7.4.355 + vim-patch:7.4.390
This commit is contained in:
Justin M. Keyes 2014-12-19 19:33:05 -05:00
commit 5fe519f78a
4 changed files with 270 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

298
src/nvim/indent_c.c
View File

@ -210,9 +210,36 @@ static pos_T *find_line_comment(void) /* XXX */
return NULL;
}
/*
* Check if string matches "label:"; move to character after ':' if true.
*/
/// Checks if `text` starts with "key:".
static bool cin_has_js_key(char_u *text)
{
char_u *s = skipwhite(text);
char_u quote = 0;
if (*s == '\'' || *s == '"') {
// can be 'key': or "key":
quote = *s;
++s;
}
if (!vim_isIDc(*s)) { // need at least one ID character
return FALSE;
}
while (vim_isIDc(*s)) {
++s;
}
if (*s && *s == quote) {
++s;
}
s = cin_skipcomment(s);
// "::" is not a label, it's C++
return (*s == ':' && s[1] != ':');
}
/// Checks if string matches "label:"; move to character after ':' if true.
/// "*s" must point to the start of the label, if there is one.
static int cin_islabel_skip(char_u **s)
{
if (!vim_isIDc(**s)) /* need at least one ID character */
@ -1198,21 +1225,21 @@ static pos_T *find_start_brace(void)
return trypos;
}
/*
* Find the matching '(', failing if it is in a comment.
* Return NULL if no match found.
*/
static pos_T *
find_match_paren ( /* XXX */
int ind_maxparen
)
/// Find the matching '(', ignoring it if it is in a comment.
/// @returns NULL or the found match.
static pos_T *find_match_paren(int ind_maxparen)
{
return find_match_char('(', ind_maxparen);
}
static pos_T * find_match_char(char_u c, int ind_maxparen)
{
pos_T cursor_save;
pos_T *trypos;
static pos_T pos_copy;
cursor_save = curwin->w_cursor;
if ((trypos = findmatchlimit(NULL, '(', 0, ind_maxparen)) != NULL) {
if ((trypos = findmatchlimit(NULL, c, 0, ind_maxparen)) != NULL) {
/* check if the ( is in a // comment */
if ((colnr_T)cin_skip2pos(trypos) > trypos->col)
trypos = NULL;
@ -1220,7 +1247,7 @@ find_match_paren ( /* XXX */
pos_copy = *trypos; /* copy trypos, findmatch will change it */
trypos = &pos_copy;
curwin->w_cursor = *trypos;
if (ind_find_start_comment() != NULL) /* XXX */
if (ind_find_start_comment() != NULL)
trypos = NULL;
}
}
@ -1228,6 +1255,29 @@ find_match_paren ( /* XXX */
return trypos;
}
/// Find the matching '(', ignoring it if it is in a comment or before an
/// unmatched {.
/// @returns NULL or the found match.
static pos_T *find_match_paren_after_brace(int ind_maxparen)
{
pos_T *trypos = find_match_paren(ind_maxparen);
if (trypos == NULL) {
return 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
@ -1517,6 +1567,8 @@ int get_c_indent(void)
#define LOOKFOR_NOBREAK 8
#define LOOKFOR_CPP_BASECLASS 9
#define LOOKFOR_ENUM_OR_INIT 10
#define LOOKFOR_JS_KEY 11
#define LOOKFOR_NO_COMMA 12
int whilelevel;
linenr_T lnum;
@ -1731,6 +1783,12 @@ int get_c_indent(void)
}
}
}
// Are we looking at a ']' that has a match?
else if (*skipwhite(theline) == ']'
&& (trypos = find_match_char('[', curbuf->b_ind_maxparen)) != NULL) {
// align with the line containing the '['.
amount = get_indent_lnum(trypos->lnum);
}
/*
* Are we inside parentheses or braces?
*/ /* XXX */
@ -1939,13 +1997,14 @@ int get_c_indent(void)
else {
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)) {
amount += curbuf->b_ind_unclosed2;
else {
if (is_if_for_while)
} else {
if (is_if_for_while) {
amount += curbuf->b_ind_if_for_while;
else
} else {
amount += curbuf->b_ind_unclosed;
}
}
}
/*
@ -1964,13 +2023,10 @@ int get_c_indent(void)
/* add extra indent for a comment */
if (cin_iscomment(theline))
amount += curbuf->b_ind_comment;
}
/*
* Are we at least inside braces, then?
*/
else {
} else {
// We are inside braces, there is a { before this line at the position
// stored in tryposBrace.
trypos = tryposBrace;
ourscope = trypos->lnum;
start = ml_get(ourscope);
@ -1989,28 +2045,22 @@ int get_c_indent(void)
else
start_brace = BRACE_AT_START;
} else {
/*
* that opening brace might have been on a continuation
* line. if so, find the start of the line.
*/
// That opening brace might have been on a continuation
// line. If so, find the start of the line.
curwin->w_cursor.lnum = ourscope;
/*
* position the cursor over the rightmost paren, so that
* matching it will take us back to the start of the line.
*/
// Position the cursor over the rightmost paren, so that
// matching it will take us back to the start of the line.
lnum = ourscope;
if (find_last_paren(start, '(', ')')
&& (trypos = find_match_paren(curbuf->b_ind_maxparen))
!= NULL)
&& (trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) {
lnum = trypos->lnum;
}
/*
* It could have been something like
* case 1: if (asdf &&
* ldfd) {
* }
*/
// It could have been something like
// case 1: if (asdf &&
// ldfd) {
// }
if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label)
&& cin_iscase(skipwhite(get_cursor_line_ptr()), FALSE)) {
amount = get_indent();
@ -2023,11 +2073,12 @@ int get_c_indent(void)
start_brace = BRACE_AT_END;
}
/*
* if we're looking at a closing brace, that's where
* we want to be. otherwise, add the amount of room
* that an indent is supposed to be.
*/
// For Javascript check if the line starts with "key:".
bool js_cur_has_key = curbuf->b_ind_js ? cin_has_js_key(theline) : false;
// If we're looking at a closing brace, that's where
// we want to be. Otherwise, add the amount of room
// that an indent is supposed to be.
if (theline[0] == '}') {
/*
* they may want closing braces to line up with something
@ -2109,14 +2160,12 @@ int get_c_indent(void)
scope_amount = amount;
whilelevel = 0;
/*
* Search backwards. If we find something we recognize, line up
* with that.
*
* if we're looking at an open brace, indent
* the usual amount relative to the conditional
* that opens the block.
*/
// Search backwards. If we find something we recognize, line up
// with that.
//
// If we're looking at an open brace, indent
// the usual amount relative to the conditional
// that opens the block.
curwin->w_cursor = cur_curpos;
for (;; ) {
curwin->w_cursor.lnum--;
@ -2485,26 +2534,58 @@ int get_c_indent(void)
*/
terminated = cin_isterminated(l, FALSE, TRUE);
if (js_cur_has_key) {
js_cur_has_key = false; // only check the first line
if (curbuf->b_ind_js && terminated == ',') {
// For Javascript we might be inside an object:
// key: something, <- align with this
// key: something
// or:
// key: something + <- align with this
// something,
// key: something
lookfor = LOOKFOR_JS_KEY;
}
}
if (lookfor == LOOKFOR_JS_KEY && cin_has_js_key(l)) {
amount = get_indent();
break;
}
if (lookfor == LOOKFOR_NO_COMMA) {
if (terminated != ',') {
// Line below current line is the one that starts a
// (possibly broken) line ending in a comma.
break;
}
amount = get_indent();
if (curwin->w_cursor.lnum - 1 == ourscope) {
// line above is start of the scope, thus current line
// is the one that stars a (possibly broken) line
// ending in a comma.
break;
}
}
if (terminated == 0 || (lookfor != LOOKFOR_UNTERM
&& terminated == ',')) {
/*
* if we're in the middle of a paren thing,
* go back to the line that starts it so
* we can get the right prevailing indent
* if ( foo &&
* bar )
*/
/*
* position the cursor over the rightmost paren, so that
* matching it will take us back to the start of the line.
*/
// If we're in the middle of a paren thing, Go back to the line
// that starts it so we can get the right prevailing indent
// if ( foo &&
// bar )
// Position the cursor over the rightmost paren, so that
// matching it will take us back to the start of the line.
// Ignore a match before the start of the block.
(void)find_last_paren(l, '(', ')');
trypos = find_match_paren(corr_ind_maxparen(&cur_curpos));
if (trypos != NULL && (trypos->lnum < tryposBrace->lnum
|| (trypos->lnum == tryposBrace->lnum
&& trypos->col < tryposBrace->col))) {
trypos = NULL;
}
/*
* If we are looking for ',', we also look for matching
* braces.
*/
// If we are looking for ',', we also look for matching
// braces.
if (trypos == NULL && terminated == ','
&& find_last_paren(l, '{', '}'))
trypos = find_start_brace();
@ -2546,10 +2627,11 @@ int get_c_indent(void)
* Get indent and pointer to text for current line,
* ignoring any jump label. XXX
*/
if (!curbuf->b_ind_js)
cur_amount = skip_label(curwin->w_cursor.lnum, &l);
else
if (curbuf->b_ind_js) {
cur_amount = get_indent();
} else {
cur_amount = skip_label(curwin->w_cursor.lnum, &l);
}
/*
* If this is just above the line we are indenting, and it
* starts with a '{', line it up with this line.
@ -2570,7 +2652,7 @@ int get_c_indent(void)
if (*skipwhite(l) != '{')
amount += curbuf->b_ind_open_extra;
if (curbuf->b_ind_cpp_baseclass) {
if (curbuf->b_ind_cpp_baseclass && !curbuf->b_ind_js) {
/* have to look back, whether it is a cpp base
* class declaration or initialization */
lookfor = LOOKFOR_CPP_BASECLASS;
@ -2716,17 +2798,43 @@ int get_c_indent(void)
* yet.
*/
if (lookfor == LOOKFOR_INITIAL && terminated == ',') {
lookfor = LOOKFOR_ENUM_OR_INIT;
cont_amount = cin_first_id_amount();
if (curbuf->b_ind_js) {
// Search for a line ending in a comma
// and line up with the line below it
// (could be the current line).
// some = [
// 1, <- line up here
// 2,
// some = [
// 3 + <- line up here
// 4 *
// 5,
// 6,
lookfor = LOOKFOR_NO_COMMA;
amount = get_indent(); // XXX
trypos = find_match_char('[', curbuf->b_ind_maxparen);
if (trypos != NULL) {
if (trypos->lnum == curwin->w_cursor.lnum - 1) {
// Current line is first inside
// [], line up with it.
break;
}
ourscope = trypos->lnum;
}
} else {
lookfor = LOOKFOR_ENUM_OR_INIT;
cont_amount = cin_first_id_amount();
}
} else {
if (lookfor == LOOKFOR_INITIAL
&& *l != NUL
&& l[STRLEN(l) - 1] == '\\')
/* XXX */
cont_amount = cin_get_equal_amount(
curwin->w_cursor.lnum);
if (lookfor != LOOKFOR_TERM)
&& l[STRLEN(l) - 1] == '\\') {
// XXX
cont_amount = cin_get_equal_amount( curwin->w_cursor.lnum);
}
if (lookfor != LOOKFOR_TERM && lookfor != LOOKFOR_JS_KEY) {
lookfor = LOOKFOR_UNTERM;
}
}
}
}
@ -2735,8 +2843,7 @@ int get_c_indent(void)
* Check if we are after a while (cond);
* If so: Ignore until the matching "do".
*/
/* XXX */
else if (cin_iswhileofdo_end(terminated)) {
else if (cin_iswhileofdo_end(terminated)) { // XXX
/*
* Found an unterminated line after a while ();, line up
* with the last one.
@ -2933,21 +3040,17 @@ term_again:
if (curbuf->b_ind_jump_label > 0 && original_line_islabel)
amount -= curbuf->b_ind_jump_label;
}
/*
* ok -- we're not inside any sort of structure at all!
*
* this means we're at the top level, and everything should
* basically just match where the previous line is, except
* for the lines immediately following a function declaration,
* which are K&R-style parameters and need to be indented.
*/
else {
/*
* if our line starts with an open brace, forget about any
* prevailing indent and make sure it looks like the start
* of a function
*/
// Ok -- we're not inside any sort of structure at all!
//
// this means we're at the top level, and everything should
// basically just match where the previous line is, except
// for the lines immediately following a function declaration,
// which are K&R-style parameters and need to be indented.
// if our line starts with an open brace, forget about any
// prevailing indent and make sure it looks like the start
// of a function
if (theline[0] == '{') {
amount = curbuf->b_ind_first_open;
}
@ -3081,6 +3184,15 @@ term_again:
if (cin_ends_in(l, (char_u *)"};", NULL))
break;
// If the previous line ends on '[' we are probably in an
// array constant:
// something = [
// 234, <- extra indent
if (cin_ends_in(l, (char_u *)"[", NULL)) {
amount = get_indent() + ind_continuation;
break;
}
/*
* Find a line only has a semicolon that belongs to a previous
* line ending in '}', e.g. before an #endif. Don't increase

62
src/nvim/testdir/test3.in
View File

@ -1432,7 +1432,7 @@ int main ()
STARTTEST
:set cino=(0,ts
2kdd=][
2kdd2j=][
ENDTEST
void func(int a
@ -1446,7 +1446,7 @@ void func(int a
STARTTEST
:set cino=(0
2kdd=][
2kdd2j=][
ENDTEST
void
@ -1461,7 +1461,7 @@ func(int a
STARTTEST
:set cino&
2kdd=7][
2kdd2j=7][
ENDTEST
void func(void)
@ -1538,7 +1538,7 @@ func6(
STARTTEST
:set cino&
:set cino+=l1
2kdd=][
2kdd2j=][
ENDTEST
void func(void)
@ -1567,7 +1567,7 @@ break;
STARTTEST
:set cino&
2kdd=][
2kdd2j=][
ENDTEST
void func(void)
@ -1592,7 +1592,7 @@ void func(void)
STARTTEST
:set cino&
2kdd=][
2kdd2j=][
ENDTEST
void func(void)
@ -1919,10 +1919,10 @@ ENDTEST
JSSTART
var foo = [
1, // indent 8 more
1,
2,
3
]; // indent 8 less
];
JSEND
STARTTEST
@ -1937,7 +1937,7 @@ var foo = [
1,
2,
3
]; // indent 16 less
];
}
JSEND
@ -1950,6 +1950,12 @@ ENDTEST
JSSTART
(function($){
if (cond &&
cond) {
stmt;
}
window.something.left =
(width - 50 + offset) + "px";
var class_name='myclass';
function private_method() {
@ -1965,15 +1971,15 @@ function init(options) {
$(this).data(class_name+'_public',$.extend({},{
foo: 'bar',
bar: 2, // indent 8 more
foobar: [ // indent 8 more
1, // indent 8 more
2, // indent 16 more
3 // indent 16 more
bar: 2,
foobar: [
1,
2,
3
],
callback: function(){ // indent 8 more
return true; // indent 8 more
} // indent 8 more
callback: function(){
return true;
}
}, options||{}));
}
@ -2014,9 +2020,9 @@ $(this).data(class_name+'_public',$.extend({},{
foo: 'bar',
bar: 2,
foobar: [
1, // indent 8 more
2, // indent 8 more
3 // indent 8 more
1,
2,
3
],
callback: function(){
return true;
@ -2036,15 +2042,15 @@ JSSTART
function init(options) {
$(this).data(class_name+'_public',$.extend({},{
foo: 'bar',
bar: 2, // indent 8 more
foobar: [ // indent 8 more
1, // indent 8 more
2, // indent 16 more
3 // indent 16 more
bar: 2,
foobar: [
1,
2,
3
],
callback: function(){ // indent 8 more
return true; // indent 8 more
} // indent 8 more
callback: function(){
return true;
}
}, options||{}));
}
})(jQuery);

50
src/nvim/testdir/test3.ok
View File

@ -1707,10 +1707,10 @@ JSEND
JSSTART
var foo = [
1, // indent 8 more
1,
2,
3
]; // indent 8 less
];
JSEND
@ -1720,7 +1720,7 @@ function bar() {
1,
2,
3
]; // indent 16 less
];
}
JSEND
@ -1728,6 +1728,12 @@ JSEND
JSSTART
(function($){
if (cond &&
cond) {
stmt;
}
window.something.left =
(width - 50 + offset) + "px";
var class_name='myclass';
function private_method() {
@ -1743,15 +1749,15 @@ JSSTART
$(this).data(class_name+'_public',$.extend({},{
foo: 'bar',
bar: 2, // indent 8 more
foobar: [ // indent 8 more
1, // indent 8 more
2, // indent 16 more
3 // indent 16 more
bar: 2,
foobar: [
1,
2,
3
],
callback: function(){ // indent 8 more
return true; // indent 8 more
} // indent 8 more
callback: function(){
return true;
}
}, options||{}));
}
@ -1787,9 +1793,9 @@ function init(options) {
foo: 'bar',
bar: 2,
foobar: [
1, // indent 8 more
2, // indent 8 more
3 // indent 8 more
1,
2,
3
],
callback: function(){
return true;
@ -1804,15 +1810,15 @@ JSSTART
function init(options) {
$(this).data(class_name+'_public',$.extend({},{
foo: 'bar',
bar: 2, // indent 8 more
foobar: [ // indent 8 more
1, // indent 8 more
2, // indent 16 more
3 // indent 16 more
bar: 2,
foobar: [
1,
2,
3
],
callback: function(){ // indent 8 more
return true; // indent 8 more
} // indent 8 more
callback: function(){
return true;
}
}, options||{}));
}
})(jQuery);

6
src/nvim/version.c
View File

@ -347,7 +347,7 @@ static int included_patches[] = {
//393 NA
392,
391,
//390,
390,
//389,
388,
387,
@ -382,12 +382,12 @@ static int included_patches[] = {
358,
357,
//356 NA
//355,
355,
//354 NA
353,
352,
351,
//350,
350,
349,
348,
347,