Remove ILightStubElementType implementations for now
This commit is contained in:
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -44,11 +42,6 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
|
|||||||
super(debugName);
|
super(debugName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetClassStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetClass createPsi(@NotNull PsiJetClassStub stub) {
|
public JetClass createPsi(@NotNull PsiJetClassStub stub) {
|
||||||
return new JetClass(stub);
|
return new JetClass(stub);
|
||||||
|
|||||||
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -47,11 +45,6 @@ public class JetFunctionElementType extends JetStubElementType<PsiJetFunctionStu
|
|||||||
return new JetNamedFunction(node);
|
return new JetNamedFunction(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetFunctionStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetNamedFunction createPsi(@NotNull PsiJetFunctionStub stub) {
|
public JetNamedFunction createPsi(@NotNull PsiJetFunctionStub stub) {
|
||||||
return new JetNamedFunction(stub);
|
return new JetNamedFunction(stub);
|
||||||
|
|||||||
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -47,11 +45,6 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
|
|||||||
return new JetParameter(node);
|
return new JetParameter(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetParameterStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetParameter createPsi(@NotNull PsiJetParameterStub stub) {
|
public JetParameter createPsi(@NotNull PsiJetParameterStub stub) {
|
||||||
return new JetParameter(stub, JetStubElementTypes.VALUE_PARAMETER);
|
return new JetParameter(stub, JetStubElementTypes.VALUE_PARAMETER);
|
||||||
|
|||||||
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -44,11 +42,6 @@ public class JetParameterListElementType extends JetStubElementType<PsiJetParame
|
|||||||
return new JetParameterList(node);
|
return new JetParameterList(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetParameterListStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetParameterList createPsi(@NotNull PsiJetParameterListStub stub) {
|
public JetParameterList createPsi(@NotNull PsiJetParameterListStub stub) {
|
||||||
return new JetParameterList(stub, JetStubElementTypes.VALUE_PARAMETER_LIST);
|
return new JetParameterList(stub, JetStubElementTypes.VALUE_PARAMETER_LIST);
|
||||||
|
|||||||
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -47,11 +45,6 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
|
|||||||
return new JetProperty(node);
|
return new JetProperty(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetPropertyStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetProperty createPsi(@NotNull PsiJetPropertyStub stub) {
|
public JetProperty createPsi(@NotNull PsiJetPropertyStub stub) {
|
||||||
return new JetProperty(stub, JetStubElementTypes.PROPERTY);
|
return new JetProperty(stub, JetStubElementTypes.PROPERTY);
|
||||||
|
|||||||
+2
-19
@@ -18,10 +18,7 @@ package org.jetbrains.jet.lang.psi.stubs.elements;
|
|||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.psi.PsiElement;
|
import com.intellij.psi.PsiElement;
|
||||||
import com.intellij.psi.impl.java.stubs.PsiJavaFileStub;
|
import com.intellij.psi.stubs.IStubElementType;
|
||||||
import com.intellij.psi.impl.java.stubs.StubPsiFactory;
|
|
||||||
import com.intellij.psi.stubs.ILightStubElementType;
|
|
||||||
import com.intellij.psi.stubs.PsiFileStub;
|
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import org.jetbrains.annotations.NonNls;
|
import org.jetbrains.annotations.NonNls;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -30,8 +27,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
|
|||||||
/**
|
/**
|
||||||
* @author Nikolay Krasko
|
* @author Nikolay Krasko
|
||||||
*/
|
*/
|
||||||
public abstract class JetStubElementType<StubT extends StubElement, PsiT extends PsiElement>
|
public abstract class JetStubElementType<StubT extends StubElement, PsiT extends PsiElement> extends IStubElementType<StubT, PsiT> {
|
||||||
extends ILightStubElementType<StubT, PsiT> {
|
|
||||||
|
|
||||||
public JetStubElementType(@NotNull @NonNls String debugName) {
|
public JetStubElementType(@NotNull @NonNls String debugName) {
|
||||||
super(debugName, JetLanguage.INSTANCE);
|
super(debugName, JetLanguage.INSTANCE);
|
||||||
@@ -39,19 +35,6 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
|
|||||||
|
|
||||||
public abstract PsiT createPsiFromAst(@NotNull ASTNode node);
|
public abstract PsiT createPsiFromAst(@NotNull ASTNode node);
|
||||||
|
|
||||||
protected StubPsiFactory getPsiFactory(StubT stub) {
|
|
||||||
return getFileStub(stub).getPsiFactory();
|
|
||||||
}
|
|
||||||
|
|
||||||
private PsiJavaFileStub getFileStub(StubT stub) {
|
|
||||||
StubElement parent = stub;
|
|
||||||
while (!(parent instanceof PsiFileStub)) {
|
|
||||||
parent = parent.getParentStub();
|
|
||||||
}
|
|
||||||
|
|
||||||
return (PsiJavaFileStub)parent;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getExternalId() {
|
public String getExternalId() {
|
||||||
return "jet." + toString();
|
return "jet." + toString();
|
||||||
|
|||||||
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -47,11 +45,6 @@ public class JetTypeParameterElementType extends JetStubElementType<PsiJetTypePa
|
|||||||
return new JetTypeParameter(node);
|
return new JetTypeParameter(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetTypeParameterStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetTypeParameter createPsi(@NotNull PsiJetTypeParameterStub stub) {
|
public JetTypeParameter createPsi(@NotNull PsiJetTypeParameterStub stub) {
|
||||||
return new JetTypeParameter(stub, JetStubElementTypes.TYPE_PARAMETER);
|
return new JetTypeParameter(stub, JetStubElementTypes.TYPE_PARAMETER);
|
||||||
|
|||||||
-7
@@ -17,8 +17,6 @@
|
|||||||
package org.jetbrains.jet.lang.psi.stubs.elements;
|
package org.jetbrains.jet.lang.psi.stubs.elements;
|
||||||
|
|
||||||
import com.intellij.lang.ASTNode;
|
import com.intellij.lang.ASTNode;
|
||||||
import com.intellij.lang.LighterAST;
|
|
||||||
import com.intellij.lang.LighterASTNode;
|
|
||||||
import com.intellij.psi.stubs.IndexSink;
|
import com.intellij.psi.stubs.IndexSink;
|
||||||
import com.intellij.psi.stubs.StubElement;
|
import com.intellij.psi.stubs.StubElement;
|
||||||
import com.intellij.psi.stubs.StubInputStream;
|
import com.intellij.psi.stubs.StubInputStream;
|
||||||
@@ -44,11 +42,6 @@ public class JetTypeParameterListElementType extends JetStubElementType<PsiJetTy
|
|||||||
return new JetTypeParameterList(node);
|
return new JetTypeParameterList(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public PsiJetTypeParameterListStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JetTypeParameterList createPsi(@NotNull PsiJetTypeParameterListStub stub) {
|
public JetTypeParameterList createPsi(@NotNull PsiJetTypeParameterListStub stub) {
|
||||||
return new JetTypeParameterList(stub, JetStubElementTypes.TYPE_PARAMETER_LIST);
|
return new JetTypeParameterList(stub, JetStubElementTypes.TYPE_PARAMETER_LIST);
|
||||||
|
|||||||
Reference in New Issue
Block a user