Fixed doc-comment not attached to the first declaration with no package directive + incorrect placement of comments for enum entry

This commit is contained in:
Valentin Kipyatkov
2014-10-03 16:04:05 +04:00
parent e3d6b7358c
commit 377df47e29
29 changed files with 201 additions and 66 deletions
+3 -3
View File
@@ -1,4 +1,6 @@
JetFile: AtTags.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n ')
@@ -12,6 +14,4 @@ JetFile: AtTags.kt
PsiElement(KDOC_LEADING_ASTERISK)('*')
PsiElement(KDOC_TEXT)(' @')
PsiWhiteSpace('\n ')
PsiElement(KDOC_END)('*/')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_END)('*/')
@@ -1,5 +1,5 @@
JetFile: DocCommentAtBeginningOfFile1.kt
KDoc
PsiElement(KDOC_START)('/**')
PACKAGE_DIRECTIVE
<empty list>
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
@@ -1,7 +1,7 @@
JetFile: DocCommentAtBeginningOfFile2.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n')
PsiElement(KDOC_TEXT)('/**')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_TEXT)('/**')
@@ -1,7 +1,7 @@
JetFile: DocCommentAtBeginningOfFile3.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n\n')
PsiElement(KDOC_TEXT)('fooo')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_TEXT)('fooo')
@@ -1,9 +1,9 @@
JetFile: DocCommentAtBeginningOfFile4.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n\n')
PsiElement(KDOC_TEXT)('/**foo*/')
PsiWhiteSpace('\n\n')
PsiElement(KDOC_TEXT)('asdfas')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_TEXT)('asdfas')
@@ -1,7 +1,7 @@
JetFile: EndOnLeadingAsterisks.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n ')
PsiElement(KDOC_END)('*/')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_END)('*/')
@@ -1,7 +1,7 @@
JetFile: EndRightAfterText.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiElement(KDOC_TEXT)('text')
PsiElement(KDOC_END)('*/')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_END)('*/')
+3 -3
View File
@@ -1,7 +1,7 @@
JetFile: Incomplete.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n ')
PsiElement(KDOC_TEXT)('contents')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_TEXT)('contents')
+3 -3
View File
@@ -1,4 +1,6 @@
JetFile: Markdown.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n ')
@@ -15,6 +17,4 @@ JetFile: Markdown.kt
PsiElement(KDOC_MARKDOWN_ESCAPED_CHAR)('\]')
PsiElement(KDOC_TEXT)(']')
PsiWhiteSpace('\n ')
PsiElement(KDOC_END)('*/')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_END)('*/')
+3 -3
View File
@@ -1,4 +1,6 @@
JetFile: Simple.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiElement(KDOC_TEXT)(' line 0')
@@ -18,6 +20,4 @@ JetFile: Simple.kt
PsiWhiteSpace('\n ')
PsiElement(KDOC_LEADING_ASTERISK)('**')
PsiElement(KDOC_TEXT)(' line 6 ')
PsiElement(KDOC_END)('*/')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_END)('*/')
@@ -1,10 +1,10 @@
JetFile: TextRightAfterLeadAsterisks.kt
PACKAGE_DIRECTIVE
<empty list>
KDoc
PsiElement(KDOC_START)('/**')
PsiWhiteSpace('\n')
PsiElement(KDOC_LEADING_ASTERISK)('**')
PsiElement(KDOC_TEXT)('test')
PsiWhiteSpace('\n ')
PsiElement(KDOC_END)('*/')
PACKAGE_DIRECTIVE
<empty list>
PsiElement(KDOC_END)('*/')