Merge pull request #1561 from robotframework/issue-1545-fix-var-name-validation

Fix variable name validation and editing

Author: yanne

src/robotide/controller/settingcontrollers.py

@@ -420,7 +420,7 @@ def notify_variable_added(self):
         self.parent.notify_variable_added(self)
 
     def validate_name(self, new_name):
-        if utils.is_scalar_variable(self.name):
+        if variablematcher.is_scalar_variable(self.name):
             return self.parent.validate_scalar_variable_name(new_name, self)
         return self.parent.validate_list_variable_name(new_name, self)
 

src/robotide/editor/settingeditors.py

@@ -415,12 +415,13 @@ def _open_variable_dialog(self, message):
             self._open_var_dialog(message.controller)
 
     def _open_var_dialog(self, var):
-        if var.name.startswith('${'):
+        var_name = var.name.lower()
+        if var_name.startswith('${'):
             dlg = ScalarVariableDialog(self._controller, item=var)
-        elif var.name.startswith('@{'):
+        elif var_name.startswith('@{'):
             dlg = ListVariableDialog(self._controller, item=var,
                                      plugin=self.Parent.plugin)
-        elif var.name.startswith('&{'):
+        elif var_name.startswith('&{'):
             dlg = DictionaryVariableDialog(self._controller, item=var,
                                            plugin=self.Parent.plugin)
         if dlg.ShowModal() == wx.ID_OK: