Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 355c909..410fe38 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -431,6 +431,24 @@
}
});
<
+ *javascript-cinoptions* *javascript-indenting*
+ JN Indent JavaScript object declarations correctly by not confusing
+ them with labels. The value 'N' is currently unused but must be
+ non-zero (e.g. 'J1'). >
+
+ var bar = {
+ foo: {
+ that: this,
+ some: ok,
+ },
+ "bar":{
+ a : 2,
+ b: "123abc",
+ x: 4,
+ "y": 5
+ }
+ }
+<
)N Vim searches for unclosed parentheses at most N lines away.
This limits the time needed to search for parentheses. (default
20 lines).
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 838fca9..60cc355 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1089,11 +1089,10 @@
Vim 7.3:
-- soon: remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV.
+- Soon: remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV.
- Conceal feature: no update when moving to another window. (Dominique Pelle,
2010 Jul 5) Vince will look into it.
Patches to possibly include:
-- Patch to support :browse for more commands. (Lech Lorens, 2009 Jul 18)
- Patch to improve javascript indenting. (Hari Kumar G, 2010 May 22)
- Patch to use return value of 'formatexpr'. (James Vega, 2010 Jun 16)
- Patch for gtk main_loop() to enable GtkFileChooser. (James Vega, 2010 Jun 28)
diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim
index cf4a4f3..a83d34b 100644
--- a/runtime/indent/javascript.vim
+++ b/runtime/indent/javascript.vim
@@ -11,5 +11,6 @@
" C indenting is not too bad.
setlocal cindent
+setlocal cinoptions+=j1,J1
let b:undo_indent = "setl cin<"