From f54ace8ef9af8a6f9d5f67b276b2ff1fd4a59823 Mon Sep 17 00:00:00 2001
From: Michael van der Kamp <michael.vanderkamp@usask.ca>
Date: Wed, 29 Jun 2022 11:35:12 -0700
Subject: [PATCH] Extract WatchExpression.label()

---
 pudb/var_view.py | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pudb/var_view.py b/pudb/var_view.py
index 26c06e39..344f9e79 100644
--- a/pudb/var_view.py
+++ b/pudb/var_view.py
@@ -215,6 +215,26 @@ def eval(self, frame_globals, frame_locals):
                 return WatchEvalError()
         return self._value
 
+    def label(self, value, frame_globals, frame_locals):
+        scope_str = self.scope[0]
+        expression = self.expression
+        if self.method == "reference":
+            found = False
+            # locals first as that's the context the user is more likely to be
+            # interested in re: seeing renames.
+            for mapping in (frame_locals, frame_globals):
+                for k, v in mapping.items():
+                    if v is value:
+                        expression = f"{expression} ({k})"
+                        found = True
+                        break
+                if found:
+                    break
+            method_str = "*"
+        else:
+            method_str = "="
+        return f"[{scope_str}{method_str}] {expression}"
+
     def set_expression(self, expression):
         if expression != self.expression:
             self.expression = expression
@@ -754,24 +774,7 @@ def make_var_view(global_watches, frame_var_info, frame_globals, frame_locals):
 
     for watch_expr in chain(global_watches, frame_var_info.watches):
         value = watch_expr.eval(frame_globals, frame_locals)
-        scope_str = watch_expr.scope[0]
-        expression = watch_expr.expression
-        if watch_expr.method == "reference":
-            found = False
-            # locals first as that's the context the user is more likely to be
-            # interested in re: seeing renames.
-            for mapping in (frame_locals, frame_globals):
-                for k, v in mapping.items():
-                    if v is value:
-                        expression = f"{expression} ({k})"
-                        found = True
-                        break
-                if found:
-                    break
-            method_str = "*"
-        else:
-            method_str = "="
-        label = f"[{scope_str}{method_str}] {expression}"
+        label = watch_expr.label(value, frame_globals, frame_locals)
         WatchValueWalker(frame_var_info, watch_widget_list, watch_expr) \
                 .walk_value(None, label, value)