clang-format: Fix formatting bug with comment in weird place.

Before:
  template <typename T>
  // T should be one of {A, B}.
      void f() {}

After:
  template <typename T>
  // T should be one of {A, B}.
  void f() {}

llvm-svn: 191492

1 files changed, 4 insertions, 1 deletions

diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index 87c022294e4..8b0baead67a 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -192,6 +192,8 @@ unsigned ContinuationIndenter::addTokenToState(LineState &State, bool Newline,
                                                unsigned ExtraSpaces) {
   const FormatToken &Current = *State.NextToken;
   const FormatToken &Previous = *State.NextToken->Previous;
+  const FormatToken *PreviousNonComment =
+      State.NextToken->getPreviousNonComment();
 
   // Extra penalty that needs to be added because of the way certain line
   // breaks are chosen.
@@ -253,7 +255,8 @@ unsigned ContinuationIndenter::addTokenToState(LineState &State, bool Newline,
       State.Column = State.Stack.back().QuestionColumn;
     } else if (Previous.is(tok::comma) && State.Stack.back().VariablePos != 0) {
       State.Column = State.Stack.back().VariablePos;
-    } else if (Previous.ClosesTemplateDeclaration ||
+    } else if ((PreviousNonComment &&
+                PreviousNonComment->ClosesTemplateDeclaration) ||
                ((Current.Type == TT_StartOfName ||
                  Current.is(tok::kw_operator)) &&
                 State.ParenLevel == 0 &&