From 1d3e17dc4ffb88df7f3ad4e2c355e255710df063 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Wed, 5 Nov 2014 16:20:54 +0300 Subject: [PATCH] fixed IDEA-132100 and IDEA-132017 - incorrect mode after restore from history --- .../com/intellij/xdebugger/impl/XDebuggerHistoryManager.java | 2 +- .../com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java index 757610b1e42b..d6c9025e8b90 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java @@ -51,7 +51,7 @@ public class XDebuggerHistoryManager { list.removeLast(); } - XExpression trimmedExpression = new XExpressionImpl(expression.getExpression().trim(), expression.getLanguage(), expression.getCustomInfo()); + XExpression trimmedExpression = new XExpressionImpl(expression.getExpression().trim(), expression.getLanguage(), expression.getCustomInfo(), expression.getMode()); list.remove(trimmedExpression); list.addFirst(trimmedExpression); return true; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java index 5928d8babf16..05d56161bade 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java @@ -240,7 +240,7 @@ public abstract class XDebuggerEditorBase { final List expressions = getRecentExpressions(); if (myHistoryIndex < expressions.size() - 1) { myHistoryIndex++; - setEditorText(expressions.get(myHistoryIndex)); + setExpression(expressions.get(myHistoryIndex)); } } @@ -248,7 +248,7 @@ public abstract class XDebuggerEditorBase { final List expressions = getRecentExpressions(); if (myHistoryIndex > 0) { myHistoryIndex--; - setEditorText(expressions.get(myHistoryIndex)); + setExpression(expressions.get(myHistoryIndex)); } } }