From 55cd241ffe2b9877c566d9328230ac86042ee656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Fri, 11 Mar 2016 23:46:22 +0000
Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * NEW: Debugger: When displaying
 the contents of a collection, the Key property is saved and restored so that
 the debugged program is not altered.

git-svn-id: svn://localhost/gambas/trunk@7628 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 app/src/gambas3/.src/Debug/FDebugExpr.class | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/gambas3/.src/Debug/FDebugExpr.class b/app/src/gambas3/.src/Debug/FDebugExpr.class
index c00614936..4df3b1189 100644
--- a/app/src/gambas3/.src/Debug/FDebugExpr.class
+++ b/app/src/gambas3/.src/Debug/FDebugExpr.class
@@ -22,6 +22,7 @@ Private $sClass As String
 Private $sRealClass As String
 Private $bArray As Boolean
 Private $bCollection As Boolean
+Private $sCollectionKey As String
 Private $aDim As Integer[]
 
 Static Public Sub Add(sExpr As String, sInfo As String)
@@ -151,6 +152,7 @@ Public Sub gvwExpr_Data(Row As Integer, Column As Integer)
         '$cVal.Remove(Row)
       Else  
         Design.Command("?X" & $sExpr & "#" & CStr(Row) & "\t" & $sExpr & "[" & sSym & "]")
+        Design.Command("=" & "\t" & $sExpr & ".Key = " & Quote($sCollectionKey))
       Endif
     Endif
     
@@ -390,7 +392,9 @@ Private Sub Init(sInfo As String, bNew As Boolean) As Boolean
 
   Else If $bCollection Then  
 
-    $aSym.Remove(0) ' Remove the count 
+    $sCollectionKey = $aSym[1] ' Current collection key
+    $aSym.Remove(0, 2) ' Remove the count and the current key
+    
 
   Else