From 5749181bb8f85dc190c4deb3036b8c53c58db61e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 3 Jul 2015 16:08:06 +0300 Subject: [PATCH] Cleanup (debug method implementation hidden; NPE fixed) --- .../com/intellij/lang/impl/PsiBuilderImpl.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java index 7f2a21c2da20..4a5cf11176a5 100644 --- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java +++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java @@ -462,9 +462,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder { @Override public void doneBefore(@NotNull final IElementType type, @NotNull final Marker before, final String errorMessage) { - final StartMarker marker = (StartMarker)before; - myBuilder.myProduction.add(myBuilder.myProduction.lastIndexOf(marker), - new ErrorItem(myBuilder, errorMessage, marker.myLexemeIndex)); + StartMarker marker = (StartMarker)before; + myBuilder.myProduction.add(myBuilder.myProduction.lastIndexOf(marker), new ErrorItem(myBuilder, errorMessage, marker.myLexemeIndex)); doneBefore(type, before); } @@ -503,18 +502,15 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder { } } - public CharSequence getText() { + @Override + public String toString() { + if (myBuilder == null) return ""; boolean isDone = myDoneMarker != null; CharSequence originalText = myBuilder.getOriginalText(); int startOffset = getStartOffset(); int endOffset = isDone ? getEndOffset() : myBuilder.getCurrentOffset(); CharSequence text = originalText.subSequence(startOffset, endOffset); - return isDone ? text : text + "..."; - } - - @Override - public String toString() { - return getText().toString(); + return isDone ? text.toString() : text + "..."; } }