From 820446d93771a425ddf654263567c2a63ffb34fe Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Fri, 20 May 2011 14:33:23 +0400 Subject: [PATCH] IDEA-69872 "Reformat code" action should change cursor position Restoring caret column after formatting only for the empty lines now --- .../psi/impl/source/codeStyle/CodeStyleManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java index a6049ecbb69b..4c129be534b1 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java @@ -172,8 +172,9 @@ public class CodeStyleManagerImpl extends CodeStyleManager { CharSequence text = document.getCharsSequence(); int caretLine = document.getLineNumber(caretOffset); int lineStartOffset = document.getLineStartOffset(caretLine); + int lineEndOffset = document.getLineEndOffset(caretLine); boolean fixCaretPosition = true; - for (int i = Math.min(caretOffset, text.length() - 1); i>= lineStartOffset; i--) { + for (int i = lineStartOffset; i < lineEndOffset; i++) { char c = text.charAt(i); if (c != ' ' && c != '\t' && c != '\n') { fixCaretPosition = false;