add debug process to dlv x value

Author: ignatov

src/com/goide/dlv/DlvDebugProcess.java

@@ -92,7 +92,7 @@ public void consume(@NotNull final DebuggerState o) {
         .done(new Consumer<List<DlvApi.Location>>() {
           @Override
           public void consume(@NotNull List<DlvApi.Location> locations) {
-            DlvSuspendContext context = new DlvSuspendContext(o.currentThread.id, locations, getProcessor());
+            DlvSuspendContext context = new DlvSuspendContext(DlvDebugProcess.this, o.currentThread.id, locations, getProcessor());
             XDebugSession session = getSession();
             if (find == null) {
               session.positionReached(context);

src/com/goide/dlv/DlvStackFrame.java

@@ -50,11 +50,16 @@
 import java.util.List;
 
 class DlvStackFrame extends XStackFrame {
+  private final DlvDebugProcess myProcess;
   private final DlvApi.Location myLocation;
   private final DlvCommandProcessor myProcessor;
   private final int myId;
 
-  public DlvStackFrame(DlvApi.Location location, DlvCommandProcessor processor, int id) {
+  public DlvStackFrame(@NotNull DlvDebugProcess process, 
+                       @NotNull DlvApi.Location location, 
+                       @NotNull DlvCommandProcessor processor, 
+                       int id) {
+    myProcess = process;
     myLocation = location;
     myProcessor = processor;
     myId = id;
@@ -116,7 +121,7 @@ public void run() {
 
   @NotNull
   private XValue createXValue(@NotNull DlvApi.Variable variable, @Nullable Icon icon) {
-    return new DlvXValue(variable, icon, myProcessor, myId);
+    return new DlvXValue(myProcess, variable, myProcessor, myId, icon);
   }
 
   @Nullable

src/com/goide/dlv/DlvSuspendContext.java

@@ -29,8 +29,11 @@
 class DlvSuspendContext extends XSuspendContext {
   @NotNull private final DlvExecutionStack myStack;
 
-  public DlvSuspendContext(int threadId, @NotNull List<DlvApi.Location> locations, @NotNull DlvCommandProcessor processor) {
-    myStack = new DlvExecutionStack(threadId, locations, processor);
+  public DlvSuspendContext(@NotNull DlvDebugProcess process,
+                           int threadId,
+                           @NotNull List<DlvApi.Location> locations,
+                           @NotNull DlvCommandProcessor processor) {
+    myStack = new DlvExecutionStack(process, threadId, locations, processor);
   }
 
   @Nullable
@@ -46,17 +49,22 @@ public XExecutionStack[] getExecutionStacks() {
   }
 
   private static class DlvExecutionStack extends XExecutionStack {
+    @NotNull private final DlvDebugProcess myProcess;
     @NotNull private final List<DlvApi.Location> myLocations;
-    private final DlvCommandProcessor myProcessor;
+    @NotNull private final DlvCommandProcessor myProcessor;
     @NotNull private final List<DlvStackFrame> myStack;
 
-    public DlvExecutionStack(int threadId, @NotNull List<DlvApi.Location> locations, DlvCommandProcessor processor) {
+    public DlvExecutionStack(@NotNull DlvDebugProcess process,
+                             int threadId,
+                             @NotNull List<DlvApi.Location> locations,
+                             @NotNull DlvCommandProcessor processor) {
       super("Thread #" + threadId);
+      myProcess = process;
       myLocations = locations;
       myProcessor = processor;
       myStack = ContainerUtil.newArrayListWithCapacity(locations.size());
       for (int i = 0; i < myLocations.size(); i++) {
-        myStack.add(new DlvStackFrame(myLocations.get(i), myProcessor, i));
+        myStack.add(new DlvStackFrame(myProcess, myLocations.get(i), myProcessor, i));
       }
     }
 

src/com/goide/dlv/DlvXValue.java

@@ -36,11 +36,17 @@ class DlvXValue extends XNamedValue {
   @NotNull
   private final DlvApi.Variable myVariable;
   private final Icon myIcon;
+  private final DlvDebugProcess myProcess;
   private final DlvCommandProcessor myProcessor;
   private final int myFrameId;
 
-  public DlvXValue(@NotNull DlvApi.Variable variable, Icon icon, DlvCommandProcessor processor, int frameId) {
+  public DlvXValue(@NotNull DlvDebugProcess process,
+                   @NotNull DlvApi.Variable variable,
+                   @NotNull DlvCommandProcessor processor, 
+                   int frameId, 
+                   @Nullable Icon icon) {
     super(variable.name);
+    myProcess = process;
     myVariable = variable;
     myIcon = icon;
     myProcessor = processor;
@@ -63,7 +69,7 @@ public void computeChildren(@NotNull XCompositeNode node) {
     else {
       XValueChildrenList list = new XValueChildrenList();
       for (DlvApi.Variable child : children) {
-        list.add(child.name, new DlvXValue(child, AllIcons.Nodes.Field, myProcessor, myFrameId));
+        list.add(child.name, new DlvXValue(myProcess, child, myProcessor, myFrameId, AllIcons.Nodes.Field));
       }
       node.addChildren(list, true);
     }