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

Remove redundant PsiJetParameterStub#isVarArg()

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+1 -6
View File
@@ -82,13 +82,8 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
}
public boolean isVarArg() {
PsiJetParameterStub stub = getStub();
if (stub != null) {
return stub.isVarArg();
}
JetModifierList modifierList = getModifierList();
return modifierList != null && modifierList.getModifierNode(JetTokens.VARARG_KEYWORD) != null;
return modifierList != null && modifierList.hasModifier(JetTokens.VARARG_KEYWORD);
}
public boolean hasValOrVarNode() {
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetParameterStub.java
-1
View File
@@ -20,7 +20,6 @@ import org.jetbrains.jet.lang.psi.JetParameter;
public interface PsiJetParameterStub extends PsiJetStubWithFqName<JetParameter> {
boolean isMutable();
boolean isVarArg();
boolean hasValOrValNode();
boolean hasDefaultValue();
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+2 -5
View File
@@ -39,8 +39,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
@Override
public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
psi.isMutable(), psi.isVarArg(), psi.hasValOrVarNode(),
psi.hasDefaultValue());
psi.isMutable(), psi.hasValOrVarNode(), psi.hasDefaultValue());
}
@Override
@@ -56,7 +55,6 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
public void serialize(@NotNull PsiJetParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException {
dataStream.writeName(stub.getName());
dataStream.writeBoolean(stub.isMutable());
dataStream.writeBoolean(stub.isVarArg());
dataStream.writeBoolean(stub.hasValOrValNode());
dataStream.writeBoolean(stub.hasDefaultValue());
FqName name = stub.getFqName();
@@ -68,12 +66,11 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
public PsiJetParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
StringRef name = dataStream.readName();
boolean isMutable = dataStream.readBoolean();
boolean isVarArg = dataStream.readBoolean();
boolean hasValOrValNode = dataStream.readBoolean();
boolean hasDefaultValue = dataStream.readBoolean();
StringRef fqNameAsString = dataStream.readName();
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);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java
-12
View File
@@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements PsiJetParameterStub {
private final StringRef name;
private final boolean isMutable;
private final boolean isVarArg;
//TODO: store as StringRef
private final FqName fqName;
private final boolean hasValOrValNode;
@@ -38,14 +37,12 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
StubElement parent,
FqName fqName, StringRef name,
boolean isMutable,
boolean isVarArg,
boolean hasValOrValNode,
boolean hasDefaultValue
) {
super(parent, JetStubElementTypes.VALUE_PARAMETER);
this.name = name;
this.isMutable = isMutable;
this.isVarArg = isVarArg;
this.fqName = fqName;
this.hasValOrValNode = hasValOrValNode;
this.hasDefaultValue = hasDefaultValue;
@@ -61,11 +58,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
return isMutable;
}
@Override
public boolean isVarArg() {
return isVarArg;
}
@Override
public boolean hasValOrValNode() {
return hasValOrValNode;
@@ -83,10 +75,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
builder.append(isMutable() ? "var " : "val ");
if (isVarArg()) {
builder.append("vararg ");
}
builder.append("name=").append(getName());
if (fqName != null) {
builder.append(" fqName=").append(fqName.toString()).append(" ");