From 7cd8b60283f98748150b12364f317bdb69ea91dd Mon Sep 17 00:00:00 2001 From: Krasimir Georgiev Date: Wed, 8 Feb 2017 14:45:19 +0000 Subject: [PATCH] [clang-format] Move OriginalPrefix from base to subclass. Summary: OriginalPrefix is only needed for line comment sections. Moved from the base class to the child class. No functional changes. Reviewers: djasper Reviewed By: djasper Subscribers: cfe-commits, klimek Differential Revision: https://reviews.llvm.org/D29716 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@294457 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/BreakableToken.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Format/BreakableToken.h b/lib/Format/BreakableToken.h index b9004fcbf9..d507635344 100644 --- a/lib/Format/BreakableToken.h +++ b/lib/Format/BreakableToken.h @@ -282,10 +282,6 @@ protected: // line. bool FirstInLine; - // In case of line comments, holds the original prefix, including trailing - // whitespace. - SmallVector OriginalPrefix; - // The prefix to use in front a line that has been reflown up. // For example, when reflowing the second line after the first here: // // comment 1 @@ -394,6 +390,14 @@ private: unsigned getContentStartColumn(unsigned LineIndex, unsigned TailOffset) const override; + // OriginalPrefix[i] contains the original prefix of line i, including + // trailing whitespace before the start of the content. The indentation + // preceding the prefix is not included. + // For example, if the line is: + // // content + // then the original prefix is "// ". + SmallVector OriginalPrefix; + // Prefix[i] contains the intended leading "//" with trailing spaces to // account for the indentation of content within the comment at line i after // formatting. It can be different than the original prefix when the original -- 2.40.0