From a9db75db4911483458235cdd11bf182a56cb22d6 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 20 Apr 2017 12:53:56 +0300
Subject: [PATCH] diff: compare with clipboard - scroll to caret

---
 .../diff/actions/CompareClipboardWithSelectionAction.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java b/platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java
index 1aeb0a62541f..5ad02ce37b0c 100644
--- a/platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java
+++ b/platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java
@@ -24,6 +24,7 @@ import com.intellij.diff.requests.DiffRequest;
 import com.intellij.diff.requests.SimpleDiffRequest;
 import com.intellij.diff.tools.util.DiffDataKeys;
 import com.intellij.diff.util.DiffUserDataKeys;
+import com.intellij.diff.util.Side;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.diff.DiffBundle;
@@ -34,6 +35,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.UnknownFileType;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -93,6 +95,7 @@ public class CompareClipboardWithSelectionAction extends BaseShowDiffAction {
     String title = DiffBundle.message("diff.clipboard.vs.editor.dialog.title");
 
     SimpleDiffRequest request = new SimpleDiffRequest(title, content1, content2, title1, title2);
+    request.putUserData(DiffUserDataKeys.SCROLL_TO_LINE, Pair.create(Side.RIGHT, editor.getCaretModel().getLogicalPosition().line));
     if (editor.isViewer()) {
       request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY_CONTENTS, new boolean[]{false, true});
     }