From 52924622b555cd0299cdd36e889dd958f3f90aa8 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Fri, 23 Jun 2017 16:55:50 +0300
Subject: [PATCH] Use common commit message editing component during rebase

---
 .../com/intellij/openapi/vcs/ui/CommitMessage.java  |  8 ++------
 .../rebase/GitRebaseUnstructuredEditor.java         | 13 ++++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index d7b109140eda..7e9167c3c4df 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -135,7 +135,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
   /**
    * Creates a text editor appropriate for creating commit messages.
    * @return a commit message editor
-   * @deprecated Use {@link CommitMessage#createCommitMessageEditor(Project, boolean)}.
+   * @deprecated Use {@link CommitMessage} component.
    */
   @Deprecated
   public static EditorTextField createCommitTextEditor(@NotNull Project project, @SuppressWarnings("unused") boolean forceSpellCheckOn) {
@@ -143,11 +143,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
   }
 
   @NotNull
-  public static EditorTextField createCommitMessageEditor(@NotNull Project project) {
-    return createCommitMessageEditor(project, true);
-  }
-
-  public static EditorTextField createCommitMessageEditor(@NotNull Project project, boolean runInspections) {
+  private static EditorTextField createCommitMessageEditor(@NotNull Project project, boolean runInspections) {
     Set<EditorCustomization> features = newHashSet();
 
     VcsConfiguration configuration = VcsConfiguration.getInstance(project);
diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
index fcd65cc0f541..751d300ca8f4 100644
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vcs.ui.CommitMessage;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.EditorTextField;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
@@ -35,7 +34,7 @@ import javax.swing.*;
  */
 class GitRebaseUnstructuredEditor extends DialogWrapper {
   @NotNull private final JBLabel myRootLabel;
-  @NotNull private final EditorTextField myTextEditor;
+  @NotNull private final CommitMessage myTextEditor;
 
   GitRebaseUnstructuredEditor(@NotNull Project project, @NotNull VirtualFile root, @NotNull String initialText) {
     super(project, true);
@@ -44,9 +43,9 @@ class GitRebaseUnstructuredEditor extends DialogWrapper {
 
     myRootLabel = new JBLabel("Git Root: " + root.getPresentableUrl());
 
-    myTextEditor = CommitMessage.createCommitMessageEditor(project);
+    myTextEditor = new CommitMessage(project, false, false, true);
     myTextEditor.setText(initialText);
-    myTextEditor.setCaretPosition(0);
+    myTextEditor.getEditorField().setCaretPosition(0);
     init();
   }
 
@@ -54,7 +53,7 @@ class GitRebaseUnstructuredEditor extends DialogWrapper {
   protected JComponent createCenterPanel() {
     BorderLayoutPanel rootPanel = JBUI.Panels.simplePanel(UIUtil.DEFAULT_HGAP, UIUtil.DEFAULT_VGAP);
     rootPanel.addToTop(myRootLabel);
-    rootPanel.addToCenter(myTextEditor.getComponent());
+    rootPanel.addToCenter(myTextEditor);
     return rootPanel;
   }
 
@@ -65,11 +64,11 @@ class GitRebaseUnstructuredEditor extends DialogWrapper {
 
   @Override
   public JComponent getPreferredFocusedComponent() {
-    return myTextEditor.getFocusTarget();
+    return myTextEditor.getEditorField().getFocusTarget();
   }
 
   @NotNull
   String getText() {
-    return myTextEditor.getText();
+    return myTextEditor.getComment();
   }
 }