Support for CR LF newlines.
Summary:
reformat() tries to determine the newline style used in the input
(either LF or CR LF), and uses it for the output. Maybe not every single case is
supported, but at least the bug described in http://llvm.org/PR17182 should be
resolved.
Reviewers: djasper
Reviewed By: djasper
CC: cfe-commits, klimek
Differential Revision: http://llvm-reviews.chandlerc.com/D1643
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190519 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 7f6956e..00ece1a 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -116,7 +116,7 @@
TEST_F(FormatTest, FormatsGlobalStatementsAt0) {
EXPECT_EQ("int i;", format(" int i;"));
- EXPECT_EQ("\nint i;", format(" \n\t \r int i;"));
+ EXPECT_EQ("\nint i;", format(" \n\t \v \f int i;"));
EXPECT_EQ("int i;\nint j;", format(" int i; int j;"));
EXPECT_EQ("int i;\nint j;", format(" int i;\n int j;"));
}
@@ -6479,5 +6479,40 @@
"onOperationDone]; }] };");
}
+TEST_F(FormatTest, SupportsCRLF) {
+ EXPECT_EQ("int a;\r\n"
+ "int b;\r\n"
+ "int c;\r\n",
+ format("int a;\r\n"
+ " int b;\r\n"
+ " int c;\r\n",
+ getLLVMStyle()));
+ EXPECT_EQ("int a;\r\n"
+ "int b;\r\n"
+ "int c;\r\n",
+ format("int a;\r\n"
+ " int b;\n"
+ " int c;\r\n",
+ getLLVMStyle()));
+ EXPECT_EQ("int a;\n"
+ "int b;\n"
+ "int c;\n",
+ format("int a;\r\n"
+ " int b;\n"
+ " int c;\n",
+ getLLVMStyle()));
+ EXPECT_EQ("\"aaaaaaa \"\r\n"
+ "\"bbbbbbb\";\r\n",
+ format("\"aaaaaaa bbbbbbb\";\r\n", getLLVMStyleWithColumns(10)));
+ EXPECT_EQ("#define A \\\r\n"
+ " b; \\\r\n"
+ " c; \\\r\n"
+ " d;\r\n",
+ format("#define A \\\r\n"
+ " b; \\\r\n"
+ " c; d; \r\n",
+ getGoogleStyle()));
+}
+
} // end namespace tooling
} // end namespace clang