From 6967e786df73e9bdd3f1413a37f7266fae7c482e Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Fri, 27 Sep 2013 16:40:11 +0000 Subject: [PATCH] Added a comment and another test for the UT_ForIndentation option git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@191530 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/WhitespaceManager.cpp | 2 ++ unittests/Format/FormatTest.cpp | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/Format/WhitespaceManager.cpp b/lib/Format/WhitespaceManager.cpp index 802145e72d..16d80ea429 100644 --- a/lib/Format/WhitespaceManager.cpp +++ b/lib/Format/WhitespaceManager.cpp @@ -290,6 +290,8 @@ void WhitespaceManager::appendIndentText(std::string &Text, case FormatStyle::UT_ForIndentation: if (WhitespaceStartColumn == 0) { unsigned Indentation = IndentLevel * Style.IndentWidth; + // This happens, e.g. when a line in a block comment is indented less than + // the first one. if (Indentation > Spaces) Indentation = Spaces; unsigned Tabs = Indentation / Style.TabWidth; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 4c7399113d..08b5643ac0 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -5932,7 +5932,19 @@ TEST_F(FormatTest, ConfigurableUseOfTab) { "\t/*\n" "\n" "\t*/\n" - "}", Tab)); + "}", + Tab)); + EXPECT_EQ("{\n" + "\t/*\n" + " asdf\n" + "\t*/\n" + "}", + format("{\n" + "\t/*\n" + " asdf\n" + "\t*/\n" + "}", + Tab)); Tab.UseTab = FormatStyle::UT_Never; EXPECT_EQ("/*\n" -- 2.40.0