0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

updated for version 7.3.213

Problem:    Javascript object literal is not indented correctly.
Solution:   Make a special case for when "J1" is in 'cino'. (Luc Deschenaux)
This commit is contained in:
Bram Moolenaar
2011-06-12 21:51:08 +02:00
parent 456f2bb24f
commit 6ec154b57d
4 changed files with 43 additions and 2 deletions

View File

@@ -6965,7 +6965,7 @@ get_c_indent()
* ldfd) { * ldfd) {
* } * }
*/ */
if ((ind_keep_case_label if (ind_js || (ind_keep_case_label
&& cin_iscase(skipwhite(ml_get_curline()), FALSE))) && cin_iscase(skipwhite(ml_get_curline()), FALSE)))
amount = get_indent(); amount = get_indent();
else else

View File

@@ -1492,10 +1492,11 @@ baz();
foo(1); foo(1);
} else } else
foo(0); foo(0);
baz(); baz();
} }
STARTTEST STARTTEST
:set cino=N-s
/^NAMESPACESTART /^NAMESPACESTART
=/^NAMESPACEEND =/^NAMESPACEEND
ENDTEST ENDTEST
@@ -1560,6 +1561,27 @@ namespace111111111
} }
namespace111111111 namespace111111111
{ {
111111111111111111;
}
NAMESPACEEND
STARTTEST
:set cino=J1
/^JSSTART
=/^JSEND
ENDTEST
JSSTART
var bar = {
foo: {
that: this,
some: ok,
},
"bar":{
a : 2,
b: "123abc",
x: 4,
"y": 5 "y": 5
} }
} }

View File

@@ -1337,6 +1337,7 @@ void func(void)
} }
NAMESPACESTART
/* valid namespaces with normal indent */ /* valid namespaces with normal indent */
namespace namespace
{ {
@@ -1401,3 +1402,19 @@ namespace111111111
NAMESPACEEND NAMESPACEEND
JSSTART
var bar = {
foo: {
that: this,
some: ok,
},
"bar":{
a : 2,
b: "123abc",
x: 4,
"y": 5
}
}
JSEND

View File

@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
213,
/**/ /**/
212, 212,
/**/ /**/