1 files changed, 92 insertions, 3 deletions
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
index ace9938318df..d4bd27c30d9b 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
@@ -15,20 +15,42 @@
  */
 package com.intellij.xdebugger.impl.frame;
 
+import com.intellij.codeInsight.hint.HintManager;
+import com.intellij.codeInsight.hint.HintUtil;
 import com.intellij.ide.dnd.DnDManager;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.event.SelectionEvent;
+import com.intellij.openapi.editor.event.SelectionListener;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
+import com.intellij.openapi.fileEditor.impl.text.PsiAwareTextEditorImpl;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.registry.Registry;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.SimpleColoredComponent;
+import com.intellij.ui.SimpleColoredText;
 import com.intellij.xdebugger.XDebuggerBundle;
+import com.intellij.xdebugger.XSourcePosition;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
+import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
+import com.intellij.xdebugger.frame.XFullValueEvaluator;
 import com.intellij.xdebugger.frame.XStackFrame;
+import com.intellij.xdebugger.frame.XValue;
+import com.intellij.xdebugger.frame.XValuePlace;
+import com.intellij.xdebugger.frame.presentation.XValuePresentation;
 import com.intellij.xdebugger.impl.actions.XDebuggerActions;
 import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree;
 import com.intellij.xdebugger.impl.ui.tree.XDebuggerTreePanel;
 import com.intellij.xdebugger.impl.ui.tree.XDebuggerTreeRestorer;
 import com.intellij.xdebugger.impl.ui.tree.XDebuggerTreeState;
+import com.intellij.xdebugger.impl.ui.tree.nodes.XEvaluationCallbackBase;
 import com.intellij.xdebugger.impl.ui.tree.nodes.XStackFrameNode;
 import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl;
+import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodePresentationConfigurator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -51,17 +73,84 @@ public abstract class XVariablesViewBase extends XDebugView {
     DnDManager.getInstance().registerSource(myDebuggerTreePanel, myDebuggerTreePanel.getTree());
   }
 
-  protected void buildTreeAndRestoreState(@NotNull XStackFrame stackFrame) {
+  protected void buildTreeAndRestoreState(@NotNull final XStackFrame stackFrame) {
     XDebuggerTree tree = myDebuggerTreePanel.getTree();
-    tree.setSourcePosition(stackFrame.getSourcePosition());
+    final XSourcePosition position = stackFrame.getSourcePosition();
+    tree.setSourcePosition(position);
     tree.setRoot(new XStackFrameNode(tree, stackFrame), false);
-    tree.getProject().putUserData(XVariablesView.DEBUG_VARIABLES, new HashMap<Pair<VirtualFile, Integer>, Set<XValueNodeImpl>>());
+    final Project project = tree.getProject();
+    project.putUserData(XVariablesView.DEBUG_VARIABLES, new HashMap<Pair<VirtualFile, Integer>, Set<XValueNodeImpl>>());
+    project.putUserData(XVariablesView.DEBUG_VARIABLES_TIMESTAMPS, new HashMap<VirtualFile, Long>());
     Object newEqualityObject = stackFrame.getEqualityObject();
     if (myFrameEqualityObject != null && newEqualityObject != null && myFrameEqualityObject.equals(newEqualityObject)
         && myTreeState != null) {
       disposeTreeRestorer();
       myTreeRestorer = myTreeState.restoreState(tree);
     }
+    if (position != null && Registry.is("ide.debugger.inline")) {
+      final VirtualFile file = position.getFile();
+      final FileEditor fileEditor = FileEditorManagerEx.getInstanceEx(project).getSelectedEditor(file);
+      if (fileEditor instanceof PsiAwareTextEditorImpl) {
+        final Editor editor = ((PsiAwareTextEditorImpl)fileEditor).getEditor();
+        final SelectionListener listener = new SelectionListener() {
+          @Override
+          public void selectionChanged(SelectionEvent e) {
+            final String text = editor.getDocument().getText(e.getNewRange());
+            final XDebuggerEvaluator evaluator = stackFrame.getEvaluator();
+            if (evaluator != null && !StringUtil.isEmpty(text)
+                && !(text.contains("exec(") || text.contains("++") || text.contains("--") || text.contains("="))) {
+              evaluator.evaluate(text, new XEvaluationCallbackBase() {
+                @Override
+                public void evaluated(@NotNull XValue result) {
+                  result.computePresentation(new XValueNodePresentationConfigurator.ConfigurableXValueNodeImpl() {
+                    @Override
+                    public void applyPresentation(@Nullable Icon icon,
+                                                  @NotNull XValuePresentation valuePresenter,
+                                                  boolean hasChildren) {
+                      SimpleColoredText text = new SimpleColoredText();
+                      XValueNodeImpl.buildText(valuePresenter, text, false);
+                      SimpleColoredComponent component = HintUtil.createInformationComponent();
+                      text.appendToComponent(component);
+                      String str = text.toString();
+                      if ("undefined".equals(str) || str.startsWith("Cannot find local variable")
+                          || str.startsWith("Invalid expression")) {
+                        return; //todo[kb] this is temporary solution
+                      }
+                      HintManager.getInstance().hideAllHints();
+                      HintManager.getInstance().showInformationHint(editor, component);
+                    }
+
+                    @Override
+                    public void setFullValueEvaluator(@NotNull XFullValueEvaluator fullValueEvaluator) {
+                    }
+
+                    @Override
+                    public boolean isObsolete() {
+                      return true;
+                    }
+                  }, XValuePlace.TOOLTIP);
+                }
+
+                @Override
+                public void errorOccurred(@NotNull String errorMessage) {
+                  System.out.println(errorMessage);
+                }
+              }, position);
+            }
+          }
+        };
+        editor.getSelectionModel().addSelectionListener(listener);
+        Disposer.register(tree, new Disposable() {
+          @Override
+          public void dispose() {
+            final FileEditor fileEditor = FileEditorManagerEx.getInstanceEx(project).getSelectedEditor(file);
+            if (fileEditor instanceof PsiAwareTextEditorImpl) {
+              ((PsiAwareTextEditorImpl)fileEditor).getEditor().getSelectionModel().removeSelectionListener(listener);
+            }
+          }
+        });
+      }
+    }
   }
 
   protected void saveCurrentTreeState(@Nullable XStackFrame stackFrame) {