From a75cc0fec75cfed6934c592a6f4f0930157c82e2 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Wed, 26 Oct 2016 07:20:48 +0300 Subject: [PATCH] don't keep StringRef as field --- .../impl/java/stubs/FunctionalExpressionElementType.java | 4 ++-- .../psi/impl/java/stubs/FunctionalExpressionStub.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionElementType.java index a1891cb58277..d536b3824d87 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionElementType.java @@ -40,7 +40,7 @@ public abstract class FunctionalExpressionElementType deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { - return new FunctionalExpressionStub(parentStub, this, dataStream.readName()); + return new FunctionalExpressionStub(parentStub, this, StringRef.toString(dataStream.readName())); } @Override @@ -49,7 +49,7 @@ public abstract class FunctionalExpressionElementType createStub(LighterAST tree, LighterASTNode funExpr, StubElement parentStub) { - return new FunctionalExpressionStub(parentStub, this, StringRef.fromString(getPresentableText(tree, funExpr))); + return new FunctionalExpressionStub(parentStub, this, getPresentableText(tree, funExpr)); } @NotNull diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java index e9f03d83f439..3e2bea23a26d 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java @@ -19,17 +19,16 @@ import com.intellij.psi.PsiFunctionalExpression; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubBase; import com.intellij.psi.stubs.StubElement; -import com.intellij.util.io.StringRef; public class FunctionalExpressionStub extends StubBase { - private final StringRef myPresentableTextRef; + private final String myPresentableText; - protected FunctionalExpressionStub(StubElement parent, IStubElementType elementType, StringRef presentableTextRef) { + protected FunctionalExpressionStub(StubElement parent, IStubElementType elementType, String presentableTextRef) { super(parent, elementType); - myPresentableTextRef = presentableTextRef; + myPresentableText = presentableTextRef; } public String getPresentableText() { - return myPresentableTextRef.getString(); + return myPresentableText; } } \ No newline at end of file