From 2865610acbc15d10585ae148b8b0014172cc8cf3 Mon Sep 17 00:00:00 2001
From: Mario Pesch <mario.pesch@uni-muenster.de>
Date: Sat, 22 Oct 2022 13:52:46 +0200
Subject: [PATCH] fix getVariable

closes #192
---
 src/components/Blockly/generator/variables.js | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/Blockly/generator/variables.js b/src/components/Blockly/generator/variables.js
index e8e4dd4..def3c03 100644
--- a/src/components/Blockly/generator/variables.js
+++ b/src/components/Blockly/generator/variables.js
@@ -34,11 +34,22 @@ const setVariableFunction = function (defaultValue) {
 };
 
 const getVariableFunction = function (block) {
-  const variableName = Blockly["Arduino"].nameDB_.getName(
-    block.getFieldValue("VAR"),
-    Blockly.Variables.NAME_TYPE
-  );
-  var code = variableName;
+  var id = block.getFieldValue("VAR");
+
+  const variableName = Blockly.Variables.getVariable(
+    Blockly.getMainWorkspace(),
+    id
+  ).name;
+
+  const allVars = Blockly.getMainWorkspace()
+  .getVariableMap()
+  .getAllVariables();
+const myVar = allVars.filter((v) => v.name === variableName)[0];
+  // const variableName = Blockly["Arduino"].nameDB_.getName(
+  //   block.getFieldValue("VAR"),
+  //   Blockly.Variables.NAME_TYPE
+  // );
+  var code = myVar.name;
   return [code, Blockly["Arduino"].ORDER_ATOMIC];
 };