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

JoinLinesHandler: check offset range; report failing handler (EA-137957 - assert: DocumentImpl.createRangeMarker)

Browse Source
This commit is contained in:
Tagir Valeev
2019-02-27 11:41:45 +07:00
parent c162891747
commit a476a9a224
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java
+15 -2
View File
@@ -148,7 +148,7 @@ public class JoinLinesHandler extends EditorActionHandler {
if (delegate instanceof JoinRawLinesHandlerDelegate) {
rc = ((JoinRawLinesHandlerDelegate)delegate).tryJoinRawLines(doc, psiFile, start, end);
if (rc != CANNOT_JOIN) {
caretRestoreOffset.set(rc);
caretRestoreOffset.set(checkOffset(rc, delegate, doc));
break;
}
}
@@ -183,7 +183,7 @@ public class JoinLinesHandler extends EditorActionHandler {
docManager.commitDocument(doc);
for(JoinLinesHandlerDelegate delegate: JoinLinesHandlerDelegate.EP_NAME.getExtensionList()) {
rc = delegate.tryJoinLines(doc, psiFile, start, end);
rc = checkOffset(delegate.tryJoinLines(doc, psiFile, start, end), delegate, doc);
if (rc != CANNOT_JOIN) break;
}
}
@@ -241,6 +241,19 @@ public class JoinLinesHandler extends EditorActionHandler {
docManager.commitDocument(doc);
}
private static int checkOffset(int offset, JoinLinesHandlerDelegate delegate, DocumentEx doc) {
if (offset == CANNOT_JOIN) return offset;
if (offset < 0) {
LOG.error("Handler returned negative offset: handler class="+delegate.getClass()+"; offset="+offset);
return 0;
} else if (offset > doc.getTextLength()) {
LOG.error("Handler returned an offset which exceeds the document length: handler class=" + delegate.getClass() +
"; offset=" + offset + "; length=" + doc.getTextLength());
return doc.getTextLength();
}
return offset;
}
private static class JoinLinesOffsets {
int lineEndOffset;
int lastNonSpaceOffsetInStartLine;