diff options
author | Dmitry Gutov <dgutov@yandex.ru> | 2013-12-08 18:08:45 +0200 |
---|---|---|
committer | Dmitry Gutov <dgutov@yandex.ru> | 2013-12-08 18:08:45 +0200 |
commit | 47e59c666a7599863725a04b6ed3f74ba01824b3 (patch) | |
tree | 2843998028019d76fa883bddc8055dc3e0cb792d /test/indent | |
parent | 36291308801eefe5c04280c32d4b247bf7aa984e (diff) | |
download | emacs-47e59c666a7599863725a04b6ed3f74ba01824b3.tar.gz |
Port indentation code from js2-mode to js-mode
* lisp/progmodes/js.el (js-auto-indent-flag): Remove, was unused.
(js-switch-indent-offset): New option.
(js--proper-indentation): Use it. And handle the case when
"default" is actually a key in an object literal.
(js--same-line): New function.
(js--multi-line-declaration-indentation): Use it.
(js--indent-in-array-comp, js--array-comp-indentation): New
functions.
(js--proper-indentation): Use them, to handle array comprehension
continuations.
Diffstat (limited to 'test/indent')
-rw-r--r-- | test/indent/js.js | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/test/indent/js.js b/test/indent/js.js new file mode 100644 index 00000000000..d4167da3e96 --- /dev/null +++ b/test/indent/js.js @@ -0,0 +1,45 @@ +var a = 1; +b = 2; + +let c = 1, + d = 2; + +var e = 100500, + + 1; + +var f = bar('/protocols/') +baz(); + +var h = 100500 +1; + +const i = 1, + j = 2; + +var k = 1, + l = [ + 1, 2, + 3, 4 + ], + m = 5; + +var n = function() { + return 7; +}, + o = 8; + +foo(bar, function() { + return 2; +}); + +switch (b) { +case "a": + 2; +default: + 3; +} + +var ; + +var evens = [e for each (e in range(0, 21)) + if (ed % 2 == 0)]; |