From 52af94453e30d2e9d0f4b6a208c8d4c3ff7c85a9 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 29 Oct 2013 12:24:23 +0000 Subject: [PATCH] clang-format: Fix overloaded operator for global-scoped conversions. Before: operator::A(); After: operator ::A(); git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193605 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/TokenAnnotator.cpp | 2 +- unittests/Format/FormatTest.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 621581c521..eeecdceb84 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -1337,7 +1337,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, if (Tok.Type == TT_CtorInitializerColon || Tok.Type == TT_ObjCBlockLParen) return true; if (Tok.Previous->Tok.is(tok::kw_operator)) - return false; + return Tok.is(tok::coloncolon); if (Tok.Type == TT_OverloadedOperatorLParen) return false; if (Tok.is(tok::colon)) diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index cbac133c4d..83035f72bc 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -3902,6 +3902,7 @@ TEST_F(FormatTest, UnderstandsOverloadedOperators) { verifyGoogleFormat("operator void*();"); verifyGoogleFormat("operator SomeType>();"); + verifyGoogleFormat("operator ::A();"); verifyFormat("using A::operator+;"); } -- 2.40.0