Commits

sk  committed 5a79c0d

- Fixed circular dependencies.
- Added inspector for repl.

  • Participants
  • Parent commits 00bb8f7

Comments (0)

Files changed (2)

File META-INF/MANIFEST.MF

  org.lispdev.swank;bundle-version="1.0.0",
  org.lispdev.log;bundle-version="1.0.0",
  org.lispdev.repl;bundle-version="1.0.0",
- org.lispdev.main;bundle-version="1.0.0"
+ org.lispdev.main;bundle-version="1.0.0",
+ org.lispdev.console.core;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

File src/org/lispdev/replview/ReplConsolePage.java

 package org.lispdev.replview;
 
 import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.source.VerticalRuler;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.lispdev.console.LispConsoleViewer;
 import org.lispdev.console.PartitionData;
 import org.lispdev.console.Prompt;
+import org.lispdev.console.core.IPartitionData;
+import org.lispdev.console.core.IVariableResolver;
 import org.lispdev.repl.AbstractRepl;
 import org.lispdev.repl.IState;
 import org.lispdev.repl.ReadState;
 import org.lispdev.swank.ISwank;
+import org.lispdev.swank.debug.LispDebugTarget;
 import org.lispdev.swank.debug.LispProcess;
 import org.lispdev.swank.debug.LispThread;
 import org.lispdev.swank.runnables.SwankDebugRunnable.DebugInfo;
   @Override
   public void createControl(Composite parent)
   {
+    repl = new Repl(process.getSwank());
     replConsole = new LispConsoleViewer(parent/*comp*/, new VerticalRuler(10),
         SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.LEFT | SWT.BORDER,
-        null); //FIXME
+        new IVariableResolver(){
+
+          @Override
+          public IVariable resolve(IPartitionData data)
+          {
+            return process.getSwank().getLispImplementation().
+              inspectReplResult(
+                  (LispDebugTarget)process.getLaunch().getDebugTarget(), data);
+          }
+        });
     replConsole.getTextWidget().setFont(JFaceResources.getTextFont());
     JFaceResources.getFontRegistry().addListener(fontListener);
 
     enterTrigger =
-      new ConsoleEnterTrigger(replConsole,SWT.SHIFT,LispConsoleViewer.BEFORE,false);
+      new ConsoleEnterTrigger(replConsole,SWT.SHIFT,
+          LispConsoleViewer.BEFORE,false);
 
-    repl = new Repl(process.getSwank());
     enterTrigger.addInputListener(repl);
     replConsole.getTextWidget().addVerifyKeyListener(enterTrigger);
     replConsole.setPrompt(