From: Daniel Jasper <djasper@google.com>
Date: Mon, 4 Jan 2016 16:10:36 +0000 (+0000)
Subject: clang-format: [JS] Support more ES6 default exports.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=815c369f0c91f1a76512d4d2b629d569c169e5c4;p=clang

clang-format: [JS] Support more ES6 default exports.

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

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 635092dec3..f5a33d4ddf 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -2001,8 +2001,9 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
     if (Left.isOneOf(Keywords.kw_let, Keywords.kw_var, TT_JsFatArrow,
                      Keywords.kw_in))
       return true;
-    if (Left.is(tok::kw_default) && Right.is(TT_ArrayInitializerLSquare))
-      return true; // For "export default [];".
+    if (Left.is(tok::kw_default) && Left.Previous &&
+        Left.Previous->is(tok::kw_export))
+      return true;
     if (Left.is(Keywords.kw_is) && Right.is(tok::l_brace))
       return true;
     if (Right.isOneOf(TT_JsTypeColon, TT_JsTypeOptionalQuestion))
diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp
index 0013e83ddd..2f67bdf549 100644
--- a/unittests/Format/FormatTestJS.cpp
+++ b/unittests/Format/FormatTestJS.cpp
@@ -870,6 +870,7 @@ TEST_F(FormatTestJS, Modules) {
                "  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
                "];");
   verifyFormat("export default [];");
+  verifyFormat("export default () => {};");
 }
 
 TEST_F(FormatTestJS, TemplateStrings) {