CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-08 01:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2139 from rachel-fenichel/bugfix/2107

Browse Source 
Bugfix/2107
This commit is contained in:
Rachel Fenichel
2018-11-27 13:57:10 -08:00
committed by GitHub
parent 76538e67e7 9ed9dd2f08
commit 6169a6488f
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/variables.js
View File

@@ -539,7 +539,13 @@ Blockly.Variables.getVariable = function(workspace, id, opt_name, opt_type) {
if (!variable && potentialVariableMap) {
variable = potentialVariableMap.getVariableById(id);
}
} else if (opt_name) {
if (variable) {
return variable;
}
}
// If there was no ID, or there was an ID but it didn't match any variables,
// look up by name and type.
if (opt_name) {
if (opt_type == undefined) {
throw Error('Tried to look up a variable by name without a type');
}

53
tests/jsunit/variables_test.js
View File

@@ -97,3 +97,56 @@ var test_allUsedVarModels_allUnused = buildVariablesTest(
0, result.length);
}
);
var test_getVariable_byId = buildVariablesTest(
function(workspace) {
var var_1 = workspace.createVariable('name1', 'type1', 'id1');
var var_2 = workspace.createVariable('name2', 'type1', 'id2');
var var_3 = workspace.createVariable('name3', 'type2', 'id3');
var result_1 = Blockly.Variables.getVariable(workspace, 'id1');
var result_2 = Blockly.Variables.getVariable(workspace, 'id2');
var result_3 = Blockly.Variables.getVariable(workspace, 'id3');
assertEquals(var_1, result_1);
assertEquals(var_2, result_2);
assertEquals(var_3, result_3);
}
);
var test_getVariable_byNameAndType = buildVariablesTest(
function(workspace) {
var var_1 = workspace.createVariable('name1', 'type1', 'id1');
var var_2 = workspace.createVariable('name2', 'type1', 'id2');
var var_3 = workspace.createVariable('name3', 'type2', 'id3');
var result_1 =
Blockly.Variables.getVariable(workspace, null, 'name1', 'type1');
var result_2 =
Blockly.Variables.getVariable(workspace, null, 'name2', 'type1');
var result_3 =
Blockly.Variables.getVariable(workspace, null, 'name3', 'type2');
// Searching by name + type is correct.
assertEquals(var_1, result_1);
assertEquals(var_2, result_2);
assertEquals(var_3, result_3);
}
);
var test_getVariable_byIdThenName = buildVariablesTest(
function(workspace) {
var var_1 = workspace.createVariable('name1', 'type1', 'id1');
var var_2 = workspace.createVariable('name2', 'type1', 'id2');
var var_3 = workspace.createVariable('name3', 'type2', 'id3');
var result_1 =
Blockly.Variables.getVariable(workspace, 'badId', 'name1', 'type1');
var result_2 =
Blockly.Variables.getVariable(workspace, 'badId', 'name2', 'type1');
var result_3 =
Blockly.Variables.getVariable(workspace, 'badId', 'name3', 'type2');
// Searching by ID failed, but falling back onto name + type is correct.
assertEquals(var_1, result_1);
assertEquals(var_2, result_2);
assertEquals(var_3, result_3);
}
);