From 31b581b5a1f25f71d000443af239459a800470d9 Mon Sep 17 00:00:00 2001
From: Gregory Shrago <Gregory.Shrago@jetbrains.com>
Date: Wed, 4 May 2011 15:43:18 +0400
Subject: [PATCH] [peter] IDEA-69181 Console history erases already typed but
 not submitted user input

---
 .../console/ConsoleHistoryController.java     | 20 ++++++++++++-------
 .../process/ConsoleHistoryModel.java          |  6 ++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java
index de4f371bb308..4e715de29d06 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java
@@ -68,6 +68,7 @@ public class ConsoleHistoryController {
   private boolean myMultiline;
   private long myLastSaveStamp;
 
+  private String myUserValue;
 
   public ConsoleHistoryController(@NotNull final String type,
                                   @Nullable final String persistenceId,
@@ -202,7 +203,6 @@ public class ConsoleHistoryController {
     }
   }
 
-
   public AnAction getHistoryNext() {
     return myHistoryNext;
   }
@@ -215,11 +215,14 @@ public class ConsoleHistoryController {
     return myBrowseHistory;
   }
 
-  protected void actionTriggered(final String command) {
+  protected void actionTriggered(final String command, final boolean storeUserText) {
     final Editor editor = myConsole.getCurrentEditor();
     final Document document = editor.getDocument();
     new WriteCommandAction(myConsole.getProject(), myConsole.getFile()) {
       protected void run(final Result result) throws Throwable {
+        if (storeUserText) {
+          myUserValue = document.getText();
+        }
         document.setText(StringUtil.notNullize(command));
         editor.getCaretModel().moveToOffset(document.getTextLength());
         editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
@@ -238,14 +241,16 @@ public class ConsoleHistoryController {
 
     @Override
     public void actionPerformed(final AnActionEvent e) {
-      actionTriggered(myNext ? myModel.getHistoryNext() : myModel.getHistoryPrev());
+      final String command;
+      command = myNext ? myModel.getHistoryNext() : StringUtil.notNullize(myModel.getHistoryPrev(), StringUtil.notNullize(myUserValue));
+      actionTriggered(command, myNext && myModel.getHistoryCursor() == 0);
     }
 
     @Override
     public void update(final AnActionEvent e) {
       super.update(e);
-      e.getPresentation().setEnabled(myModel.hasHistory(myNext) &&
-                                     (myMultiline || canMoveInEditor(myNext)));
+      final boolean hasStuff = myModel.hasHistory(myNext);
+      e.getPresentation().setEnabled(hasStuff && (myMultiline || canMoveInEditor(myNext)));
     }
   }
 
@@ -260,7 +265,8 @@ public class ConsoleHistoryController {
       return document.getLineNumber(caretModel.getOffset()) == 0;
     }
     else {
-      return document.getLineNumber(caretModel.getOffset()) == document.getLineCount() - 1 &&
+      final int lineCount = document.getLineCount();
+      return (lineCount == 0 || document.getLineNumber(caretModel.getOffset()) == lineCount - 1) &&
              StringUtil.isEmptyOrSpaces(document.getText().substring(caretModel.getOffset()));
     }
   }
@@ -326,7 +332,7 @@ public class ConsoleHistoryController {
       };
       chooser.show();
       if (chooser.isOK()) {
-        actionTriggered(myModel.getHistory().get(chooser.getSelectedIndex()));
+        actionTriggered(myModel.getHistory().get(chooser.getSelectedIndex()), false);
       }
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java b/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
index 385b0bb2d862..1b8108a0f198 100644
--- a/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
+++ b/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
@@ -89,6 +89,12 @@ public class ConsoleHistoryModel implements ModificationTracker {
     }
   }
 
+  public int getHistoryCursor() {
+    synchronized (myHistory) {
+      return myHistoryCursor;
+    }
+  }
+
   @Override
   public long getModificationCount() {
     return myModificationTracker;