From d68883c9e310cb98eb03037400e2863225a694f6 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Tue, 11 Sep 2012 20:30:27 +0400
Subject: [PATCH] fixed  PY-7524 Dragged/pasted code in wrong location fixed
 PY-7470 Smart copy-paste unindents next line (in place insert)

---
 .../editorActions/CopyPasteIndentProcessor.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
index 2367d066745b..983e61a99a9d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
@@ -108,11 +108,7 @@ public class CopyPasteIndentProcessor implements CopyPastePostProcessor<IndentTr
           final int offset = getLineStartSafeOffset(initialDocument, lineNumber);
           final int caretColumn = caretOffset - offset;
 
-          if (bounds.getStartOffset() != offset) {         //selection
-            startLine += 1;
-            toIndent = Math.abs(bounds.getStartOffset() - offset);
-          }
-          else {
+          if (bounds.getStartOffset() == offset) {
             String toString = initialDocument.getText(TextRange.create(offset, initialDocument.getLineEndOffset(lineNumber)));
             toIndent = StringUtil.findFirst(toString, new CharFilter() {
               @Override
@@ -124,6 +120,12 @@ public class CopyPasteIndentProcessor implements CopyPastePostProcessor<IndentTr
               toIndent = caretColumn;
             }
           }
+          else if (isNotApplicable(initialDocument, offset))
+            return;
+          else {                       // selection
+            startLine += 1;
+            toIndent = Math.abs(bounds.getStartOffset() - offset);
+          }
         }
 
         // actual difference in indentation level
@@ -141,6 +143,11 @@ public class CopyPasteIndentProcessor implements CopyPastePostProcessor<IndentTr
         }
         indented.set(Boolean.TRUE);
       }
+
+      private boolean isNotApplicable(DocumentImpl initialDocument, int offset) {
+        return caretOffset < initialDocument.getTextLength() && !StringUtil
+          .isEmptyOrSpaces(initialDocument.getText(TextRange.create(offset, caretOffset)));
+      }
     });
     //System.out.println("--- after indent ---\n" + document.getText());
   }