debugger: fix typos in complex watcher handling

Reviewed-by: Friedemann Kleint

diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index a52da81..e1a76a2 100644 (file)
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -1236,10 +1236,10 @@ class Dumper:
         #warn("HANDLING WATCH %s, INAME: '%s'" % (exp, iname))
         if exp.startswith("[") and exp.endswith("]"):
             #warn("EVAL: EXP: %s" % exp)
-            with SubItem(d):
-                self.put('iname="%s",', iname)
-                self.put('name="%s",', escapedExp)
-                self.put('exp="%s",', escapedExp)
+            with SubItem(self):
+                self.put('iname="%s",' % iname)
+                self.put('name="%s",' % escapedExp)
+                self.put('exp="%s",' % escapedExp)
                 try:
                     list = eval(exp)
                     self.putValue("")

diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
index c51245a..fab3af9 100644 (file)
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -305,7 +305,8 @@ void testPeekAndPoke3()
             s[i].a = i;  // Break here. Expand s and s[0]. Step.
             // Watcher Context: "Add New Watcher".
             // Type    ['s[%d].a' % i for i in range(5)]
-            // Expand it, continue stepping.
+            // Expand it, continue stepping. This should result in a list
+            // of five items containing the .a fields of s[0]..s[4].
         }
         Q_UNUSED(s);
     }