format: Handle #import as include directive too.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170914 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index b5e4a70..bb18e9a 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -579,6 +579,7 @@
return;
switch (Tokens[Index].Tok.getIdentifierInfo()->getPPKeywordID()) {
case tok::pp_include:
+ case tok::pp_import:
parseIncludeDirective();
break;
default:
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index a08f7c6..b33206b 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -617,6 +617,12 @@
EXPECT_EQ("#include \"a/b/string\"\n", format("#include \"a/b/string\"\n"));
EXPECT_EQ("#include \"string.h\"\n", format("#include \"string.h\"\n"));
EXPECT_EQ("#include \"string.h\"\n", format("#include \"string.h\"\n"));
+
+ EXPECT_EQ("#import <string>\n", format("#import <string>\n"));
+ EXPECT_EQ("#import <a/b/c.h>\n", format("#import <a/b/c.h>\n"));
+ EXPECT_EQ("#import \"a/b/string\"\n", format("#import \"a/b/string\"\n"));
+ EXPECT_EQ("#import \"string.h\"\n", format("#import \"string.h\"\n"));
+ EXPECT_EQ("#import \"string.h\"\n", format("#import \"string.h\"\n"));
}