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

Add missing types to DECLARATION_TYPES and move to JetStubElementTypes

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-02 15:57:43 +04:00
parent ffdc11c356
commit 77a6b4444b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
+4 -6
View File
@@ -23,23 +23,21 @@ 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.JetTokens;
import java.util.Arrays;
import java.util.List;
import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.*;
public class JetClassBody extends JetElementImplStub<PsiJetPlaceHolderStub<JetClassBody>> implements JetDeclarationContainer {
private static final TokenSet DECLARATION_TYPES =
TokenSet.create(JetStubElementTypes.CLASS, JetStubElementTypes.OBJECT_DECLARATION, JetStubElementTypes.CLASS_OBJECT,
JetStubElementTypes.FUNCTION, JetStubElementTypes.PROPERTY);
public JetClassBody(@NotNull ASTNode node) {
super(node);
}
public JetClassBody(@NotNull PsiJetPlaceHolderStub<JetClassBody> stub) {
super(stub, JetStubElementTypes.CLASS_BODY);
super(stub, CLASS_BODY);
}
@Override
@@ -65,7 +63,7 @@ public class JetClassBody extends JetElementImplStub<PsiJetPlaceHolderStub<JetCl
@Nullable
public JetClassObject getClassObject() {
return getStubOrPsiChild(JetStubElementTypes.CLASS_OBJECT);
return getStubOrPsiChild(CLASS_OBJECT);
}
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java
+4
View File
@@ -16,6 +16,7 @@
package org.jetbrains.jet.lang.psi.stubs.elements;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.jet.lang.psi.*;
public interface JetStubElementTypes {
@@ -84,4 +85,7 @@ public interface JetStubElementTypes {
JetPlaceHolderStubElementType<JetDelegationSpecifierList> DELEGATION_SPECIFIER_LIST =
new JetPlaceHolderStubElementType<JetDelegationSpecifierList>("DELEGATION_SPECIFIER_LIST", JetDelegationSpecifierList.class);
TokenSet DECLARATION_TYPES =
TokenSet.create(CLASS, OBJECT_DECLARATION, CLASS_OBJECT, FUNCTION, PROPERTY, ANONYMOUS_INITIALIZER, ENUM_ENTRY);
}