use the proper caret offset in case of selection. Do not overindent when replacing selection

PY-8744 Smart indent pasted lines doesn't replace selection when pasting multi-line code
This commit is contained in:
Ekaterina Tuzova
2013-02-12 16:46:47 +04:00
parent 4ade420a99
commit d48903bd71
@@ -106,7 +106,6 @@ public class CopyPasteIndentProcessor implements CopyPastePostProcessor<IndentTr
int lineNumber = initialDocument.getTextLength() > caretOffset? initialDocument.getLineNumber(caretOffset)
: initialDocument.getLineCount() - 1;
final int offset = getLineStartSafeOffset(initialDocument, lineNumber);
final int caretColumn = caretOffset - offset;
if (bounds.getStartOffset() == offset) {
String toString = initialDocument.getText(TextRange.create(offset, initialDocument.getLineEndOffset(lineNumber)));
@@ -116,8 +115,8 @@ public class CopyPasteIndentProcessor implements CopyPastePostProcessor<IndentTr
return ch != ' ';
}
});
if (toIndent < 0 || toString.startsWith("\n")) {
toIndent = caretColumn;
if ((toIndent < 0 || toString.startsWith("\n")) && initialText.length() >= caretOffset) {
toIndent = caretOffset - offset;
}
}
else if (isNotApplicable(initialDocument, offset))