diff --git a/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java b/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java index 052cbc1e4897..acc3794b7a7c 100644 --- a/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java +++ b/python/src/com/jetbrains/python/editor/PythonBackspaceHandler.java @@ -1,11 +1,10 @@ package com.jetbrains.python.editor; +import com.intellij.codeInsight.editorActions.BackspaceHandler; import com.intellij.codeInsight.editorActions.BackspaceHandlerDelegate; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.psi.PsiFile; -import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.jetbrains.python.PythonFileType; /** @@ -15,32 +14,8 @@ public class PythonBackspaceHandler extends BackspaceHandlerDelegate { private LogicalPosition myTargetPosition; public void beforeCharDeleted(final char c, final PsiFile file, final Editor editor) { - myTargetPosition = null; if (PythonFileType.INSTANCE != file.getFileType()) return; - if (editor.getSelectionModel().hasSelection() || editor.getSelectionModel().hasBlockSelection()) return; - - LogicalPosition caretPos = editor.getCaretModel().getLogicalPosition(); - if (caretPos.line == 1 || caretPos.column == 0) { - return; - } - int lineStartOffset = editor.getDocument().getLineStartOffset(caretPos.line); - int lineEndOffset = editor.getDocument().getLineEndOffset(caretPos.line); - - CharSequence charSeq = editor.getDocument().getCharsSequence(); - // smart backspace is activated only if all characters in the caret line - // are whitespace characters - for(int pos=lineStartOffset; pos