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

Remove redundant field and constructor from PsiJetTypeParameterStubImpl

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-23 15:25:50 +04:00
parent c9193818e7
commit bf20377759
3 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetTypeParameterStub.java
-1
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.psi.stubs;
import org.jetbrains.jet.lang.psi.JetTypeParameter; import org.jetbrains.jet.lang.psi.JetTypeParameter;
public interface PsiJetTypeParameterStub extends PsiJetStubWithFqName<JetTypeParameter> { public interface PsiJetTypeParameterStub extends PsiJetStubWithFqName<JetTypeParameter> {
String getExtendBoundTypeText();
boolean isInVariance(); boolean isInVariance();
boolean isOutVariance(); boolean isOutVariance();
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
+3 -10
View File
@@ -37,18 +37,13 @@ public class JetTypeParameterElementType extends JetStubElementType<PsiJetTypePa
@Override @Override
public PsiJetTypeParameterStub createStub(@NotNull JetTypeParameter psi, StubElement parentStub) { public PsiJetTypeParameterStub createStub(@NotNull JetTypeParameter psi, StubElement parentStub) {
JetTypeReference extendsBound = psi.getExtendsBound(); return new PsiJetTypeParameterStubImpl(parentStub, StringRef.fromString(psi.getName()),
return new PsiJetTypeParameterStubImpl(parentStub, psi.getVariance() == Variance.IN_VARIANCE, psi.getVariance() == Variance.OUT_VARIANCE);
psi.getName(),
extendsBound != null ? extendsBound.getText() : null,
psi.getVariance() == Variance.IN_VARIANCE,
psi.getVariance() == Variance.OUT_VARIANCE);
} }
@Override @Override
public void serialize(@NotNull PsiJetTypeParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException { public void serialize(@NotNull PsiJetTypeParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException {
dataStream.writeName(stub.getName()); dataStream.writeName(stub.getName());
dataStream.writeName(stub.getExtendBoundTypeText());
dataStream.writeBoolean(stub.isInVariance()); dataStream.writeBoolean(stub.isInVariance());
dataStream.writeBoolean(stub.isOutVariance()); dataStream.writeBoolean(stub.isOutVariance());
} }
@@ -57,11 +52,9 @@ public class JetTypeParameterElementType extends JetStubElementType<PsiJetTypePa
@Override @Override
public PsiJetTypeParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { public PsiJetTypeParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
StringRef name = dataStream.readName(); StringRef name = dataStream.readName();
StringRef extendBoundTypeText = dataStream.readName();
boolean isInVariance = dataStream.readBoolean(); boolean isInVariance = dataStream.readBoolean();
boolean isOutVariance = dataStream.readBoolean(); boolean isOutVariance = dataStream.readBoolean();
return new PsiJetTypeParameterStubImpl(parentStub, return new PsiJetTypeParameterStubImpl(parentStub, name, isInVariance, isOutVariance);
name, extendBoundTypeText, isInVariance, isOutVariance);
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java
+1 -18
View File
@@ -27,32 +27,17 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
public class PsiJetTypeParameterStubImpl extends StubBase<JetTypeParameter> implements PsiJetTypeParameterStub { public class PsiJetTypeParameterStubImpl extends StubBase<JetTypeParameter> implements PsiJetTypeParameterStub {
private final StringRef name; private final StringRef name;
private final StringRef extendBoundTypeText;
private final boolean isInVariance; private final boolean isInVariance;
private final boolean isOutVariance; private final boolean isOutVariance;
public PsiJetTypeParameterStubImpl( public PsiJetTypeParameterStubImpl(StubElement parent, StringRef name, boolean isInVariance, boolean isOutVariance) {
StubElement parent, StringRef name, StringRef extendBoundTypeText, boolean isInVariance, boolean isOutVariance
) {
super(parent, JetStubElementTypes.TYPE_PARAMETER); super(parent, JetStubElementTypes.TYPE_PARAMETER);
this.name = name; this.name = name;
this.extendBoundTypeText = extendBoundTypeText;
this.isInVariance = isInVariance; this.isInVariance = isInVariance;
this.isOutVariance = isOutVariance; this.isOutVariance = isOutVariance;
} }
public PsiJetTypeParameterStubImpl(
StubElement parent, String name, String extendBoundTypeText, boolean isInVariance, boolean isOutVariance
) {
this(parent, StringRef.fromString(name), StringRef.fromString(extendBoundTypeText), isInVariance, isOutVariance);
}
@Override
public String getExtendBoundTypeText() {
return StringRef.toString(extendBoundTypeText);
}
@Override @Override
public boolean isInVariance() { public boolean isInVariance() {
return isInVariance; return isInVariance;
@@ -82,8 +67,6 @@ public class PsiJetTypeParameterStubImpl extends StubBase<JetTypeParameter> impl
} }
builder.append("name=").append(getName()); builder.append("name=").append(getName());
builder.append(" extendText=").append(getExtendBoundTypeText());
builder.append("]"); builder.append("]");
return builder.toString(); return builder.toString();