commit 015ed028cf6922059f3da337a7fbfeb874a51051
author Daniel Jasper <djasper@google.com> Fri Sep 13 09:20:45 2013 +0000
committer Daniel Jasper <djasper@google.com> Fri Sep 13 09:20:45 2013 +0000
tree 9d6a6b46217bf7b13a366cfe5ad73208fbcc8a68
parent d816320809937e4e202e83e9e7b53d64b0521038

clang-format: Fix incorrect enum parsing / layouting.

Before:
  enum {
    Bar = Foo < int,
    int > ::value
  };

After:
  enum {
    Bar = Foo<int, int>::value
  };

llvm-svn: 190674

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 52f8b07..034f6e6 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -529,7 +529,7 @@
                E = LBrace.Children.end();
            I != E; ++I) {
         unsigned Indent =
-            ParentIndent + ((*I)->Level - Line.Level) * Style.IndentWidth;
+            ParentIndent + ((*I)->Level - Line.Level - 1) * Style.IndentWidth;
         if (!DryRun) {
           unsigned Newlines = std::min((*I)->First->NewlinesBefore,
                                        Style.MaxEmptyLinesToKeep + 1);