azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix irregular PSI structure for classes without body

Browse Source
This commit is contained in:
Alexey Sedunov
2013-10-03 17:44:22 +04:00
parent bdc908d45f
commit 28b3db53fe
51 changed files with 47 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+3 -2
View File
@@ -1234,9 +1234,9 @@ public class JetParsing extends AbstractJetParsing {
* ;
*/
private boolean parseTypeParameterList(TokenSet recoverySet) {
PsiBuilder.Marker list = mark();
boolean result = false;
if (at(LT)) {
PsiBuilder.Marker list = mark();
myBuilder.disableNewlines();
advance(); // LT
@@ -1252,8 +1252,9 @@ public class JetParsing extends AbstractJetParsing {
expect(GT, "Missing '>'", recoverySet);
myBuilder.restoreNewlinesState();
result = true;
list.done(TYPE_PARAMETER_LIST);
}
list.done(TYPE_PARAMETER_LIST);
return result;
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
import java.io.IOException;
public class JetFileElementType extends IStubFileElementType<PsiJetFileStub> {
public static final int STUB_VERSION = 23;
public static final int STUB_VERSION = 24;
public JetFileElementType() {
super("jet.FILE", JetLanguage.INSTANCE);
compiler/testData/psi/AnonymousInitializer.txt
-2
View File
@@ -6,8 +6,6 @@ JetFile: AnonymousInitializer.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
compiler/testData/psi/ByCaluses.kt → compiler/testData/psi/ByClauses.kt
View File
compiler/testData/psi/ByCaluses.txt → compiler/testData/psi/ByClauses.txt
+1 -15
View File
@@ -1,4 +1,4 @@
JetFile: ByCaluses.kt
JetFile: ByClauses.kt
NAMESPACE_HEADER
<empty list>
CLASS
@@ -6,8 +6,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -42,8 +40,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -96,8 +92,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -135,8 +129,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -182,8 +174,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -232,8 +222,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -283,8 +271,6 @@ JetFile: ByCaluses.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
compiler/testData/psi/Constructors.txt
-6
View File
@@ -6,8 +6,6 @@ JetFile: Constructors.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n')
@@ -20,8 +18,6 @@ JetFile: Constructors.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -43,8 +39,6 @@ JetFile: Constructors.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PRIMARY_CONSTRUCTOR_MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
compiler/testData/psi/EOLsOnRollback.txt
+2 -8
View File
@@ -16,9 +16,7 @@ JetFile: EOLsOnRollback.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n ')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -31,16 +29,12 @@ JetFile: EOLsOnRollback.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n\n ')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/Enums.txt
-2
View File
@@ -8,8 +8,6 @@ JetFile: Enums.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Color')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/FunctionNoParameterList.txt
-6
View File
@@ -6,8 +6,6 @@ JetFile: FunctionNoParameterList.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -23,8 +21,6 @@ JetFile: FunctionNoParameterList.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -43,8 +39,6 @@ JetFile: FunctionNoParameterList.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('C')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
compiler/testData/psi/FunctionTypes.txt
-36
View File
@@ -6,8 +6,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -44,8 +42,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -71,8 +67,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -103,8 +97,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -125,8 +117,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -166,8 +156,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -197,8 +185,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -219,8 +205,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -241,8 +225,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -300,8 +282,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -338,8 +318,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -389,8 +367,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -450,8 +426,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -478,8 +452,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -510,8 +482,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -565,8 +535,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -603,8 +571,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -645,8 +611,6 @@ JetFile: FunctionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/FunctionTypes_ERR.txt
-2
View File
@@ -6,8 +6,6 @@ JetFile: FunctionTypes_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/Imports_ERR.txt
-2
View File
@@ -258,8 +258,6 @@ JetFile: Imports_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
compiler/testData/psi/Inner.txt
+1 -5
View File
@@ -6,8 +6,6 @@ JetFile: Inner.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Outer')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -18,7 +16,5 @@ JetFile: Inner.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Inner')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/testData/psi/LocalDeclarations.txt
-6
View File
@@ -36,8 +36,6 @@ JetFile: LocalDeclarations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foof')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -60,8 +58,6 @@ JetFile: LocalDeclarations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foof')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -105,8 +101,6 @@ JetFile: LocalDeclarations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/MultiVariableDeclarations.txt
-2
View File
@@ -544,8 +544,6 @@ JetFile: MultiVariableDeclarations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('X')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt
+1 -7
View File
@@ -8,9 +8,7 @@ JetFile: PrimaryConstructorModifiers_ERR.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace('\n\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n\n')
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -19,8 +17,6 @@ JetFile: PrimaryConstructorModifiers_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('AB')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PRIMARY_CONSTRUCTOR_MODIFIER_LIST
PsiElement(private)('private')
PsiErrorElement:Expecting primary constructor parameter list
@@ -48,8 +44,6 @@ JetFile: PrimaryConstructorModifiers_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A1')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
compiler/testData/psi/PropertiesFollowedByInitializers.txt
-12
View File
@@ -5,8 +5,6 @@ JetFile: PropertiesFollowedByInitializers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Foo')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -266,8 +264,6 @@ JetFile: PropertiesFollowedByInitializers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('PublicVar')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -295,8 +291,6 @@ JetFile: PropertiesFollowedByInitializers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('PublicVar')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -336,8 +330,6 @@ JetFile: PropertiesFollowedByInitializers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('PublicVar')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -364,8 +356,6 @@ JetFile: PropertiesFollowedByInitializers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('PublicVar')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -393,8 +383,6 @@ JetFile: PropertiesFollowedByInitializers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('PublicVar')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
compiler/testData/psi/QuotedIdentifiers.txt
+4 -12
View File
@@ -36,26 +36,18 @@ JetFile: QuotedIdentifiers.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('`$`')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('`$$`')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('` `')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('`1`')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(IDENTIFIER)('`1`')
compiler/testData/psi/RootNamespace.txt
+1 -3
View File
@@ -13,9 +13,7 @@ JetFile: RootNamespace.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('X')
PsiWhiteSpace('\n\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n\n')
PsiErrorElement:Expecting package directive or top level declaration
PsiElement(package)('package')
PsiWhiteSpace(' ')
compiler/testData/psi/ShortAnnotations.txt
+2 -12
View File
@@ -107,9 +107,7 @@ JetFile: ShortAnnotations.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
OBJECT_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
@@ -412,8 +410,6 @@ JetFile: ShortAnnotations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -426,8 +422,6 @@ JetFile: ShortAnnotations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -543,9 +537,7 @@ JetFile: ShortAnnotations.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace('\n ')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
@@ -848,8 +840,6 @@ JetFile: ShortAnnotations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/SimpleClassMembers.txt
-16
View File
@@ -6,8 +6,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
@@ -16,8 +14,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -37,8 +33,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -66,8 +60,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -82,8 +74,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -227,8 +217,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -256,8 +244,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -290,8 +276,6 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/SimpleClassMembers_ERR.txt
-8
View File
@@ -6,8 +6,6 @@ JetFile: SimpleClassMembers_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
@@ -16,8 +14,6 @@ JetFile: SimpleClassMembers_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -30,8 +26,6 @@ JetFile: SimpleClassMembers_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -70,8 +64,6 @@ JetFile: SimpleClassMembers_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/SoftKeywords.txt
-2
View File
@@ -1001,8 +1001,6 @@ JetFile: SoftKeywords.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('F')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/TypeAnnotations.txt
-4
View File
@@ -5,8 +5,6 @@ JetFile: TypeAnnotations.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('F')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
@@ -45,8 +43,6 @@ JetFile: TypeAnnotations.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/TypeDef.txt
-4
View File
@@ -16,8 +16,6 @@ JetFile: TypeDef.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -120,8 +118,6 @@ JetFile: TypeDef.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/TypeDef_ERR.txt
+19 -43
View File
@@ -6,30 +6,24 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiErrorElement:Expecting '='
<empty list>
TYPE_REFERENCE
<empty list>
PsiErrorElement:Type expected
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiErrorElement:Expecting '='
<empty list>
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiErrorElement:Expecting '='
<empty list>
TYPE_REFERENCE
<empty list>
PsiErrorElement:Type expected
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace('\n')
TYPE_REFERENCE
@@ -40,12 +34,21 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiErrorElement:Expecting '='
<empty list>
PsiWhiteSpace(' ')
TYPE_REFERENCE
<empty list>
PsiErrorElement:Type expected
<empty list>
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
@@ -53,21 +56,6 @@ JetFile: TypeDef_ERR.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiErrorElement:Expecting '='
<empty list>
TYPE_REFERENCE
<empty list>
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -80,8 +68,6 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -94,8 +80,6 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace('\n')
TYPE_REFERENCE
@@ -106,8 +90,6 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -122,8 +104,6 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -200,16 +180,12 @@ JetFile: TypeDef_ERR.kt
PsiElement(class)('class')
PsiErrorElement:Class name expected
<empty list>
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/examples/AnonymousObjects.txt
-2
View File
@@ -131,8 +131,6 @@ JetFile: AnonymousObjects.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('GodMessages')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/examples/BinaryTree.txt
-2
View File
@@ -38,8 +38,6 @@ JetFile: BinaryTree.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('TreeNode')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiWhiteSpace('\n ')
compiler/testData/psi/examples/BitArith.txt
-2
View File
@@ -522,8 +522,6 @@ JetFile: BitArith.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('INumber')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
compiler/testData/psi/examples/Builder.txt
-8
View File
@@ -240,8 +240,6 @@ JetFile: Builder.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('AntBuilder')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -253,8 +251,6 @@ JetFile: Builder.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('ClassPathEntry')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
@@ -264,8 +260,6 @@ JetFile: Builder.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Module')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -346,8 +340,6 @@ JetFile: Builder.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Library')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
compiler/testData/psi/examples/Color.txt
-2
View File
@@ -8,8 +8,6 @@ JetFile: Color.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Color')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/examples/FunctionsAndTypes.txt
-12
View File
@@ -6,8 +6,6 @@ JetFile: FunctionsAndTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f1')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -35,8 +33,6 @@ JetFile: FunctionsAndTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f2')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -71,8 +67,6 @@ JetFile: FunctionsAndTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f_tuple')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -115,8 +109,6 @@ JetFile: FunctionsAndTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('hof')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -157,8 +149,6 @@ JetFile: FunctionsAndTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('hof2')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -352,8 +342,6 @@ JetFile: FunctionsAndTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Runnable')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/examples/PolymorphicClassObjects.txt
-2
View File
@@ -74,8 +74,6 @@ JetFile: PolymorphicClassObjects.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Buildable')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/examples/UnionFind.txt
-2
View File
@@ -6,8 +6,6 @@ JetFile: UnionFind.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('UnionFind')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/examples/UpdateOperation.txt
-2
View File
@@ -5,8 +5,6 @@ JetFile: UpdateOperation.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Pair')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/examples/collections/HashMap.txt
-6
View File
@@ -9,8 +9,6 @@ JetFile: HashMap.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('IEquality')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -102,8 +100,6 @@ JetFile: HashMap.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('IHashable')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -302,8 +298,6 @@ JetFile: HashMap.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('HashableWrapper')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/examples/collections/ISized.txt
-2
View File
@@ -9,8 +9,6 @@ JetFile: ISized.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('ISized')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/examples/collections/LinkedList.txt
-2
View File
@@ -38,8 +38,6 @@ JetFile: LinkedList.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Item')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/examples/io/IOSamples.txt
-8
View File
@@ -54,8 +54,6 @@ JetFile: IOSamples.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('ICloseable')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
@@ -76,8 +74,6 @@ JetFile: IOSamples.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('JavaCloseableWrapper')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
@@ -203,8 +199,6 @@ JetFile: IOSamples.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('FileInput')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
@@ -448,8 +442,6 @@ JetFile: IOSamples.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('FileOutput')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
compiler/testData/psi/examples/util/Comparison.txt
-2
View File
@@ -211,8 +211,6 @@ JetFile: Comparison.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('ComparisonResult')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
-22
View File
@@ -6,8 +6,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -71,8 +69,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -131,8 +127,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -187,8 +181,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -247,8 +239,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -330,8 +320,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -390,8 +378,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -471,8 +457,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -548,8 +532,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -629,8 +611,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
@@ -733,8 +713,6 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
-2
View File
@@ -52,8 +52,6 @@ JetFile: FunctionTypesAsArguments.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Lifetime')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
+2 -6
View File
@@ -5,16 +5,12 @@ JetFile: functionLiterals.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace('\n\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n\n')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
compiler/testData/psi/greatSyntacticShift/functionTypes.txt
+1 -9
View File
@@ -6,8 +6,6 @@ JetFile: functionTypes.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n')
@@ -31,9 +29,7 @@ JetFile: functionTypes.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace('\n')
TYPE_PARAMETER_LIST
<empty list>
PsiWhiteSpace('\n')
PsiErrorElement:Expecting package directive or top level declaration
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
@@ -44,8 +40,6 @@ JetFile: functionTypes.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('XXX')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -702,8 +696,6 @@ JetFile: functionTypes.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('YYY')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
compiler/testData/psi/propertyDelegate/LocalProperty.txt
-2
View File
@@ -6,8 +6,6 @@ JetFile: LocalProperty.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/propertyDelegate/PropertyInClass.txt
-2
View File
@@ -6,8 +6,6 @@ JetFile: PropertyInClass.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
-2
View File
@@ -5,8 +5,6 @@ JetFile: ValueParameterNoTypeRecovery.kt
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Test')
TYPE_PARAMETER_LIST
<empty list>
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
compiler/testData/psi/recovery/kt2172.txt
-2
View File
@@ -6,8 +6,6 @@ JetFile: kt2172.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
+3 -3
View File
@@ -97,9 +97,9 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt");
}
@TestMetadata("ByCaluses.kt")
public void testByCaluses() throws Exception {
doParsingTest("compiler/testData/psi/ByCaluses.kt");
@TestMetadata("ByClauses.kt")
public void testByClauses() throws Exception {
doParsingTest("compiler/testData/psi/ByClauses.kt");
}
@TestMetadata("CallWithManyClosures.kt")
idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNoBody.kt
+3 -3
View File
@@ -1,8 +1,8 @@
// "Add 'open fun f()' to 'A'" "true"
trait A
{
trait A {
open fun f()
}
class B : A {
<caret>override fun f() {}
override fun f() {}
}
idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
+3 -11
View File
@@ -76,7 +76,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
doBuildTest("class C { class object { fun foo() {} }}",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=C fqn=C superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" OBJECT_DECLARATION:PsiJetObjectStubImpl[class-object name=null fqName=null]\n" +
" FUN:PsiJetFunctionStubImpl[name=foo]\n" +
" VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n");
@@ -118,7 +117,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
"}",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=More fqn=More superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" PROPERTY:PsiJetPropertyStubImpl[val name=test typeText=Int bodyText=11]\n");
}
@@ -147,7 +145,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
"}\n",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=Test fqn=Test superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n" +
" PROPERTY:PsiJetPropertyStubImpl[val name=test typeText=null bodyText=12]\n" +
" FUN:PsiJetFunctionStubImpl[name=more]\n" +
@@ -158,7 +155,6 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
doBuildTest("enum class Test { First\n Second\n }",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[enumClass name=Test fqn=Test superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" ENUM_ENTRY:PsiJetClassStubImpl[enumEntry name=First fqn=Test.First superNames=[]]\n" +
" ENUM_ENTRY:PsiJetClassStubImpl[enumEntry name=Second fqn=Test.Second superNames=[]]\n"
);
@@ -167,17 +163,14 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
public void testAnnotationClass() {
doBuildTest("annotation class Test",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[isAnnotation name=Test fqn=Test superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n");
" CLASS:PsiJetClassStubImpl[isAnnotation name=Test fqn=Test superNames=[]]\n");
}
public void testInnerClass() {
doBuildTest("class A { inner class B { } }",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=A fqn=A superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
" CLASS:PsiJetClassStubImpl[inner name=B fqn=A.B superNames=[]]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n");
" CLASS:PsiJetClassStubImpl[inner name=B fqn=A.B superNames=[]]\n");
}
public void testNamedObject() {
@@ -190,8 +183,7 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
doBuildTest("Deprecated class Test {}",
"PsiJetFileStubImpl[package=]\n" +
" CLASS:PsiJetClassStubImpl[name=Test fqn=Test superNames=[]]\n" +
" ANNOTATION_ENTRY:PsiJetAnnotationStubImpl[shortName=Deprecated]\n" +
" TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n");
" ANNOTATION_ENTRY:PsiJetAnnotationStubImpl[shortName=Deprecated]\n");
}
public void testAnnotationOnFunction() {