Adds a new doxygen tag needed. // rdar://12379053

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179770 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 38 insertions, 0 deletions

diff --git a/include/clang/AST/CommentCommands.td b/include/clang/AST/CommentCommands.td
index 2ba6f2fb87..8c88494e9a 100644
--- a/include/clang/AST/CommentCommands.td
+++ b/include/clang/AST/CommentCommands.td
@@ -129,6 +129,7 @@ def Date       : BlockCommand<"date">;
 def Invariant  : BlockCommand<"invariant">;
 def Li         : BlockCommand<"li">;
 def Note       : BlockCommand<"note">;
+def Par        : BlockCommand<"par">;
 def Post       : BlockCommand<"post">;
 def Pre        : BlockCommand<"pre">;
 def Remark     : BlockCommand<"remark">;
diff --git a/test/Index/comment-misc-tags.m b/test/Index/comment-misc-tags.m
index 426102d374..9eae5489fc 100644
--- a/test/Index/comment-misc-tags.m
+++ b/test/Index/comment-misc-tags.m
@@ -71,3 +71,40 @@ struct S {
 // CHECK-NEXT:    (CXComment_Text Text=[ right alignment.])))
 // CHECK:       (CXComment_Paragraph
 // CHECK-NEXT:    (CXComment_Text Text=[  No other types of alignment are supported.]))
+
+// rdar://12379053
+/*! \struct Test
+ * Normal text.
+ *
+ * \par User defined paragraph:
+ * Contents of the paragraph.
+ *
+ * \par
+ * New paragraph under the same heading.
+ *
+ * \note
+ * This note consists of two paragraphs.
+ * This is the first paragraph.
+ *
+ * \par
+ * And this is the second paragraph.
+ *
+ * More normal text.
+ */
+  
+struct Test {int filler;};
+
+// CHECK:       (CXComment_BlockCommand CommandName=[par]
+// CHECK-NEXT:     (CXComment_Paragraph
+// CHECK-NEXT:        (CXComment_Text Text=[ User defined paragraph:] HasTrailingNewline)
+// CHECK-NEXT:        (CXComment_Text Text=[ Contents of the paragraph.])))
+// CHECK:       (CXComment_BlockCommand CommandName=[par]
+// CHECK-NEXT:     (CXComment_Paragraph
+// CHECK-NEXT:        (CXComment_Text Text=[ New paragraph under the same heading.])))
+// CHECK:       (CXComment_BlockCommand CommandName=[note]
+// CHECK-NEXT:     (CXComment_Paragraph
+// CHECK-NEXT:        (CXComment_Text Text=[ This note consists of two paragraphs.] HasTrailingNewline)
+// CHECK-NEXT:        (CXComment_Text Text=[ This is the first paragraph.])))
+// CHECK:       (CXComment_BlockCommand CommandName=[par]
+// CHECK-NEXT:     (CXComment_Paragraph
+// CHECK-NEXT:     (CXComment_Text Text=[ And this is the second paragraph.])))