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

Support modifiers on types in parser

Browse Source 
(required for 'suspend' on functional types).

TYPE_REFERENCE element now has MODIFIER_LIST child, which hosts annotations and modifiers for the corresponding type reference.

Annotations and modifiers written before an extension function type are now parsed as annotations and modifiers for the functional type, not the receiver type.
So, '@Ann A.(B) -> C' was '(@Ann A).(B) -> C', and became '@Ann (A.(B) -> C)'.
NB: DSL_SCOPE_VIOLATION testData updated accordingly.

Type projection variance modifiers ('in', 'out') belong to a separate modifier list under corresponding type projection (not under a type reference).
'A<in suspend T>' is 'A<(in (suspend T))>', 'A<suspend in T>' is an error.

In stub builder, create a modifier list node to host annotations and modifiers (none so far; TODO properly serialize/deserialize types with modifiers).
This commit is contained in:
Dmitry Petrov
2016-12-13 15:25:38 +03:00
committed by Stanislav Erokhin
parent 6649f64e9f
commit a15d423db4
45 changed files with 2223 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java
+3
View File
@@ -231,6 +231,9 @@ public interface KtTokens {
TokenSet MODIFIER_KEYWORDS = TokenSet.create(MODIFIER_KEYWORDS_ARRAY); TokenSet MODIFIER_KEYWORDS = TokenSet.create(MODIFIER_KEYWORDS_ARRAY);
TokenSet TYPE_MODIFIER_KEYWORDS = TokenSet.create(SUSPEND_KEYWORD);
TokenSet TYPE_ARGUMENT_MODIFIER_KEYWORDS = TokenSet.create(IN_KEYWORD, OUT_KEYWORD);
TokenSet VISIBILITY_MODIFIERS = TokenSet.create(PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD); TokenSet VISIBILITY_MODIFIERS = TokenSet.create(PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD);
TokenSet WHITESPACES = TokenSet.create(TokenType.WHITE_SPACE); TokenSet WHITESPACES = TokenSet.create(TokenType.WHITE_SPACE);
compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java
+32 -9
View File
@@ -457,6 +457,23 @@ public class KotlinParsing extends AbstractKotlinParsing {
@Nullable Consumer<IElementType> tokenConsumer, @Nullable Consumer<IElementType> tokenConsumer,
@NotNull AnnotationParsingMode annotationParsingMode, @NotNull AnnotationParsingMode annotationParsingMode,
@NotNull TokenSet noModifiersBefore @NotNull TokenSet noModifiersBefore
) {
return doParseModifierList(tokenConsumer, MODIFIER_KEYWORDS, annotationParsingMode, noModifiersBefore);
}
private boolean parseTypeModifierList() {
return doParseModifierList(null, TYPE_MODIFIER_KEYWORDS, DEFAULT, TokenSet.EMPTY);
}
private boolean parseTypeArgumentModifierList() {
return doParseModifierList(null, TYPE_ARGUMENT_MODIFIER_KEYWORDS, NO_ANNOTATIONS, TokenSet.create(COMMA, COLON, GT));
}
private boolean doParseModifierList(
@Nullable Consumer<IElementType> tokenConsumer,
@NotNull TokenSet modifierKeywords,
@NotNull AnnotationParsingMode annotationParsingMode,
@NotNull TokenSet noModifiersBefore
) { ) {
PsiBuilder.Marker list = mark(); PsiBuilder.Marker list = mark();
boolean empty = true; boolean empty = true;
@@ -464,7 +481,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
if (at(AT) && annotationParsingMode.allowAnnotations) { if (at(AT) && annotationParsingMode.allowAnnotations) {
parseAnnotationOrList(annotationParsingMode); parseAnnotationOrList(annotationParsingMode);
} }
else if (tryParseModifier(tokenConsumer, noModifiersBefore)) { else if (tryParseModifier(tokenConsumer, noModifiersBefore, modifierKeywords)) {
// modifier advanced // modifier advanced
} }
else { else {
@@ -481,10 +498,14 @@ public class KotlinParsing extends AbstractKotlinParsing {
return !empty; return !empty;
} }
private boolean tryParseModifier(@Nullable Consumer<IElementType> tokenConsumer, @NotNull TokenSet noModifiersBefore) { private boolean tryParseModifier(
@Nullable Consumer<IElementType> tokenConsumer,
@NotNull TokenSet noModifiersBefore,
@NotNull TokenSet modifierKeywords
) {
PsiBuilder.Marker marker = mark(); PsiBuilder.Marker marker = mark();
if (atSet(MODIFIER_KEYWORDS)) { if (atSet(modifierKeywords)) {
IElementType lookahead = lookahead(1); IElementType lookahead = lookahead(1);
if (lookahead != null && !noModifiersBefore.contains(lookahead)) { if (lookahead != null && !noModifiersBefore.contains(lookahead)) {
IElementType tt = tt(); IElementType tt = tt();
@@ -1865,7 +1886,8 @@ public class KotlinParsing extends AbstractKotlinParsing {
// on expression-indicating symbols or not // on expression-indicating symbols or not
private PsiBuilder.Marker parseTypeRefContents(TokenSet extraRecoverySet) { private PsiBuilder.Marker parseTypeRefContents(TokenSet extraRecoverySet) {
PsiBuilder.Marker typeRefMarker = mark(); PsiBuilder.Marker typeRefMarker = mark();
parseAnnotations(DEFAULT);
parseTypeModifierList();
PsiBuilder.Marker typeElementMarker = mark(); PsiBuilder.Marker typeElementMarker = mark();
@@ -1930,9 +1952,11 @@ public class KotlinParsing extends AbstractKotlinParsing {
// A.(B) -> C // A.(B) -> C
// ^ // ^
PsiBuilder.Marker functionType = typeRefMarker.precede(); PsiBuilder.Marker functionType = typeElementMarker.precede();
PsiBuilder.Marker receiverType = typeRefMarker.precede();
typeRefMarker.done(TYPE_REFERENCE); PsiBuilder.Marker receiverTypeRef = typeElementMarker.precede();
PsiBuilder.Marker receiverType = receiverTypeRef.precede();
receiverTypeRef.done(TYPE_REFERENCE);
receiverType.done(FUNCTION_TYPE_RECEIVER); receiverType.done(FUNCTION_TYPE_RECEIVER);
advance(); // DOT advance(); // DOT
@@ -1943,7 +1967,6 @@ public class KotlinParsing extends AbstractKotlinParsing {
else { else {
error("Expecting function type"); error("Expecting function type");
} }
typeRefMarker = functionType.precede();
functionType.done(FUNCTION_TYPE); functionType.done(FUNCTION_TYPE);
} }
@@ -2089,7 +2112,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
// Currently we do not allow annotations on star projections and probably we should not // Currently we do not allow annotations on star projections and probably we should not
// Annotations on other kinds of type arguments should be parsed as common type annotations (within parseTypeRef call) // Annotations on other kinds of type arguments should be parsed as common type annotations (within parseTypeRef call)
parseModifierList(NO_ANNOTATIONS, TokenSet.create(COMMA, COLON, GT)); parseTypeArgumentModifierList();
if (at(MUL)) { if (at(MUL)) {
advance(); // MUL advance(); // MUL
compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeReference.kt
+4 -3
View File
@@ -27,7 +27,8 @@ import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
* Type reference element. * Type reference element.
* Underlying token is [org.jetbrains.kotlin.KtNodeTypes.TYPE_REFERENCE] * Underlying token is [org.jetbrains.kotlin.KtNodeTypes.TYPE_REFERENCE]
*/ */
class KtTypeReference : KtElementImplStub<KotlinPlaceHolderStub<KtTypeReference>>, KtAnnotated, KtAnnotationsContainer { class KtTypeReference : KtModifierListOwnerStub<KotlinPlaceHolderStub<KtTypeReference>>,
KtAnnotated, KtAnnotationsContainer {
constructor(node: ASTNode) : super(node) constructor(node: ASTNode) : super(node)
@@ -41,11 +42,11 @@ class KtTypeReference : KtElementImplStub<KotlinPlaceHolderStub<KtTypeReference>
get() = KtStubbedPsiUtil.getStubOrPsiChild(this, KtStubElementTypes.TYPE_ELEMENT_TYPES, KtTypeElement.ARRAY_FACTORY) get() = KtStubbedPsiUtil.getStubOrPsiChild(this, KtStubElementTypes.TYPE_ELEMENT_TYPES, KtTypeElement.ARRAY_FACTORY)
override fun getAnnotations(): List<KtAnnotation> { override fun getAnnotations(): List<KtAnnotation> {
return getStubOrPsiChildrenAsList(KtStubElementTypes.ANNOTATION) return modifierList?.annotations.orEmpty()
} }
override fun getAnnotationEntries(): List<KtAnnotationEntry> { override fun getAnnotationEntries(): List<KtAnnotationEntry> {
return this.collectAnnotationEntriesFromStubOrPsi() return modifierList?.annotationEntries.orEmpty()
} }
fun hasParentheses(): Boolean { fun hasParentheses(): Boolean {
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
+1 -1
View File
@@ -28,7 +28,7 @@ object KotlinStubVersions {
// Binary stub version should be increased if stub format (org.jetbrains.kotlin.psi.stubs.impl) is changed // Binary stub version should be increased if stub format (org.jetbrains.kotlin.psi.stubs.impl) is changed
// or changes are made to the core stub building code (org.jetbrains.kotlin.idea.decompiler.stubBuilder). // or changes are made to the core stub building code (org.jetbrains.kotlin.idea.decompiler.stubBuilder).
// Increasing this version will lead to reindexing of all binary files that are potentially kotlin binaries (including all class files). // Increasing this version will lead to reindexing of all binary files that are potentially kotlin binaries (including all class files).
private const val BINARY_STUB_VERSION = 55 private const val BINARY_STUB_VERSION = 56
// Classfile stub version should be increased if changes are made to classfile stub building subsystem (org.jetbrains.kotlin.idea.decompiler.classFile) // Classfile stub version should be increased if changes are made to classfile stub building subsystem (org.jetbrains.kotlin.idea.decompiler.classFile)
// Increasing this version will lead to reindexing of all classfiles. // Increasing this version will lead to reindexing of all classfiles.
compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface Some {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun f1(): kotlin.String.() -> kotlin.Int public abstract fun f1(): kotlin.String.() -> kotlin.Int
public abstract fun f2(): kotlin.String.() -> kotlin.Int public abstract fun f2(): kotlin.String.() -> kotlin.Int
public abstract fun f3(): @ann kotlin.String.() -> kotlin.Int public abstract fun f3(): @ann() (kotlin.String.() -> kotlin.Int)
public abstract fun f4(): @ann() (kotlin.String.() -> kotlin.Int) public abstract fun f4(): @ann() (kotlin.String.() -> kotlin.Int)
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/resolve/dslMarker/insideTopLevelExtensionAnnotatedType.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ class B {
fun b() = 2 fun b() = 2
} }
fun bar(x: @Ann B.() -> Unit) {} fun bar(x: (@Ann B).() -> Unit) {}
fun @Ann A.test() { fun @Ann A.test() {
bar { bar {
compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.kt
Vendored
+6 -6
View File
@@ -15,15 +15,15 @@ class B {
fun b() = 2 fun b() = 2
} }
fun foo1(x: @L1 A.() -> Unit) {} fun foo1(x: (@L1 A).() -> Unit) {}
fun foo2(x: @L2 A.() -> Unit) {} fun foo2(x: (@L2 A).() -> Unit) {}
fun foo12(x: @L1 @L2 A.() -> Unit) {} fun foo12(x: (@L1 @L2 A).() -> Unit) {}
fun bar1(x: @L1 B.() -> Unit) {} fun bar1(x: (@L1 B).() -> Unit) {}
fun bar2(x: @L2 B.() -> Unit) {} fun bar2(x: (@L2 B).() -> Unit) {}
fun <T> bar1t(q: T, x: @L1 T.() -> Unit) {} fun <T> bar1t(q: T, x: (@L1 T).() -> Unit) {}
fun test() { fun test() {
foo12 { foo12 {
compiler/testData/diagnostics/tests/resolve/dslMarker/nestedWithSameReceiver.kt
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@ class B {
fun b() = 2 fun b() = 2
} }
fun foo(x: @Ann A.() -> Unit) {} fun foo(x: (@Ann A).() -> Unit) {}
fun bar(x: @Ann B.() -> Unit) {} fun bar(x: (@Ann B).() -> Unit) {}
fun test() { fun test() {
foo { foo {
compiler/testData/diagnostics/tests/resolve/dslMarker/simpleAnnotatedTypes.kt
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@ class B {
fun b() = 2 fun b() = 2
} }
fun foo(x: @Ann A.() -> Unit) {} fun foo(x: (@Ann A).() -> Unit) {}
fun bar(x: @Ann B.() -> Unit) {} fun bar(x: (@Ann B).() -> Unit) {}
fun test() { fun test() {
foo { foo {
compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.kt
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@ class B {
fun b() = 2 fun b() = 2
} }
fun <T> foo(x: @Ann T.() -> Unit) {} fun <T> foo(x: (@Ann T).() -> Unit) {}
fun <E> bar(x: @Ann E.() -> Unit) {} fun <E> bar(x: (@Ann E).() -> Unit) {}
fun test() { fun test() {
foo<A> { foo<A> {
compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.kt
Vendored
+6 -6
View File
@@ -27,12 +27,12 @@ class C {
class D class D
fun foo(x: @Ann1 A.() -> Unit) {} fun foo(x: (@Ann1 A).() -> Unit) {}
fun bar(x: @Ann2 B.() -> Unit) {} fun bar(x: (@Ann2 B).() -> Unit) {}
fun baz(x: @Ann3 C.() -> Unit) {} fun baz(x: (@Ann3 C).() -> Unit) {}
fun foo1(x: @Ann1 D.() -> Unit) {} fun foo1(x: (@Ann1 D).() -> Unit) {}
fun foo2(x: @Ann2 D.() -> Unit) {} fun foo2(x: (@Ann2 D).() -> Unit) {}
fun foo3(x: @Ann3 D.() -> Unit) {} fun foo3(x: (@Ann3 D).() -> Unit) {}
fun test() { fun test() {
foo { foo {
compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.kt
Vendored
+6 -6
View File
@@ -23,12 +23,12 @@ class C {
class D class D
fun foo(x: @Ann1 A.() -> Unit) {} fun foo(x: (@Ann1 A).() -> Unit) {}
fun bar(x: @Ann2 B.() -> Unit) {} fun bar(x: (@Ann2 B).() -> Unit) {}
fun baz(x: @Ann3 C.() -> Unit) {} fun baz(x: (@Ann3 C).() -> Unit) {}
fun foo1(x: @Ann1 D.() -> Unit) {} fun foo1(x: (@Ann1 D).() -> Unit) {}
fun foo2(x: @Ann2 D.() -> Unit) {} fun foo2(x: (@Ann2 D).() -> Unit) {}
fun foo3(x: @Ann3 D.() -> Unit) {} fun foo3(x: (@Ann3 D).() -> Unit) {}
fun test() { fun test() {
foo { foo {
compiler/testData/diagnostics/tests/resolve/dslMarker/twoImplicitReceivers.kt
Vendored
+3 -3
View File
@@ -17,9 +17,9 @@ class B {
class D class D
fun foo(x: @Ann1 A.() -> Unit) {} fun foo(x: (@Ann1 A).() -> Unit) {}
fun bar(x: @Ann2 B.() -> Unit) {} fun bar(x: (@Ann2 B).() -> Unit) {}
fun baz(x: @Ann1 D.() -> Unit) {} fun baz(x: (@Ann1 D).() -> Unit) {}
fun test() { fun test() {
foo { foo {
compiler/testData/diagnostics/tests/resolve/dslMarker/twoLanguages.kt
Vendored
+4 -4
View File
@@ -15,10 +15,10 @@ class B {
fun b() = 2 fun b() = 2
} }
fun foo1(x: @L1 A.() -> Unit) {} fun foo1(x: (@L1 A).() -> Unit) {}
fun foo2(x: @L2 A.() -> Unit) {} fun foo2(x: (@L2 A).() -> Unit) {}
fun bar1(x: @L1 B.() -> Unit) {} fun bar1(x: (@L1 B).() -> Unit) {}
fun bar2(x: @L2 B.() -> Unit) {} fun bar2(x: (@L2 B).() -> Unit) {}
fun test() { fun test() {
foo1 { foo1 {
compiler/testData/diagnostics/tests/resolve/dslMarker/usingWithThis.kt
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@ class B {
fun b() = 2 fun b() = 2
} }
fun foo(x: @Ann A.() -> Unit) {} fun foo(x: (@Ann A).() -> Unit) {}
fun bar(x: @Ann B.() -> Unit) {} fun bar(x: (@Ann B).() -> Unit) {}
fun test() { fun test() {
foo { foo {
compiler/testData/psi/DynamicTypes.txt
Vendored
+8 -7
View File
@@ -24,13 +24,14 @@ JetFile: DynamicTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DYNAMIC_TYPE DYNAMIC_TYPE
PsiElement(dynamic)('dynamic') PsiElement(dynamic)('dynamic')
compiler/testData/psi/FunctionExpressions.txt
Vendored
+144 -132
View File
@@ -63,16 +63,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -109,16 +110,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -156,19 +158,20 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -270,16 +273,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -304,16 +308,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -354,19 +359,20 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -574,16 +580,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -608,16 +615,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -643,16 +651,17 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -693,19 +702,20 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -774,19 +784,20 @@ JetFile: FunctionExpressions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -800,16 +811,17 @@ JetFile: FunctionExpressions.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
compiler/testData/psi/FunctionExpressions_ERR.txt
Vendored
+39 -36
View File
@@ -45,16 +45,17 @@ JetFile: FunctionExpressions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -91,19 +92,20 @@ JetFile: FunctionExpressions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -146,19 +148,20 @@ JetFile: FunctionExpressions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/FunctionTypes.txt
Vendored
+69 -63
View File
@@ -81,16 +81,17 @@ JetFile: FunctionTypes.kt
PsiElement(ARROW)('->') PsiElement(ARROW)('->')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('x') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('x')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -133,16 +134,17 @@ JetFile: FunctionTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -242,16 +244,17 @@ JetFile: FunctionTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -542,20 +545,21 @@ JetFile: FunctionTypes.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -579,20 +583,21 @@ JetFile: FunctionTypes.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -620,20 +625,21 @@ JetFile: FunctionTypes.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/Functions.txt
Vendored
+133 -122
View File
@@ -35,16 +35,17 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -59,16 +60,17 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -99,19 +101,20 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -197,16 +200,17 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -222,16 +226,17 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -263,19 +268,20 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -368,16 +374,17 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -396,16 +403,17 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -440,19 +448,20 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -512,19 +521,20 @@ JetFile: Functions.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -539,16 +549,17 @@ JetFile: Functions.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
compiler/testData/psi/FunctionsWithoutName.txt
Vendored
+61 -56
View File
@@ -222,16 +222,17 @@ JetFile: FunctionsWithoutName.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -249,16 +250,17 @@ JetFile: FunctionsWithoutName.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -292,19 +294,20 @@ JetFile: FunctionsWithoutName.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -363,19 +366,20 @@ JetFile: FunctionsWithoutName.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -389,16 +393,17 @@ JetFile: FunctionsWithoutName.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
compiler/testData/psi/FunctionsWithoutName_ERR.txt
Vendored
+67 -62
View File
@@ -15,16 +15,17 @@ JetFile: FunctionsWithoutName_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -53,19 +54,20 @@ JetFile: FunctionsWithoutName_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -100,19 +102,20 @@ JetFile: FunctionsWithoutName_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -154,19 +157,20 @@ JetFile: FunctionsWithoutName_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -211,19 +215,20 @@ JetFile: FunctionsWithoutName_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/Functions_ERR.txt
Vendored
+67 -62
View File
@@ -16,16 +16,17 @@ JetFile: Functions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -55,19 +56,20 @@ JetFile: Functions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -103,19 +105,20 @@ JetFile: Functions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -158,19 +161,20 @@ JetFile: Functions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -216,19 +220,20 @@ JetFile: Functions_ERR.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('a')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/TypeModifiers.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
val p1: suspend a
val p2: suspend (a) -> a
val p3: suspend (a) -> suspend a
val p4: suspend a.() -> a
val p5: (suspend a).() -> a
val p6: a<in suspend a>
val p7: a<out suspend @a a>
val p8: a<out @a suspend @a a>
val p9: a<out @[a] suspend @[a] a>
val p10: suspend a<a>
val p11: suspend @a a
val p12: @a suspend a
val p13: @a suspend @a a
val p14: @[a] suspend @[a] a
@a fun @a a.f1() {}
fun (@a a.(a) -> a).f2() {}
compiler/testData/psi/TypeModifiers.txt
Vendored
+493
View File
@@ -0,0 +1,493 @@
JetFile: TypeModifiers.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p1')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p2')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p3')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p4')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p5')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
PsiElement(LPAR)('(')
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p6')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
PsiElement(in)('in')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p7')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
PsiElement(out)('out')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p8')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
PsiElement(out)('out')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p9')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
PsiElement(out)('out')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p10')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p11')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p12')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p13')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p14')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n\n')
FUN
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('f1')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('f2')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
compiler/testData/psi/TypeModifiers_ERR.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
val p1: suspend
val p2: suspend (a) ->
val p3: suspend (suspend) ->
val p4: suspend (suspend ->
val p5: suspend (a) -> suspend
val p6: suspend a.() ->
val p7: suspend a.(suspend) ->
val p8: a<suspend in a>
val p9: a<in suspend a
val p10: a<in suspend, a>
val p11: a<suspend in a
val p12: a<suspend in
compiler/testData/psi/TypeModifiers_ERR.txt
Vendored
+299
View File
@@ -0,0 +1,299 @@
JetFile: TypeModifiers_ERR.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p1')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiErrorElement:Type expected
<empty list>
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p2')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace('\n')
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p3')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiErrorElement:Type expected
<empty list>
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace('\n')
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p4')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
TYPE_REFERENCE
PsiErrorElement:Type expected
PsiElement(ARROW)('->')
PsiErrorElement:Expecting comma or ')'
<empty list>
PsiWhiteSpace('\n')
PsiErrorElement:Expecting ')'
PsiElement(val)('val')
PsiErrorElement:Expecting '->' to specify return type of a function type
<empty list>
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('p5')
PsiErrorElement:Property getter or setter expected
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('suspend')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('suspend')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p6')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace('\n')
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p7')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiErrorElement:Type expected
<empty list>
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace('\n')
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p8')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
PsiErrorElement:Type expected
PsiElement(in)('in')
PsiErrorElement:Expecting a '>'
<empty list>
PsiWhiteSpace(' ')
PsiErrorElement:Property getter or setter expected
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p9')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
PsiElement(in)('in')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiErrorElement:Expecting a '>'
<empty list>
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p10')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
PsiElement(in)('in')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiErrorElement:Type expected
<empty list>
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p11')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
PsiErrorElement:Type expected
PsiElement(in)('in')
PsiErrorElement:Expecting a '>'
<empty list>
PsiWhiteSpace(' ')
PsiErrorElement:Property getter or setter expected
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p12')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
PsiErrorElement:Type expected
PsiElement(in)('in')
PsiErrorElement:Expecting a '>'
<empty list>
compiler/testData/psi/TypeParametersBeforeName.txt
Vendored
+11 -10
View File
@@ -65,16 +65,17 @@ JetFile: TypeParametersBeforeName.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
Vendored
+11 -10
View File
@@ -29,16 +29,17 @@ JetFile: AnnotationsOnPatterns.kt
PsiElement(is)('is') PsiElement(is)('is')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/annotation/annotationsOnNullableTypes.txt
Vendored
+184 -172
View File
@@ -14,13 +14,14 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -51,13 +52,14 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(LT)('<') PsiElement(LT)('<')
TYPE_PROJECTION TYPE_PROJECTION
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -75,13 +77,14 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -105,13 +108,14 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -130,19 +134,20 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -173,19 +178,20 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(LT)('<') PsiElement(LT)('<')
TYPE_PROJECTION TYPE_PROJECTION
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -203,19 +209,20 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -239,19 +246,20 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -270,29 +278,30 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('a')
ANNOTATION_ENTRY PsiWhiteSpace(' ')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -323,29 +332,30 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(LT)('<') PsiElement(LT)('<')
TYPE_PROJECTION TYPE_PROJECTION
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('a')
ANNOTATION_ENTRY PsiWhiteSpace(' ')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -363,29 +373,30 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('a')
ANNOTATION_ENTRY PsiWhiteSpace(' ')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
@@ -409,29 +420,30 @@ JetFile: annotationsOnNullableTypes.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('a')
ANNOTATION_ENTRY PsiWhiteSpace(' ')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('b') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('b')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
INTEGER_CONSTANT VALUE_ARGUMENT
PsiElement(INTEGER_LITERAL)('1') INTEGER_CONSTANT
PsiElement(RPAR)(')') PsiElement(INTEGER_LITERAL)('1')
PsiElement(RBRACKET)(']') PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
compiler/testData/psi/annotation/at/validDeclarations.txt
Vendored
+25 -24
View File
@@ -97,30 +97,31 @@ JetFile: validDeclarations.kt
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('AnnType') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('AnnType')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
VALUE_ARGUMENT PsiElement(LPAR)('(')
STRING_TEMPLATE VALUE_ARGUMENT
PsiElement(OPEN_QUOTE)('"') STRING_TEMPLATE
LITERAL_STRING_TEMPLATE_ENTRY PsiElement(OPEN_QUOTE)('"')
PsiElement(REGULAR_STRING_PART)('3') LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(CLOSING_QUOTE)('"') PsiElement(REGULAR_STRING_PART)('3')
PsiElement(RPAR)(')') PsiElement(CLOSING_QUOTE)('"')
PsiWhiteSpace(' ') PsiElement(RPAR)(')')
ANNOTATION_ENTRY PsiWhiteSpace(' ')
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('open') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('open')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
Vendored
+92 -84
View File
@@ -266,32 +266,34 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
@@ -334,32 +336,34 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
@@ -400,32 +404,34 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
@@ -481,32 +487,34 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
Vendored
+69 -63
View File
@@ -8,20 +8,21 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -69,20 +70,21 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -145,32 +147,34 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -231,16 +235,17 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -309,16 +314,17 @@ JetFile: FunctionsWithFunctionReceivers.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
Vendored
+69 -63
View File
@@ -8,20 +8,21 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -69,20 +70,21 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -145,32 +147,34 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -231,16 +235,17 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
@@ -287,16 +292,17 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
Vendored
+34 -31
View File
@@ -211,20 +211,21 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -301,16 +302,17 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -355,16 +357,17 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
PsiElement(fun)('fun') PsiElement(fun)('fun')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
Vendored
+69 -63
View File
@@ -8,20 +8,21 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -72,20 +73,21 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -150,32 +152,34 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION
PsiElement(AT)('@')
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
@@ -235,16 +239,17 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
@@ -294,16 +299,17 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
PsiElement(GT)('>') PsiElement(GT)('>')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
FUNCTION_TYPE FUNCTION_TYPE
compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
Vendored
+30 -27
View File
@@ -286,13 +286,14 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiErrorElement:Receiver type is not allowed on a destructuring declaration PsiErrorElement:Receiver type is not allowed on a destructuring declaration
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE PsiElement(AT)('@')
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -325,16 +326,17 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
PsiElement(val)('val') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -394,16 +396,17 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiErrorElement:Receiver type is not allowed on a destructuring declaration PsiErrorElement:Receiver type is not allowed on a destructuring declaration
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST
PsiElement(AT)('@') ANNOTATION
PsiElement(LBRACKET)('[') PsiElement(AT)('@')
ANNOTATION_ENTRY PsiElement(LBRACKET)('[')
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('a') REFERENCE_EXPRESSION
PsiElement(RBRACKET)(']') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java
+12
View File
@@ -800,6 +800,18 @@ public class ParsingTestGenerated extends AbstractParsingTest {
doParsingTest(fileName); doParsingTest(fileName);
} }
@TestMetadata("TypeModifiers.kt")
public void testTypeModifiers() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeModifiers.kt");
doParsingTest(fileName);
}
@TestMetadata("TypeModifiers_ERR.kt")
public void testTypeModifiers_ERR() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeModifiers_ERR.kt");
doParsingTest(fileName);
}
@TestMetadata("TypeParametersBeforeName.kt") @TestMetadata("TypeParametersBeforeName.kt")
public void testTypeParametersBeforeName() throws Exception { public void testTypeParametersBeforeName() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeParametersBeforeName.kt"); String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeParametersBeforeName.kt");
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+9 -5
View File
@@ -70,7 +70,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
else parent else parent
private fun createTypeParameterStub(parent: KotlinStubBaseImpl<*>, type: Type, name: Name, annotations: List<ClassId>) { private fun createTypeParameterStub(parent: KotlinStubBaseImpl<*>, type: Type, name: Name, annotations: List<ClassId>) {
createTypeAnnotationStubs(parent, annotations) createTypeAnnotationStubs(parent, type, annotations)
createStubForTypeName(ClassId.topLevel(FqName.topLevel(name)), nullableTypeParent(parent, type)) createStubForTypeName(ClassId.topLevel(FqName.topLevel(name)), nullableTypeParent(parent, type))
} }
@@ -96,7 +96,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
annotations.partition { it.asSingleFqName() == KotlinBuiltIns.FQ_NAMES.extensionFunctionType } annotations.partition { it.asSingleFqName() == KotlinBuiltIns.FQ_NAMES.extensionFunctionType }
createTypeAnnotationStubs(parent, notExtensionAnnotations) createTypeAnnotationStubs(parent, type, notExtensionAnnotations)
val isExtension = extensionAnnotations.isNotEmpty() val isExtension = extensionAnnotations.isNotEmpty()
createFunctionTypeStub(nullableTypeParent(parent, type), type, isExtension) createFunctionTypeStub(nullableTypeParent(parent, type), type, isExtension)
@@ -104,7 +104,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
return return
} }
createTypeAnnotationStubs(parent, annotations) createTypeAnnotationStubs(parent, type, annotations)
val outerTypeChain = generateSequence(type) { it.outerType(c.typeTable) }.toList() val outerTypeChain = generateSequence(type) { it.outerType(c.typeTable) }.toList()
@@ -114,8 +114,12 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
} }
} }
private fun createTypeAnnotationStubs(parent: KotlinStubBaseImpl<*>, annotations: List<ClassId>) { private fun createTypeAnnotationStubs(parent: KotlinStubBaseImpl<*>, type: Type, annotations: List<ClassId>) {
createAnnotationStubs(annotations, parent) // TODO Calculate type modifiers mask, see 'ModifierMaskUtils.computeMask'
val typeModifiersMask = 0
if (annotations.isEmpty()) return
val modifiersList = KotlinModifierListStubImpl(parent, typeModifiersMask, KtStubElementTypes.MODIFIER_LIST)
createAnnotationStubs(annotations, modifiersList)
} }
private fun createTypeArgumentListStub(typeStub: KotlinUserTypeStub, typeArgumentProtoList: List<Type.Argument>) { private fun createTypeArgumentListStub(typeStub: KotlinUserTypeStub, typeArgumentProtoList: List<Type.Argument>) {
idea/idea-completion/testData/keywords/InFunctionTypePosition.kt
Vendored
+1
View File
@@ -2,4 +2,5 @@ fun foo() {
val test : <caret> val test : <caret>
} }
// EXIST: suspend
// NOTHING_ELSE // NOTHING_ELSE
idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
Vendored
+22 -20
View File
@@ -191,16 +191,17 @@ PsiJetFileStubImpl[package=]
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param] VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=a]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=a] USER_TYPE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=b] REFERENCE_EXPRESSION[referencedName=a]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=b]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=b] USER_TYPE
REFERENCE_EXPRESSION[referencedName=b]
USER_TYPE USER_TYPE
USER_TYPE USER_TYPE
USER_TYPE USER_TYPE
@@ -208,16 +209,17 @@ PsiJetFileStubImpl[package=]
REFERENCE_EXPRESSION[referencedName=ranges] REFERENCE_EXPRESSION[referencedName=ranges]
REFERENCE_EXPRESSION[referencedName=LongRange] REFERENCE_EXPRESSION[referencedName=LongRange]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=a]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=a] USER_TYPE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=b] REFERENCE_EXPRESSION[referencedName=a]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=b]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=b] USER_TYPE
REFERENCE_EXPRESSION[referencedName=b]
USER_TYPE USER_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=kotlin]
idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt
Vendored
+54 -45
View File
@@ -23,14 +23,15 @@ PsiJetFileStubImpl[package=]
PROPERTY[fqName=AnnotationsOnNullableTypes.lambdaReceiver, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=lambdaReceiver] PROPERTY[fqName=AnnotationsOnNullableTypes.lambdaReceiver, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=lambdaReceiver]
MODIFIER_LIST[public final] MODIFIER_LIST[public final]
TYPE_REFERENCE TYPE_REFERENCE
MODIFIER_LIST[]
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
FUNCTION_TYPE FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
@@ -44,22 +45,24 @@ PsiJetFileStubImpl[package=]
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
PROPERTY[fqName=AnnotationsOnNullableTypes.lambdaType, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=lambdaType] PROPERTY[fqName=AnnotationsOnNullableTypes.lambdaType, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=lambdaType]
MODIFIER_LIST[public final] MODIFIER_LIST[public final]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
FUNCTION_TYPE FUNCTION_TYPE
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -71,11 +74,12 @@ PsiJetFileStubImpl[package=]
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
@@ -94,11 +98,12 @@ PsiJetFileStubImpl[package=]
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
TYPE_PROJECTION[projectionKind=NONE] TYPE_PROJECTION[projectionKind=NONE]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
@@ -116,11 +121,12 @@ PsiJetFileStubImpl[package=]
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
TYPE_PROJECTION[projectionKind=NONE] TYPE_PROJECTION[projectionKind=NONE]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
@@ -130,11 +136,12 @@ PsiJetFileStubImpl[package=]
TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T]
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=T] REFERENCE_EXPRESSION[referencedName=T]
@@ -142,11 +149,12 @@ PsiJetFileStubImpl[package=]
MODIFIER_LIST[public final] MODIFIER_LIST[public final]
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
@@ -158,11 +166,12 @@ PsiJetFileStubImpl[package=]
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
TYPE_PROJECTION[projectionKind=NONE] TYPE_PROJECTION[projectionKind=NONE]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=C] REFERENCE_EXPRESSION[referencedName=C]
idea/testData/decompiler/stubBuilder/Types/Types.txt
Vendored
+7 -6
View File
@@ -266,13 +266,14 @@ PsiJetFileStubImpl[package=test]
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
TYPE_PROJECTION[projectionKind=NONE] TYPE_PROJECTION[projectionKind=NONE]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=ExtensionFunctionType] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=ExtensionFunctionType]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=kotlin] USER_TYPE
REFERENCE_EXPRESSION[referencedName=ExtensionFunctionType] REFERENCE_EXPRESSION[referencedName=kotlin]
REFERENCE_EXPRESSION[referencedName=ExtensionFunctionType]
USER_TYPE USER_TYPE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=kotlin]
idea/testData/stubs/DynamicType.expected
Vendored
+12 -10
View File
@@ -10,19 +10,21 @@ PsiJetFileStubImpl[package=]
DYNAMIC_TYPE DYNAMIC_TYPE
PROPERTY[fqName=foo_a, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=foo_a] PROPERTY[fqName=foo_a, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=foo_a]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
DYNAMIC_TYPE DYNAMIC_TYPE
PROPERTY[fqName=foo_nullable_a, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=foo_nullable_a] PROPERTY[fqName=foo_nullable_a, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=foo_nullable_a]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] MODIFIER_LIST[]
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=A]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=A] USER_TYPE
REFERENCE_EXPRESSION[referencedName=A]
NULLABLE_TYPE NULLABLE_TYPE
DYNAMIC_TYPE DYNAMIC_TYPE
CLASS[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] CLASS[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
idea/testData/stubs/TypeAnnotation.expected
Vendored
+26 -24
View File
@@ -20,32 +20,34 @@ PsiJetFileStubImpl[package=]
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param] VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST[]
ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] ANNOTATION
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=a]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=a] USER_TYPE
ANNOTATION REFERENCE_EXPRESSION[referencedName=a]
ANNOTATION_ENTRY[hasValueArguments=true, shortName=b] ANNOTATION
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=true, shortName=b]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=b] USER_TYPE
REFERENCE_EXPRESSION[referencedName=b]
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=DoubleRange] REFERENCE_EXPRESSION[referencedName=DoubleRange]
TYPE_REFERENCE TYPE_REFERENCE
ANNOTATION MODIFIER_LIST[]
ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] ANNOTATION
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=false, shortName=a]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=a] USER_TYPE
ANNOTATION REFERENCE_EXPRESSION[referencedName=a]
ANNOTATION_ENTRY[hasValueArguments=true, shortName=b] ANNOTATION
CONSTRUCTOR_CALLEE ANNOTATION_ENTRY[hasValueArguments=true, shortName=b]
TYPE_REFERENCE CONSTRUCTOR_CALLEE
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION[referencedName=b] USER_TYPE
REFERENCE_EXPRESSION[referencedName=b]
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION[referencedName=Unit] REFERENCE_EXPRESSION[referencedName=Unit]