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

java: parser changes temporarily reverted

Browse Source
This commit is contained in:
Roman Shevchenko
2014-07-15 17:46:16 +02:00
parent 690797ed73
commit d5032e571a
3 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+1 -1
View File
@@ -282,7 +282,7 @@ public class DeclarationParser {
if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(builder.getTokenType())) {
type = parseTypeNotNull(builder);
}
else if (builder.getTokenType() == JavaTokenType.IDENTIFIER || builder.getTokenType() == JavaTokenType.AT) {
else if (builder.getTokenType() == JavaTokenType.IDENTIFIER /*|| builder.getTokenType() == JavaTokenType.AT*/) {
PsiBuilder.Marker idPos = builder.mark();
type = parseTypeNotNull(builder);
if (builder.getTokenType() == JavaTokenType.LPARENTH) { // constructor
java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.java
+4 -3
View File
@@ -47,9 +47,9 @@ class SpecSamples {
try (@A Reader r = new @B FileReader("/dev/zero"); @A Writer w = new @B FileWriter("/dev/null")) { }
}
interface TestClass {
<T> @Nullable List<T> test();
}
//interface TestClass {
// <T> @Nullable List<T> test();
//}
//
// 2. An annotation on a wildcard type argument appears before the wildcard ...
@@ -76,6 +76,7 @@ class SpecSamples {
//
@Immutable SpecSamples() { }
//<T> @Immutable SpecSamples(T t) { }
//
// todo [r.sh] 5. It is permitted to explicitly declare the method receiver as the first formal parameter ...
java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.txt
+7 -56
View File
@@ -1045,62 +1045,11 @@ PsiJavaFile:TypeAnnotations.java
PsiWhiteSpace('\n ')
PsiJavaToken:RBRACE('}')
PsiWhiteSpace('\n\n ')
PsiClass:TestClass
PsiModifierList:
<empty list>
PsiKeyword:interface('interface')
PsiWhiteSpace(' ')
PsiIdentifier:TestClass('TestClass')
PsiTypeParameterList
<empty list>
PsiReferenceList
<empty list>
PsiReferenceList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACE('{')
PsiWhiteSpace('\n ')
PsiMethod:test
PsiModifierList:
<empty list>
PsiTypeParameterList
PsiJavaToken:LT('<')
PsiTypeParameter:T
PsiIdentifier:T('T')
PsiElement(EXTENDS_BOUND_LIST)
<empty list>
PsiJavaToken:GT('>')
PsiWhiteSpace(' ')
PsiTypeElement:@Nullable List<T>
PsiAnnotation
PsiJavaToken:AT('@')
PsiJavaCodeReferenceElement:Nullable
PsiIdentifier:Nullable('Nullable')
PsiReferenceParameterList
<empty list>
PsiAnnotationParameterList
<empty list>
PsiWhiteSpace(' ')
PsiJavaCodeReferenceElement:List<T>
PsiIdentifier:List('List')
PsiReferenceParameterList
PsiJavaToken:LT('<')
PsiTypeElement:T
PsiJavaCodeReferenceElement:T
PsiIdentifier:T('T')
PsiReferenceParameterList
<empty list>
PsiJavaToken:GT('>')
PsiWhiteSpace(' ')
PsiIdentifier:test('test')
PsiParameterList:()
PsiJavaToken:LPARENTH('(')
PsiJavaToken:RPARENTH(')')
PsiReferenceList
<empty list>
PsiJavaToken:SEMICOLON(';')
PsiWhiteSpace('\n ')
PsiJavaToken:RBRACE('}')
PsiComment(END_OF_LINE_COMMENT)('//interface TestClass {')
PsiWhiteSpace('\n ')
PsiComment(END_OF_LINE_COMMENT)('// <T> @Nullable List<T> test();')
PsiWhiteSpace('\n ')
PsiComment(END_OF_LINE_COMMENT)('//}')
PsiWhiteSpace('\n\n ')
PsiComment(END_OF_LINE_COMMENT)('//')
PsiWhiteSpace('\n ')
@@ -1542,6 +1491,8 @@ PsiJavaFile:TypeAnnotations.java
PsiJavaToken:LBRACE('{')
PsiWhiteSpace(' ')
PsiJavaToken:RBRACE('}')
PsiWhiteSpace('\n ')
PsiComment(END_OF_LINE_COMMENT)('//<T> @Immutable SpecSamples(T t) { }')
PsiWhiteSpace('\n\n ')
PsiComment(END_OF_LINE_COMMENT)('//')
PsiWhiteSpace('\n ')