diff --git a/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java b/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java index e542b001cb22..8b83e8111923 100644 --- a/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java +++ b/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java @@ -25,8 +25,11 @@ public class PythonBackspaceHandler extends BackspaceHandlerDelegate { final int offset = editor.getCaretModel().getOffset(); if (EditorModificationUtil.calcAfterLineEnd(editor) == 0) { int delta = editor.getCaretModel().getVisualPosition().column - myTargetPosition.column; - editor.getSelectionModel().setSelection(offset - delta, offset); - EditorModificationUtil.deleteSelectedText(editor); + assert delta >= 0; + if (offset <= editor.getDocument().getTextLength()) { + editor.getSelectionModel().setSelection(offset - delta, offset); + EditorModificationUtil.deleteSelectedText(editor); + } } editor.getCaretModel().moveToLogicalPosition(myTargetPosition); myTargetPosition = null;