<div dir="ltr">Sorry about that. Will do from now on, thanks.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 24, 2015 at 5:18 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">When landing patches, please put the whole change description in the commit message. It's ok to also have a link to the review URL, but the commit message should be self-contained and shouldn't require people to click through to phab.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 24, 2015 at 3:23 PM, Jacques Pienaar <span dir="ltr"><<a href="mailto:jpienaar@google.com" target="_blank">jpienaar@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jpienaar<br>
Date: Tue Feb 24 17:23:24 2015<br>
New Revision: 230395<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=230395&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=230395&view=rev</a><br>
Log:<br>
clang-format: Change location of stashed token<br>
<br>
Commit of patch in <a href="http://reviews.llvm.org/D7871" target="_blank">http://reviews.llvm.org/D7871</a><br>
<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/Format.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/Format.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=230395&r1=230394&r2=230395&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=230395&r1=230394&r2=230395&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Tue Feb 24 17:23:24 2015<br>
@@ -940,11 +940,13 @@ private:<br>
     FormatTok = new (Allocator.Allocate()) FormatToken;<br>
     FormatTok->Tok = Tok;<br>
     SourceLocation TokLocation =<br>
-        FormatTok->Tok.getLocation().getLocWithOffset(1);<br>
+        FormatTok->Tok.getLocation().getLocWithOffset(Tok.getLength() - 1);<br>
+    FormatTok->Tok.setLocation(TokLocation);<br>
     FormatTok->WhitespaceRange = SourceRange(TokLocation, TokLocation);<br>
     FormatTok->TokenText = TokenText;<br>
     FormatTok->ColumnWidth = 1;<br>
-    FormatTok->OriginalColumn = OriginalColumn;<br>
+    FormatTok->OriginalColumn = OriginalColumn + 1;<br>
+<br>
     return FormatTok;<br>
   }<br>
<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=230395&r1=230394&r2=230395&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=230395&r1=230394&r2=230395&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Tue Feb 24 17:23:24 2015<br>
@@ -9753,6 +9753,7 @@ TEST_F(FormatTest, TripleAngleBrackets)<br>
<br>
 TEST_F(FormatTest, MergeLessLessAtEnd) {<br>
   verifyFormat("<<");<br>
+  EXPECT_EQ("< < <", format("\\\n<<<"));<br>
   verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"<br>
                "aaallvm::outs() <<");<br>
   verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</blockquote></div><br></div>