From f0ed128a337610a963efa6d976ff7fd17de0e859 Mon Sep 17 00:00:00 2001
From: niktrop <Nikolay.Tropin@jetbrains.com>
Date: Fri, 17 Jan 2014 12:40:50 +0400
Subject: [PATCH] Prefer custom code fragment factory on context change

---
 .../src/com/intellij/debugger/ui/DebuggerEditorImpl.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java
index ac19445b6711..f33692e3fc30 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java
@@ -183,11 +183,15 @@ public abstract class DebuggerEditorImpl extends CompletionEditor{
 
     List<CodeFragmentFactory> factories = DebuggerUtilsEx.getCodeFragmentFactories(context);
     boolean many = factories.size() > 1;
+    CodeFragmentFactory preferredFactory = factories.get(0);
     if (myInitialFactory) {
       myInitialFactory = false;
-      setFactory(factories.get(0));
+      setFactory(preferredFactory);
       myChooseFactory.setVisible(many);
     }
+    if (many && DefaultCodeFragmentFactory.getInstance().equals(myFactory)) {
+      setFactory(preferredFactory);
+    }
     myChooseFactory.setVisible(myChooseFactory.isVisible() || many);
     myChooseFactory.setEnabled(many && factories.contains(myFactory));