MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (debug method implementation hidden; NPE fixed)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-07-03 16:08:06 +03:00
parent 80da6a36ef
commit 5749181bb8
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+6 -10
View File
@@ -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 "<dropped>";
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 + "...";
}
}