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

Store fqName as StringRef in PsiJetParameterStub

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-05-14 15:03:03 +04:00
parent dee1437d92
commit 15574a2026
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+4 -3
View File
@@ -38,7 +38,9 @@ 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()), FqName fqName = psi.getFqName();
StringRef fqNameRef = StringRef.fromString(fqName != null ? fqName.asString() : null);
return new PsiJetParameterStubImpl(parentStub, fqNameRef, StringRef.fromString(psi.getName()),
psi.isMutable(), psi.hasValOrVarNode(), psi.hasDefaultValue()); psi.isMutable(), psi.hasValOrVarNode(), psi.hasDefaultValue());
} }
@@ -68,8 +70,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
boolean isMutable = dataStream.readBoolean(); boolean isMutable = dataStream.readBoolean();
boolean hasValOrValNode = dataStream.readBoolean(); boolean hasValOrValNode = dataStream.readBoolean();
boolean hasDefaultValue = dataStream.readBoolean(); boolean hasDefaultValue = dataStream.readBoolean();
StringRef fqNameAsString = dataStream.readName(); StringRef fqName = dataStream.readName();
FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, hasValOrValNode, hasDefaultValue); return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, hasValOrValNode, hasDefaultValue);
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java
+3 -4
View File
@@ -28,14 +28,13 @@ 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;
//TODO: store as StringRef private final StringRef fqName;
private final FqName fqName;
private final boolean hasValOrValNode; private final boolean hasValOrValNode;
private final boolean hasDefaultValue; private final boolean hasDefaultValue;
public PsiJetParameterStubImpl( public PsiJetParameterStubImpl(
StubElement parent, StubElement parent,
FqName fqName, StringRef name, StringRef fqName, StringRef name,
boolean isMutable, boolean isMutable,
boolean hasValOrValNode, boolean hasValOrValNode,
boolean hasDefaultValue boolean hasDefaultValue
@@ -88,6 +87,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
@Nullable @Nullable
@Override @Override
public FqName getFqName() { public FqName getFqName() {
return fqName; return fqName != null ? new FqName(fqName.getString()) : null;
} }
} }