]> granicus.if.org Git - clang/commit
clang-format: [JS] Correctly Indent Nested JavaScript Literals.
authorMartin Probst <martin@probst.io>
Tue, 6 Jun 2017 12:38:29 +0000 (12:38 +0000)
committerMartin Probst <martin@probst.io>
Tue, 6 Jun 2017 12:38:29 +0000 (12:38 +0000)
commit069779a6e1f2cf1c0512c115c3c99359ac865039
treee155f3a327133c3ff860cd53eaee283721083059
parent84aa45a35c5cb99743e562fe81cd74c05458f1e6
clang-format: [JS] Correctly Indent Nested JavaScript Literals.

Nested literals are sometimes only indented by 2 spaces, instead of
respecting the IndentWidth option.
There are existing unit tests (FormatTestJS.ArrayLiterals) that only
pass because the style used to test them uses an IndentWidth of 2.
This change removes the magic 2 and always uses the IndentWidth.
I've added 6 tests. The first 4 of these tests fail before this change,
while the last 2 already pass, but were added just to make sure it the
change works with all types of braces.

Patch originally by Jared Neil, thanks!

Differential Revision: https://reviews.llvm.org/D33857

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@304791 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Format/ContinuationIndenter.cpp
unittests/Format/FormatTestJS.cpp