<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 6, 2017 at 6:29 PM, Krasimir Georgiev via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="cremed">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: krasimir<br>
Date: Mon Mar 6 11:29:25 2017<br>
New Revision: 297034<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=297034&view=rev" rel="noreferrer" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-<wbr>project?rev=297034&view=rev</a><br>
Log:<br>
[clang-format] Add tests for ambiguous namespaces to the comment fixer<br>
<br>
Modified:<br>
cfe/trunk/unittests/Format/<wbr>NamespaceEndCommentsFixerTest.<wbr>cpp<br>
<br>
Modified: cfe/trunk/unittests/Format/<wbr>NamespaceEndCommentsFixerTest.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/NamespaceEndCommentsFixerTest.cpp?rev=297034&r1=297033&r2=297034&view=diff" rel="noreferrer" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/unittests/<wbr>Format/<wbr>NamespaceEndCommentsFixerTest.<wbr>cpp?rev=297034&r1=297033&r2=<wbr>297034&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/unittests/Format/<wbr>NamespaceEndCommentsFixerTest.<wbr>cpp (original)<br>
+++ cfe/trunk/unittests/Format/<wbr>NamespaceEndCommentsFixerTest.<wbr>cpp Mon Mar 6 11:29:25 2017<br>
@@ -406,6 +406,86 @@ TEST_F(<wbr>NamespaceEndCommentsFixerTest,<br>
"#else\n"<br>
" int j;\n"<br>
"#endif"));<br>
+ EXPECT_EQ("#if A\n"<br>
+ "namespace A {\n"<br>
+ "#else\n"<br>
+ "namespace B {\n"<br>
+ "#endif\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "}",<br>
+ fixNamespaceEndComments("#if A\n"<br>
+ "namespace A {\n"<br>
+ "#else\n"<br>
+ "namespace B {\n"<br>
+ "#endif\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "}"));<br></blockquote><div><br></div><div>I don't understand why we aren't adding "// namespace A" here. I mean I don't think it matters much, but it seems weird to me.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ EXPECT_EQ("#if A\n"<br>
+ "namespace A {\n"<br>
+ "#else\n"<br>
+ "namespace B {\n"<br>
+ "#endif\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "} // namespace A",<br>
+ fixNamespaceEndComments("#if A\n"<br>
+ "namespace A {\n"<br>
+ "#else\n"<br>
+ "namespace B {\n"<br>
+ "#endif\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "} // namespace A"));<br></blockquote><div><br></div><div>I'd consider merging this test with the previous one. Might make it more obvious what the difference is. But I am not sure.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ EXPECT_EQ("#if A\n"<br>
+ "namespace A {\n"<br>
+ "#else\n"<br>
+ "namespace B {\n"<br>
+ "#endif\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "} // namespace B",<br>
+ fixNamespaceEndComments("#if A\n"<br>
+ "namespace A {\n"<br>
+ "#else\n"<br>
+ "namespace B {\n"<br>
+ "#endif\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "} // namespace B"));<br>
+ EXPECT_EQ("namespace A\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "#if A\n"<br>
+ "}\n"<br>
+ "#else\n"<br>
+ "}\n"<br>
+ "#endif",<br>
+ fixNamespaceEndComments("<wbr>namespace A\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "#if A\n"<br>
+ "}\n"<br>
+ "#else\n"<br>
+ "}\n"<br>
+ "#endif"));<br></blockquote><div><br></div><div>Similarly, I would have expected us to insert "//namespace A" here. Why don't we. Is that related to the missing "{" after "namespace A"?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ EXPECT_EQ("namespace A\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "#if A\n"<br>
+ "} // namespace A\n"<br>
+ "#else\n"<br>
+ "} // namespace A\n"<br>
+ "#endif",<br>
+ fixNamespaceEndComments("<wbr>namespace A\n"<br>
+ "int i;\n"<br>
+ "int j;\n"<br>
+ "#if A\n"<br>
+ "} // namespace A\n"<br>
+ "#else\n"<br>
+ "} // namespace A\n"<br>
+ "#endif"));<br>
}<br>
<br>
TEST_F(<wbr>NamespaceEndCommentsFixerTest,<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" class="cremed">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="cremed">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>