From a8c858acdd264bed457b09d2b7030280b3fde7d2 Mon Sep 17 00:00:00 2001
From: Dave Lewis <dmlewis@g.clemson.edu>
Date: Mon, 17 Mar 2014 15:30:42 -0400
Subject: [PATCH] CppTools: Fix indent after ">>" in return type

Add case for ">>" token in declaration_start state to prevent
falling through to stream_op.

Task-number: QTCREATORBUG-9199
Change-Id: I53710be55eff4574de89f9159e95bbc1de2ba34e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
---
 src/plugins/cpptools/cppcodeformatter.cpp                | 1 +
 tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index dc01741e841..c2ac2fb88d8 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -189,6 +189,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             case T_LBRACE:      enter(defun_open); break;
             case T_COLON:       enter(member_init_open); enter(member_init_expected); break;
             case T_OPERATOR:    enter(operator_declaration); break;
+            case T_GREATER_GREATER: break;
             default:            tryExpression(true); break;
             } break;
 
diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
index 03220c9bb8c..fadfccfdff8 100644
--- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
+++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
@@ -1284,6 +1284,9 @@ void tst_CodeFormatter::functionReturnType()
          << Line("template <class T>")
          << Line("const QList<QMap<T, T> > &")
          << Line("A::B::foo() {}")
+         << Line("std::map<int,std::vector<int>> indent() {}")
+         << Line("std::map<int,std::vector<int> > indent() {}")
+         << Line("")
          ;
     checkIndent(data);
 }