From: Martin Probst <martin@probst.io>
Date: Sat, 9 Jul 2016 15:09:22 +0000 (+0000)
Subject: clang-format: [JS] support trailing commas in imports.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c9460b0d41b8e1953dca467d9d0031c1d7f3976;p=clang

clang-format: [JS] support trailing commas in imports.

Reviewers: djasper

Subscribers: cfe-commits, klimek

Differential Revision: http://reviews.llvm.org/D22147

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274976 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Format/SortJavaScriptImports.cpp b/lib/Format/SortJavaScriptImports.cpp
index 73586d59d5..8010e4914f 100644
--- a/lib/Format/SortJavaScriptImports.cpp
+++ b/lib/Format/SortJavaScriptImports.cpp
@@ -396,6 +396,8 @@ private:
     // {sym as alias, sym2 as ...} from '...';
     nextToken();
     while (true) {
+      if (Current->is(tok::r_brace))
+        return true;
       if (Current->isNot(tok::identifier))
         return false;
 
diff --git a/unittests/Format/SortImportsTestJS.cpp b/unittests/Format/SortImportsTestJS.cpp
index cc408ca9da..769fa793da 100644
--- a/unittests/Format/SortImportsTestJS.cpp
+++ b/unittests/Format/SortImportsTestJS.cpp
@@ -236,6 +236,10 @@ TEST_F(SortImportsTestJS, SortingCanShrink) {
              "1;");
 }
 
+TEST_F(SortImportsTestJS, TrailingComma) {
+  verifySort("import {A, B,} from 'aa';\n", "import {B, A,} from 'aa';\n");
+}
+
 } // end namespace
 } // end namespace format
 } // end namespace clang