From 1feab0f95ea0202f95a555a86f5dd60db4a8a5c8 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 2 Jun 2015 15:31:37 +0000 Subject: [PATCH] clang-format: Don't try to detect C++ lambdas in other languages. llvm-svn: 238845 --- clang/lib/Format/UnwrappedLineParser.cpp | 4 ++++ clang/unittests/Format/FormatTestJS.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 83cbe76..826b40d 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -911,6 +911,10 @@ void UnwrappedLineParser::parseStructuralElement() { } bool UnwrappedLineParser::tryToParseLambda() { + if (Style.Language != FormatStyle::LK_Cpp) { + nextToken(); + return false; + } // FIXME: This is a dirty way to access the previous token. Find a better // solution. if (!Line->Tokens.empty() && diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index a18d35b..6550863 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -266,6 +266,8 @@ TEST_F(FormatTestJS, ArrayLiterals) { " bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n" " ccccccccccccccccccccccccccc\n" "]);"); + + verifyFormat("someFunction([], {a: a});"); } TEST_F(FormatTestJS, FunctionLiterals) { -- 2.7.4