MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[peter] IDEA-69181 Console history erases already typed but not submitted user input

Browse Source
This commit is contained in:
Gregory Shrago
2011-05-04 17:30:34 +04:00
parent a9134cd8a2
commit 31b581b5a1
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java
+13 -7
View File
@@ -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);
}
}
}
platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
+6
View File
@@ -89,6 +89,12 @@ public class ConsoleHistoryModel implements ModificationTracker {
}
}
public int getHistoryCursor() {
synchronized (myHistory) {
return myHistoryCursor;
}
}
@Override
public long getModificationCount() {
return myModificationTracker;