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

Stubs for JetFunctionType

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-03-28 21:46:48 +04:00
parent 735188e76f
commit 1e04ff670d
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java
+1 -1
View File
@@ -65,7 +65,7 @@ public interface JetNodeTypes {
IElementType TYPE_REFERENCE = JetStubElementTypes.TYPE_REFERENCE;
IElementType USER_TYPE = JetStubElementTypes.USER_TYPE;
JetNodeType FUNCTION_TYPE = new JetNodeType("FUNCTION_TYPE", JetFunctionType.class);
IElementType FUNCTION_TYPE = JetStubElementTypes.FUNCTION_TYPE;
JetNodeType FUNCTION_TYPE_RECEIVER = new JetNodeType("FUNCTION_TYPE_RECEIVER", JetFunctionTypeReceiver.class);
JetNodeType SELF_TYPE = new JetNodeType("SELF_TYPE", JetSelfType.class);
IElementType NULLABLE_TYPE = JetStubElementTypes.NULLABLE_TYPE;
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java
+7 -1
View File
@@ -21,6 +21,8 @@ import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.stubs.PsiJetPlaceHolderStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
@@ -28,7 +30,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class JetFunctionType extends JetElementImpl implements JetTypeElement {
public class JetFunctionType extends JetElementImplStub<PsiJetPlaceHolderStub<JetFunctionType>> implements JetTypeElement {
public static final JetToken RETURN_TYPE_SEPARATOR = JetTokens.ARROW;
@@ -36,6 +38,10 @@ public class JetFunctionType extends JetElementImpl implements JetTypeElement {
super(node);
}
public JetFunctionType(@NotNull PsiJetPlaceHolderStub<JetFunctionType> stub) {
super(stub, JetStubElementTypes.FUNCTION_TYPE);
}
@NotNull
@Override
public List<JetTypeReference> getTypeArgumentsAsTypes() {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java
+2 -1
View File
@@ -36,7 +36,8 @@ import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.ANNO
*/
public class JetTypeReference extends JetElementImplStub<PsiJetPlaceHolderStub<JetTypeReference>> {
public static final TokenSet TYPE_ELEMENTS = TokenSet.create(JetStubElementTypes.USER_TYPE, JetStubElementTypes.NULLABLE_TYPE);
public static final TokenSet TYPE_ELEMENTS
= TokenSet.create(JetStubElementTypes.USER_TYPE, JetStubElementTypes.NULLABLE_TYPE, JetStubElementTypes.FUNCTION_TYPE);
public JetTypeReference(@NotNull ASTNode node) {
super(node);
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java
+3
View File
@@ -62,6 +62,9 @@ public interface JetStubElementTypes {
new JetPlaceHolderStubElementType<JetTypeReference>("TYPE_REFERENCE", JetTypeReference.class);;
JetUserTypeElementType USER_TYPE = new JetUserTypeElementType("USER_TYPE");
JetPlaceHolderStubElementType<JetFunctionType> FUNCTION_TYPE =
new JetPlaceHolderStubElementType<JetFunctionType>("FUNCTION_TYPE", JetFunctionType.class);
JetNameReferenceExpressionElementType REFERENCE_EXPRESSION = new JetNameReferenceExpressionElementType("REFERENCE_EXPRESSION");
JetDotQualifiedExpressionElementType DOT_QUALIFIED_EXPRESSION = new JetDotQualifiedExpressionElementType("DOT_QUALIFIED_EXPRESSION");