MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 06:05:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Empty import list placement and comment binding

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/psi/parser-full/commonParsing/ImportListBug.txt
+3 -3
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBefore5.java
+5
View File
@@ -0,0 +1,5 @@
/** doc */
class C {
// plain
int f;
}
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBefore5.txt
+36
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass1.java
+4
View File
@@ -0,0 +1,4 @@
package p;
// comment
class A { }
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass1.txt
+30
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass2.java
+2
View File
@@ -0,0 +1,2 @@
// comment
class A { }
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass2.txt
+21
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass3.java
+3
View File
@@ -0,0 +1,3 @@
// comment
class A { }
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass3.txt
+21
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass4.java
+2
View File
@@ -0,0 +1,2 @@
package p;// comment
class A { }
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass4.txt
+29
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass5.java
+3
View File
@@ -0,0 +1,3 @@
// comment 1
// comment 2
class A { }
java/java-tests/testData/psi/parser-full/declarationParsing/commentBinding/BindBeforeClass5.txt
+23
View File
@@ -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('}')
java/java-tests/testData/psi/parser-full/declarationParsing/method/Errors.txt
+2 -2
View File
@@ -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')
java/java-tests/testData/psi/parser-full/expressionParsing/Anonymous2.txt
+2 -2
View File
@@ -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(' ')
java/java-tests/testData/psi/parser-partial/files/BindDocComment1.txt
+2 -2
View File
@@ -13,9 +13,9 @@ PsiJavaFile:BindDocComment1.java
PsiReferenceParameterList
<empty list>
PsiJavaToken:SEMICOLON(';')
PsiWhiteSpace('\n')
PsiImportList
<empty list>
PsiWhiteSpace('\n')
PsiClass:A
PsiModifierList:
<empty list>
@@ -31,4 +31,4 @@ PsiJavaFile:BindDocComment1.java
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
PsiJavaToken:RBRACE('}')
java/java-tests/testSrc/com/intellij/lang/java/parser/declarationParsing/ClassParsingTest.java
+6 -5
View File
@@ -4,7 +4,6 @@ package com.intellij.lang.java.parser.declarationParsing;
import com.intellij.lang.java.parser.JavaParsingTestCase;
// todo: fix parser or test data and uncomment test
public class ClassParsingTest extends JavaParsingTestCase {
public ClassParsingTest() {
super("parser-full/declarationParsing/class");
@@ -32,9 +31,11 @@ public class ClassParsingTest extends JavaParsingTestCase {
public void testEnumWithImport() { doTest(true); }
public void testEnumWithoutConstants() { doTest(true); }
public void testEmptyImportList() { doTest(true); }
public void testLongClass() {doTest(false);}
//public void testIncompleteAnnotation() {doTest(true);}
public void testLongClass() { doTest(false); }
public void testIncompleteAnnotation() { doTestDefaultParser(true); } // todo: fix
//public void testExtraOpeningBraceInMethod() {doTest(true);}
public void testExtraClosingBraceInMethod() {doTest(true);}
public void testExtraOpeningBraceInMethod() { doTestDefaultParser(true); } // todo: fix
public void testExtraClosingBraceInMethod() { doTest(true);}
public void testError() { doTestDefaultParser(true);} // todo: fix
}
java/java-tests/testSrc/com/intellij/lang/java/parser/declarationParsing/CommentBindingTest.java
+7
View File
@@ -14,4 +14,11 @@ public class CommentBindingTest extends JavaParsingTestCase {
public void testBindBefore3() { doTest(true); }
public void testBindBefore3a() { doTest(true); }
public void testBindBefore4() { doTest(true); }
public void testBindBefore5() { doTest(true); }
public void testBindBeforeClass1() { doTest(true); }
public void testBindBeforeClass2() { doTest(true); }
public void testBindBeforeClass3() { doTest(true); }
public void testBindBeforeClass4() { doTest(true); }
public void testBindBeforeClass5() { doTest(true); }
}