diff options
| -rw-r--r-- | lib/Format/Format.cpp | 14 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 9 |
2 files changed, 20 insertions, 3 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index fbcb228fbe..53dc97abec 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -116,6 +116,7 @@ FormatStyle getGoogleStyle() { struct OptimizationParameters { unsigned PenaltyIndentLevel; unsigned PenaltyLevelDecrease; + unsigned PenaltyExcessCharacter; }; class UnwrappedLineFormatter { @@ -131,6 +132,7 @@ public: Replaces(Replaces), StructuralError(StructuralError) { Parameters.PenaltyIndentLevel = 15; Parameters.PenaltyLevelDecrease = 30; + Parameters.PenaltyExcessCharacter = 1000000; } /// \brief Formats an \c UnwrappedLine. @@ -419,6 +421,10 @@ private: return 3; } + unsigned getColumnLimit() { + return Style.ColumnLimit - (Line.InPPDirective ? 1 : 0); + } + /// \brief Calculate the number of lines needed to format the remaining part /// of the unwrapped line. /// @@ -454,9 +460,11 @@ private: addTokenToState(NewLine, true, State); - // Exceeding column limit is bad. - if (State.Column > Style.ColumnLimit - (Line.InPPDirective ? 1 : 0)) - return UINT_MAX; + // Exceeding column limit is bad, assign penalty. + if (State.Column > getColumnLimit()) { + unsigned ExcessCharacters = State.Column - getColumnLimit(); + CurrentPenalty += Parameters.PenaltyExcessCharacter * ExcessCharacters; + } if (StopAt <= CurrentPenalty) return UINT_MAX; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 56d4e17468..495fc7fee1 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1026,6 +1026,15 @@ TEST_F(FormatTest, HandlesIncludeDirectives) { // Error recovery tests. //===----------------------------------------------------------------------===// +TEST_F(FormatTest, IndentationWithinColumnLimitNotPossible) { + verifyFormat("int aaaaaaaa =\n" + " // Overly long comment\n" + " b;", getLLVMStyleWithColumns(20)); + verifyFormat("function(\n" + " ShortArgument,\n" + " LoooooooooooongArgument);\n", getLLVMStyleWithColumns(20)); +} + TEST_F(FormatTest, IncorrectAccessSpecifier) { verifyFormat("public:"); verifyFormat("class A {\n" |