Remove unused fields in PsiJetParameterStub

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetParameterStub.java

@@ -16,15 +16,10 @@
 
 package org.jetbrains.jet.lang.psi.stubs;
 
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetParameter;
 
 public interface PsiJetParameterStub extends PsiJetStubWithFqName<JetParameter> {
     boolean isMutable();
     boolean isVarArg();
-    @Nullable
-    String getTypeText();
-    @Nullable
-    String getDefaultValueText();
     boolean hasValOrValNode();
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java

@@ -40,14 +40,8 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
 
     @Override
     public PsiJetParameterStub createStub(@NotNull JetParameter psi, StubElement parentStub) {
-        JetTypeReference typeReference = psi.getTypeReference();
+        return new PsiJetParameterStubImpl(parentStub, psi.getFqName(), StringRef.fromString(psi.getName()),
-        JetExpression defaultValue = psi.getDefaultValue();
+                                           psi.isMutable(), psi.isVarArg(), psi.getValOrVarNode() != null);
-
-        return new PsiJetParameterStubImpl(parentStub, psi.getFqName(),
-                psi.getName(), psi.isMutable(), psi.isVarArg(),
-                typeReference != null ? typeReference.getText() : null,
-                defaultValue != null ? defaultValue.getText() : null,
-                psi.getValOrVarNode() != null);
     }
 
     @Override
@@ -65,8 +59,6 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
         dataStream.writeBoolean(stub.isMutable());
         dataStream.writeBoolean(stub.isVarArg());
         dataStream.writeBoolean(stub.hasValOrValNode());
-        dataStream.writeName(stub.getTypeText());
-        dataStream.writeName(stub.getDefaultValueText());
         FqName name = stub.getFqName();
         dataStream.writeName(name != null ? name.asString() : null);
     }
@@ -78,12 +70,9 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
         boolean isMutable = dataStream.readBoolean();
         boolean isVarArg = dataStream.readBoolean();
         boolean hasValOrValNode = dataStream.readBoolean();
-        StringRef typeText = dataStream.readName();
-        StringRef defaultValueText = dataStream.readName();
         StringRef fqNameAsString = dataStream.readName();
         FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
 
-         return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, isVarArg,
+         return new PsiJetParameterStubImpl(parentStub, fqName, name, isMutable, isVarArg, hasValOrValNode);
-                                           typeText, defaultValueText, hasValOrValNode);
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetParameterStubImpl.java

@@ -29,8 +29,7 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
     private final StringRef name;
     private final boolean isMutable;
     private final boolean isVarArg;
-    private final StringRef typeText;
+    //TODO: store as StringRef
-    private final StringRef defaultValueText;
     private final FqName fqName;
     private final boolean hasValOrValNode;
 
@@ -39,32 +38,16 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
             FqName fqName, StringRef name,
             boolean isMutable,
             boolean isVarArg,
-            StringRef typeText, StringRef defaultValueText,
             boolean hasValOrValNode
     ) {
         super(parent, JetStubElementTypes.VALUE_PARAMETER);
         this.name = name;
         this.isMutable = isMutable;
         this.isVarArg = isVarArg;
-        this.typeText = typeText;
-        this.defaultValueText = defaultValueText;
         this.fqName = fqName;
         this.hasValOrValNode = hasValOrValNode;
     }
 
-    public PsiJetParameterStubImpl(
-            StubElement parent,
-            FqName fqName, String name,
-            boolean isMutable,
-            boolean isVarArg,
-            String typeText,
-            String defaultValueText,
-            boolean hasValOrValNode
-    ) {
-        this(parent, fqName, StringRef.fromString(name), isMutable, isVarArg,
-             StringRef.fromString(typeText), StringRef.fromString(defaultValueText), hasValOrValNode);
-    }
-
     @Override
     public String getName() {
         return StringRef.toString(name);
@@ -80,17 +63,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
         return isVarArg;
     }
 
-    @Nullable
-    @Override
-    public String getTypeText() {
-        return StringRef.toString(typeText);
-    }
-
-    @Override
-    public String getDefaultValueText() {
-        return StringRef.toString(defaultValueText);
-    }
-
     @Override
     public boolean hasValOrValNode() {
         return hasValOrValNode;
@@ -111,8 +83,6 @@ public class PsiJetParameterStubImpl extends StubBase<JetParameter> implements P
         if (fqName != null) {
             builder.append(" fqName=").append(fqName.toString()).append(" ");
         }
-        builder.append(" typeText=").append(getTypeText());
-        builder.append(" defaultValue=").append(getDefaultValueText());
 
         builder.append("]");