Remove unused fields and redundant constructor from PsiJetPropertyStubImpl

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

@@ -21,6 +21,4 @@ import org.jetbrains.jet.lang.psi.JetProperty;
 public interface PsiJetPropertyStub extends PsiJetStubWithFqName<JetProperty> {
     boolean isVar();
     boolean isTopLevel();
-    String getTypeText();
-    String getInferenceBodyText();
 }

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

@@ -25,9 +25,7 @@ import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetProperty;
-import org.jetbrains.jet.lang.psi.JetTypeReference;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetPropertyStub;
 import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetPropertyStubImpl;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
@@ -52,17 +50,12 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
 
     @Override
     public PsiJetPropertyStub createStub(@NotNull JetProperty psi, StubElement parentStub) {
-        JetTypeReference typeRef = psi.getTypeRef();
-        JetExpression expression = psi.getInitializer();
-
         assert !psi.isLocal() :
                 String.format("Should not store local property: %s, parent %s",
                               psi.getText(), psi.getParent() != null ? psi.getParent().getText() : "<no parent>");
 
-        return new PsiJetPropertyStubImpl(parentStub,
+        return new PsiJetPropertyStubImpl(parentStub, StringRef.fromString(psi.getName()),
-            psi.getName(), psi.isVar(), psi.isTopLevel(), ResolveSessionUtils.safeFqNameForLazyResolve(psi),
+                                          psi.isVar(), psi.isTopLevel(), ResolveSessionUtils.safeFqNameForLazyResolve(psi));
-            typeRef != null ? typeRef.getText() : null,
-            expression != null ? expression.getText() : null);
     }
 
     @Override
@@ -73,9 +66,6 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
 
         FqName fqName = stub.getFqName();
         dataStream.writeName(fqName != null ? fqName.asString() : null);
-
-        dataStream.writeName(stub.getTypeText());
-        dataStream.writeName(stub.getInferenceBodyText());
     }
 
     @NotNull
@@ -88,11 +78,7 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
         StringRef fqNameAsString = dataStream.readName();
         FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
 
-        StringRef typeText = dataStream.readName();
+        return new PsiJetPropertyStubImpl(parentStub, name, isVar, isTopLevel, fqName);
-        StringRef inferenceBodyText = dataStream.readName();
-
-        return new PsiJetPropertyStubImpl(parentStub,
-                                          name, isVar, isTopLevel, fqName, typeText, inferenceBodyText);
     }
 
     @Override

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

@@ -30,13 +30,8 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
     private final boolean isVar;
     private final boolean isTopLevel;
     private final FqName fqName;
-    private final StringRef typeText;
-    private final StringRef inferenceBodyText;
 
-    public PsiJetPropertyStubImpl(
+    public PsiJetPropertyStubImpl( StubElement parent, StringRef name, boolean isVar, boolean isTopLevel, @Nullable FqName fqName) {
-            StubElement parent, StringRef name,
-            boolean isVar, boolean isTopLevel, @Nullable FqName fqName, StringRef typeText, StringRef inferenceBodyText
-    ) {
         super(parent, JetStubElementTypes.PROPERTY);
 
         if (isTopLevel && fqName == null) {
@@ -47,16 +42,6 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
         this.isVar = isVar;
         this.isTopLevel = isTopLevel;
         this.fqName = fqName;
-        this.typeText = typeText;
-        this.inferenceBodyText = inferenceBodyText;
-    }
-
-    public PsiJetPropertyStubImpl(StubElement parent, String name,
-            boolean isVar, boolean isTopLevel, @Nullable FqName topFQName,
-            String typeText, String inferenceBodyText
-    ) {
-        this(parent, StringRef.fromString(name),
-             isVar, isTopLevel, topFQName, StringRef.fromString(typeText), StringRef.fromString(inferenceBodyText));
     }
 
     @Override
@@ -75,16 +60,6 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
         return fqName;
     }
 
-    @Override
-    public String getTypeText() {
-        return StringRef.toString(typeText);
-    }
-
-    @Override
-    public String getInferenceBodyText() {
-        return StringRef.toString(inferenceBodyText);
-    }
-
     @Override
     public String getName() {
         return StringRef.toString(name);
@@ -104,8 +79,6 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
         }
 
         builder.append("name=").append(getName());
-        builder.append(" typeText=").append(getTypeText());
-        builder.append(" bodyText=").append(getInferenceBodyText());
 
         builder.append("]");