From 662549cedb26a70706021aeb4c456244e595bb43 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 23 Dec 2020 15:01:41 +0100
Subject: [PATCH] fix issue with source location

---
 .../src/solidity-decoder/internalCallTree.ts  | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/libs/remix-debug/src/solidity-decoder/internalCallTree.ts b/libs/remix-debug/src/solidity-decoder/internalCallTree.ts
index b9665ff39a..b2a528d96e 100644
--- a/libs/remix-debug/src/solidity-decoder/internalCallTree.ts
+++ b/libs/remix-debug/src/solidity-decoder/internalCallTree.ts
@@ -249,32 +249,36 @@ async function includeVariableDeclaration (tree, step, sourceLocation, scopeId,
   const contractObj = await tree.solidityProxy.contractObjectAt(step)
   let states = null
   const generatedSources = getGeneratedSources(tree, scopeId, contractObj)
-
-  const variableDeclaration = resolveVariableDeclaration(tree, sourceLocation, generatedSources)
+  const variableDeclarations = resolveVariableDeclaration(tree, sourceLocation, generatedSources)
   // using the vm trace step, the current source location and the ast,
   // we check if the current vm trace step target a new ast node of type VariableDeclaration
   // that way we know that there is a new local variable from here.
-  if (variableDeclaration && !tree.scopes[scopeId].locals[variableDeclaration.name]) {
-    try {
-      const stack = tree.traceManager.getStackAt(step)
-      // the stack length at this point is where the value of the new local variable will be stored.
-      // so, either this is the direct value, or the offset in memory. That depends on the type.
-      if (variableDeclaration.name !== '') {
-        states = tree.solidityProxy.extractStatesDefinitions()
-        var location = extractLocationFromAstVariable(variableDeclaration)
-        location = location === 'default' ? 'storage' : location
-        // we push the new local variable in our tree
-        tree.scopes[scopeId].locals[variableDeclaration.name] = {
-          name: variableDeclaration.name,
-          type: parseType(variableDeclaration.typeDescriptions.typeString, states, contractObj.name, location),
-          stackDepth: stack.length,
-          sourceLocation: sourceLocation
+  if (variableDeclarations && variableDeclarations.length) {
+    for (const variableDeclaration of variableDeclarations) {
+      if (variableDeclaration && !tree.scopes[scopeId].locals[variableDeclaration.name]) {
+        try {
+          const stack = tree.traceManager.getStackAt(step)
+          // the stack length at this point is where the value of the new local variable will be stored.
+          // so, either this is the direct value, or the offset in memory. That depends on the type.
+          if (variableDeclaration.name !== '') {
+            states = tree.solidityProxy.extractStatesDefinitions()
+            var location = extractLocationFromAstVariable(variableDeclaration)
+            location = location === 'default' ? 'storage' : location
+            // we push the new local variable in our tree
+            tree.scopes[scopeId].locals[variableDeclaration.name] = {
+              name: variableDeclaration.name,
+              type: parseType(variableDeclaration.typeDescriptions.typeString, states, contractObj.name, location),
+              stackDepth: stack.length,
+              sourceLocation: sourceLocation
+            }
+          }
+        } catch (error) {
+          console.log(error)
         }
       }
-    } catch (error) {
-      console.log(error)
     }
   }
+  
   // we check here if we are at the beginning inside a new function.
   // if that is the case, we have to add to locals tree the inputs and output params
   const functionDefinition = resolveFunctionDefinition(tree, previousSourceLocation, generatedSources)
@@ -351,7 +355,10 @@ function extractVariableDeclarations (ast, astWalker) {
   const ret = {}
   astWalker.walkFull(ast, (node) => {
     if (node.nodeType === 'VariableDeclaration' || node.nodeType === 'YulVariableDeclaration') {
-      ret[node.src] = node
+      ret[node.src] = [node]
+    }
+    if (node.nodeType === 'VariableDeclarationStatement' || node.nodeType === 'YulVariableDeclarationStatement') {
+      ret[node.initialValue.src] = node.declarations       
     }
   })
   return ret