From 15574a20269644122730fb4e01de93dfc0011c0f Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 14 May 2014 15:03:03 +0400
Subject: [PATCH] Store fqName as StringRef in PsiJetParameterStub

---
 .../lang/psi/stubs/elements/JetParameterElementType.java   | 7 ++++---
 .../jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java   | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
index eac4f4fa1d3..846e1273f35 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
@@ -38,7 +38,9 @@ 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()),
+        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());
     }
 
@@ -68,8 +70,7 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
         boolean isMutable = dataStream.readBoolean();
         boolean hasValOrValNode = dataStream.readBoolean();
         boolean hasDefaultValue = dataStream.readBoolean();
-        StringRef fqNameAsString = dataStream.readName();
-        FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
+        StringRef fqName = dataStream.readName();
 
          return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, hasValOrValNode, hasDefaultValue);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java
index e7e1278228d..c8ddefbf1ea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java
@@ -28,14 +28,13 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements PsiJetParameterStub {
     private final StringRef name;
     private final boolean isMutable;
-    //TODO: store as StringRef
-    private final FqName fqName;
+    private final StringRef fqName;
     private final boolean hasValOrValNode;
     private final boolean hasDefaultValue;
 
     public PsiJetParameterStubImpl(
             StubElement parent,
-            FqName fqName, StringRef name,
+            StringRef fqName, StringRef name,
             boolean isMutable,
             boolean hasValOrValNode,
             boolean hasDefaultValue
@@ -88,6 +87,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
     @Nullable
     @Override
     public FqName getFqName() {
-        return fqName;
+        return fqName != null ? new FqName(fqName.getString()) : null;
     }
 }