From: Daniel Jasper <djasper@google.com>
Date: Mon, 14 Dec 2015 08:24:16 +0000 (+0000)
Subject: clang-format: Fix style default for WebKit and Linux styles.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d86f4ca5e4d5460232d70bb1b80c86cde54bb0bd;p=clang

clang-format: Fix style default for WebKit and Linux styles.

Brought up in codereviews:
http://reviews.llvm.org/D15445
http://reviews.llvm.org/D15485

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

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index d66145fd88..896ecad60f 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -396,7 +396,6 @@ static FormatStyle expandPresets(const FormatStyle &Style) {
     Expanded.BraceWrapping.AfterClass = true;
     Expanded.BraceWrapping.AfterFunction = true;
     Expanded.BraceWrapping.AfterNamespace = true;
-    Expanded.BraceWrapping.BeforeElse = true;
     break;
   case FormatStyle::BS_Mozilla:
     Expanded.BraceWrapping.AfterClass = true;
@@ -427,7 +426,6 @@ static FormatStyle expandPresets(const FormatStyle &Style) {
     break;
   case FormatStyle::BS_WebKit:
     Expanded.BraceWrapping.AfterFunction = true;
-    Expanded.BraceWrapping.BeforeElse = true;
     break;
   default:
     break;