Remove redundant PsiJetParameterStub#isVarArg()

This commit is contained in:
Pavel V. Talanov
2014-04-21 18:48:17 +04:00
parent dd92132eff
commit 4e9103f7ab
4 changed files with 3 additions and 24 deletions
@@ -82,13 +82,8 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
} }
public boolean isVarArg() { public boolean isVarArg() {
PsiJetParameterStub stub = getStub();
if (stub != null) {
return stub.isVarArg();
}
JetModifierList modifierList = getModifierList(); JetModifierList modifierList = getModifierList();
return modifierList != null && modifierList.getModifierNode(JetTokens.VARARG_KEYWORD) != null; return modifierList != null && modifierList.hasModifier(JetTokens.VARARG_KEYWORD);
} }
public boolean hasValOrVarNode() { public boolean hasValOrVarNode() {
@@ -20,7 +20,6 @@ import org.jetbrains.jet.lang.psi.JetParameter;
public interface PsiJetParameterStub extends PsiJetStubWithFqName<JetParameter> { public interface PsiJetParameterStub extends PsiJetStubWithFqName<JetParameter> {
boolean isMutable(); boolean isMutable();
boolean isVarArg();
boolean hasValOrValNode(); boolean hasValOrValNode();
boolean hasDefaultValue(); boolean hasDefaultValue();
} }
@@ -39,8 +39,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
@Override @Override
public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) { public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()), return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
psi.isMutable(), psi.isVarArg(), psi.hasValOrVarNode(), psi.isMutable(), psi.hasValOrVarNode(), psi.hasDefaultValue());
psi.hasDefaultValue());
} }
@Override @Override
@@ -56,7 +55,6 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
public void serialize(@NotNull PsiJetParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException { public void serialize(@NotNull PsiJetParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException {
dataStream.writeName(stub.getName()); dataStream.writeName(stub.getName());
dataStream.writeBoolean(stub.isMutable()); dataStream.writeBoolean(stub.isMutable());
dataStream.writeBoolean(stub.isVarArg());
dataStream.writeBoolean(stub.hasValOrValNode()); dataStream.writeBoolean(stub.hasValOrValNode());
dataStream.writeBoolean(stub.hasDefaultValue()); dataStream.writeBoolean(stub.hasDefaultValue());
FqName name = stub.getFqName(); FqName name = stub.getFqName();
@@ -68,12 +66,11 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
public PsiJetParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { public PsiJetParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
StringRef name = dataStream.readName(); StringRef name = dataStream.readName();
boolean isMutable = dataStream.readBoolean(); boolean isMutable = dataStream.readBoolean();
boolean isVarArg = dataStream.readBoolean();
boolean hasValOrValNode = dataStream.readBoolean(); boolean hasValOrValNode = dataStream.readBoolean();
boolean hasDefaultValue = dataStream.readBoolean(); boolean hasDefaultValue = dataStream.readBoolean();
StringRef fqNameAsString = dataStream.readName(); StringRef fqNameAsString = dataStream.readName();
FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null; FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, isVarArg, hasValOrValNode, hasDefaultValue); return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, hasValOrValNode, hasDefaultValue);
} }
} }
@@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements PsiJetParameterStub { public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements PsiJetParameterStub {
private final StringRef name; private final StringRef name;
private final boolean isMutable; private final boolean isMutable;
private final boolean isVarArg;
//TODO: store as StringRef //TODO: store as StringRef
private final FqName fqName; private final FqName fqName;
private final boolean hasValOrValNode; private final boolean hasValOrValNode;
@@ -38,14 +37,12 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
StubElement parent, StubElement parent,
FqName fqName, StringRef name, FqName fqName, StringRef name,
boolean isMutable, boolean isMutable,
boolean isVarArg,
boolean hasValOrValNode, boolean hasValOrValNode,
boolean hasDefaultValue boolean hasDefaultValue
) { ) {
super(parent, JetStubElementTypes.VALUE_PARAMETER); super(parent, JetStubElementTypes.VALUE_PARAMETER);
this.name = name; this.name = name;
this.isMutable = isMutable; this.isMutable = isMutable;
this.isVarArg = isVarArg;
this.fqName = fqName; this.fqName = fqName;
this.hasValOrValNode = hasValOrValNode; this.hasValOrValNode = hasValOrValNode;
this.hasDefaultValue = hasDefaultValue; this.hasDefaultValue = hasDefaultValue;
@@ -61,11 +58,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
return isMutable; return isMutable;
} }
@Override
public boolean isVarArg() {
return isVarArg;
}
@Override @Override
public boolean hasValOrValNode() { public boolean hasValOrValNode() {
return hasValOrValNode; return hasValOrValNode;
@@ -83,10 +75,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
builder.append(isMutable() ? "var " : "val "); builder.append(isMutable() ? "var " : "val ");
if (isVarArg()) {
builder.append("vararg ");
}
builder.append("name=").append(getName()); builder.append("name=").append(getName());
if (fqName != null) { if (fqName != null) {
builder.append(" fqName=").append(fqName.toString()).append(" "); builder.append(" fqName=").append(fqName.toString()).append(" ");