summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-06-12 21:51:08 +0200
committerBram Moolenaar <Bram@vim.org>2011-06-12 21:51:08 +0200
commit6ec154b57da547881297fd229fdb20b5aeec74a7 (patch)
treeeb5e22d97291a3dc25dc1c94d234af56058c4304
parent456f2bb24f269a1f1ceb5ddedfb828ca33fc270b (diff)
downloadvim-git-6ec154b57da547881297fd229fdb20b5aeec74a7.tar.gz
updated for version 7.3.213v7.3.213
Problem: Javascript object literal is not indented correctly. Solution: Make a special case for when "J1" is in 'cino'. (Luc Deschenaux)
-rw-r--r--src/misc1.c2
-rw-r--r--src/testdir/test3.in24
-rw-r--r--src/testdir/test3.ok17
-rw-r--r--src/version.c2
4 files changed, 43 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 913da2ad7..d69f12fd2 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6965,7 +6965,7 @@ get_c_indent()
* ldfd) {
* }
*/
- if ((ind_keep_case_label
+ if (ind_js || (ind_keep_case_label
&& cin_iscase(skipwhite(ml_get_curline()), FALSE)))
amount = get_indent();
else
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index 1b5cf893b..1cfd8f23e 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -1492,10 +1492,11 @@ baz();
STARTTEST
:set cino=N-s
-/namespaces
+/^NAMESPACESTART
=/^NAMESPACEEND
ENDTEST
+NAMESPACESTART
/* valid namespaces with normal indent */
namespace
{
@@ -1561,6 +1562,27 @@ 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
+}
+}
+JSEND
+
+STARTTEST
:g/^STARTTEST/.,/^ENDTEST/d
:1;/start of AUTO/,$wq! test.out
ENDTEST
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index cf4f85deb..8475aff9f 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -1337,6 +1337,7 @@ void func(void)
}
+NAMESPACESTART
/* valid namespaces with normal indent */
namespace
{
@@ -1401,3 +1402,19 @@ namespace111111111
NAMESPACEEND
+
+JSSTART
+var bar = {
+ foo: {
+ that: this,
+ some: ok,
+ },
+ "bar":{
+ a : 2,
+ b: "123abc",
+ x: 4,
+ "y": 5
+ }
+}
+JSEND
+
diff --git a/src/version.c b/src/version.c
index f648160ca..7ae798422 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 213,
+/**/
212,
/**/
211,