Merge pull request #777 from puremourning/calculus-expand-arguments

Expand references in calculus function arguments
puremourning · Jun 27, 2023 · 02c8da8 · 02c8da8
2 parents 8d9ead4 + 5476ee2
commit 02c8da8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
@@ -672,7 +672,15 @@ def ExpandReferencesInString( orig_s,
       key = e.name + e.arg_hash
 
       if e.name in calculus:
-        mapping[ key ] = calculus[ e.name ]( *e.args )
+        # Expand any recursive mappings in the args.... eeeek
+        new_args = []
+        for arg in e.args:
+          new_args.append( ExpandReferencesInObject( arg,
+                                                     mapping,
+                                                     calculus,
+                                                     user_choices ) )
+
+        mapping[ key ] = calculus[ e.name ]( *new_args )
         _logger.debug( "Put %s into mapping for %s with args %s",
                        key,
                        e.name,

diff --git a/tests/python/Test_ExpandReferencesInDict.py b/tests/python/Test_ExpandReferencesInDict.py
@@ -134,11 +134,15 @@ def test_ParseVariables( self ):
         'in': {
           'variables_list': {
             'not_in_list': '${is_in_list( "x", [ "y", "z" ] )}',
-            'in_list': '${is_in_list( "x", [ "y", "x", "z" ] )}',
+            'in_list': '${is_in_list( "x", [ "${why}", "x", "z" ] )}',
             'not_in_listj#json': '${is_in_list( "x", [ "y", "z" ] )}',
-            'in_listj#json': '${is_in_list( "x", [ "y", "x", "z" ] )}',
+            'in_listj#json':
+              '${is_in_list( "x", [ "${why}", "x", "${zed}" ] )}',
+          },
+          'mapping': {
+            'why': 'y',
+            'zed': 'z'
           },
-          'mapping': {},
           'calculus': {
             'is_in_list':
               lambda needle, haystack: 'true' if needle in haystack else 'false'