Empty import list placement and comment binding

This commit is contained in:
Roman Shevchenko
2010-08-10 13:49:16 +04:00
parent 84487c5937
commit 88b087a894
22 changed files with 275 additions and 103 deletions
@@ -1,8 +1,8 @@
PsiJavaFile:ImportListBug.java
PsiDocComment
PsiDocToken:DOC_COMMENT_END('/**/')
PsiImportList
<empty list>
PsiDocComment
PsiDocToken:DOC_COMMENT_END('/**/')
PsiClass:AClass
PsiDocComment
PsiDocToken:DOC_COMMENT_START('/**')
@@ -20,4 +20,4 @@ PsiJavaFile:ImportListBug.java
<empty list>
PsiJavaToken:LBRACE('{')
PsiWhiteSpace('\n')
PsiJavaToken:RBRACE('}')
PsiJavaToken:RBRACE('}')
@@ -0,0 +1,5 @@
/** doc */
class C {
// plain
int f;
}
@@ -0,0 +1,36 @@
PsiJavaFile:BindBefore5.java
PsiImportList
<empty list>
PsiClass:C
PsiDocComment
PsiDocToken:DOC_COMMENT_START('/**')
PsiWhiteSpace(' ')
PsiDocToken:DOC_COMMENT_DATA('doc ')
PsiDocToken:DOC_COMMENT_END('*/')
PsiWhiteSpace('\n')
PsiModifierList:
<empty list>
PsiKeyword:class('class')
PsiWhiteSpace(' ')
PsiIdentifier:C('C')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace('\n ')
PsiField:f
PsiComment(END_OF_LINE_COMMENT)('// plain')
PsiWhiteSpace('\n ')
PsiModifierList:
<empty list>
PsiTypeElement:int
PsiKeyword:int('int')
PsiWhiteSpace(' ')
PsiIdentifier:f('f')
PsiJavaToken:SEMICOLON(';')
PsiWhiteSpace('\n')
PsiJavaToken:RBRACE('}')
@@ -0,0 +1,4 @@
package p;
// comment
class A { }
@@ -0,0 +1,30 @@
PsiJavaFile:BindBeforeClass1.java
PsiPackageStatement:p
PsiKeyword:package('package')
PsiWhiteSpace(' ')
PsiJavaCodeReferenceElement:p
PsiIdentifier:p('p')
PsiReferenceParameterList
<empty list>
PsiJavaToken:SEMICOLON(';')
PsiImportList
<empty list>
PsiWhiteSpace('\n\n')
PsiClass:A
PsiComment(END_OF_LINE_COMMENT)('// comment')
PsiWhiteSpace('\n')
PsiModifierList:
<empty list>
PsiKeyword:class('class')
PsiWhiteSpace(' ')
PsiIdentifier:A('A')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
@@ -0,0 +1,2 @@
// comment
class A { }
@@ -0,0 +1,21 @@
PsiJavaFile:BindBeforeClass2.java
PsiImportList
<empty list>
PsiClass:A
PsiComment(END_OF_LINE_COMMENT)('// comment')
PsiWhiteSpace('\n')
PsiModifierList:
<empty list>
PsiKeyword:class('class')
PsiWhiteSpace(' ')
PsiIdentifier:A('A')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
@@ -0,0 +1,3 @@
// comment
class A { }
@@ -0,0 +1,21 @@
PsiJavaFile:BindBeforeClass3.java
PsiImportList
<empty list>
PsiComment(END_OF_LINE_COMMENT)('// comment')
PsiWhiteSpace('\n\n')
PsiClass:A
PsiModifierList:
<empty list>
PsiKeyword:class('class')
PsiWhiteSpace(' ')
PsiIdentifier:A('A')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
@@ -0,0 +1,2 @@
package p;// comment
class A { }
@@ -0,0 +1,29 @@
PsiJavaFile:BindBeforeClass4.java
PsiPackageStatement:p
PsiKeyword:package('package')
PsiWhiteSpace(' ')
PsiJavaCodeReferenceElement:p
PsiIdentifier:p('p')
PsiReferenceParameterList
<empty list>
PsiJavaToken:SEMICOLON(';')
PsiImportList
<empty list>
PsiComment(END_OF_LINE_COMMENT)('// comment')
PsiWhiteSpace('\n')
PsiClass:A
PsiModifierList:
<empty list>
PsiKeyword:class('class')
PsiWhiteSpace(' ')
PsiIdentifier:A('A')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
@@ -0,0 +1,3 @@
// comment 1
// comment 2
class A { }
@@ -0,0 +1,23 @@
PsiJavaFile:BindBeforeClass5.java
PsiImportList
<empty list>
PsiClass:A
PsiComment(END_OF_LINE_COMMENT)('// comment 1')
PsiWhiteSpace('\n')
PsiComment(END_OF_LINE_COMMENT)('// comment 2')
PsiWhiteSpace('\n')
PsiModifierList:
<empty list>
PsiKeyword:class('class')
PsiWhiteSpace(' ')
PsiIdentifier:A('A')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
@@ -1,8 +1,8 @@
PsiJavaFile:Errors.java
PsiComment(END_OF_LINE_COMMENT)('// illegal modifier combinations')
PsiWhiteSpace('\n\n')
PsiImportList
<empty list>
PsiComment(END_OF_LINE_COMMENT)('// illegal modifier combinations')
PsiWhiteSpace('\n\n')
PsiClass:a
PsiModifierList:abstract public
PsiKeyword:abstract('abstract')
@@ -1,9 +1,9 @@
PsiJavaFile:Anonymous2.java
PsiComment(END_OF_LINE_COMMENT)('// "Copy 'a' to temp final variable" "true"')
PsiWhiteSpace('\n')
PsiImportList
<empty list>
PsiClass:DoubleTrouble
PsiComment(END_OF_LINE_COMMENT)('// "Copy 'a' to temp final variable" "true"')
PsiWhiteSpace('\n')
PsiModifierList:public
PsiKeyword:public('public')
PsiWhiteSpace(' ')