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

fix: undoing and redoing parameter events (#6721)

Browse Source 
* fix: undoing and redoing parameters creating dupe parameters

* chore: add tests for undoing and redoing adding parameters

* fix: undoing and redoing renaming parameters

* chore: change tests to tick clock

* chore: format

* chore: add tests for deleting procedure parameters

* chore: fix tests

* chore: unskip tests

* chore: fix return type of saveExtraState

* chore: increase mocha timeout
This commit is contained in:
Beka Westberg
2023-01-06 23:32:04 +00:00
committed by GitHub
parent e1995ae3b0
commit 23fb76b9f2
6 changed files with 316 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
blocks/procedures.js
View File

@@ -528,11 +528,13 @@ const procedureDefMutator = {
if (opt_paramIds) {
container.setAttribute('name', this.getFieldValue('NAME'));
}
for (let i = 0; i < this.argumentVarModels_.length; i++) {
const params = this.getProcedureModel().getParameters();
for (let i = 0; i < params.length; i++) {
const parameter = xmlUtils.createElement('arg');
const argModel = this.argumentVarModels_[i];
parameter.setAttribute('name', argModel.name);
parameter.setAttribute('varid', argModel.getId());
const varModel = params[i].getVariableModel();
parameter.setAttribute('name', varModel.name);
parameter.setAttribute('varid', varModel.getId());
if (opt_paramIds && this.paramIds_) {
parameter.setAttribute('paramId', this.paramIds_[i]);
}
@@ -556,10 +558,10 @@ const procedureDefMutator = {
for (let i = 0; i < xmlElement.childNodes.length; i++) {
const node = xmlElement.childNodes[i];
if (node.nodeName.toLowerCase() !== 'arg') continue;
const varId = node.getAttribute('varid');
this.getProcedureModel().insertParameter(
new ObservableParameterModel(
this.workspace, node.getAttribute('name'),
node.getAttribute('varid')),
this.workspace, node.getAttribute('name'), undefined, varId),
i);
}
@@ -596,20 +598,20 @@ const procedureDefMutator = {
* parameters and statements.
*/
saveExtraState: function() {
if (!this.argumentVarModels_.length && this.hasStatements_) {
return null;
}
const params = this.getProcedureModel().getParameters();
if (!params.length && this.hasStatements_) return null;
const state = Object.create(null);
if (this.argumentVarModels_.length) {
state['params'] = [];
for (let i = 0; i < this.argumentVarModels_.length; i++) {
state['params'].push({
// We don't need to serialize the name, but just in case we decide
// to separate params from variables.
'name': this.argumentVarModels_[i].name,
'id': this.argumentVarModels_[i].getId(),
});
}
if (params.length) {
state['params'] = params.map((p) => {
return {
'name': p.getName(),
'id': p.getVariableModel().getId(),
// Ideally this would be id, and the other would be varId,
// but backwards compatibility :/
'paramId': p.getId(),
};
});
}
if (!this.hasStatements_) {
state['hasStatements'] = false;
@@ -625,10 +627,9 @@ const procedureDefMutator = {
loadExtraState: function(state) {
if (state['params']) {
for (let i = 0; i < state['params'].length; i++) {
const param = state['params'][i];
const {name, id, paramId} = state['params'][i];
this.getProcedureModel().insertParameter(
new ObservableParameterModel(this.workspace, param.name, param.id),
i);
new ObservableParameterModel(this.workspace, name, paramId, id), i);
}
}
@@ -719,7 +720,7 @@ const procedureDefMutator = {
Procedures.mutateCallers(this);
const model = this.getProcedureModel();
const count = this.getProcedureModel().getParameters().length;
const count = model.getParameters().length;
for (let i = count - 1; i >= 0; i--) {
model.deleteParameter(i);
}
@@ -935,6 +936,7 @@ const validateProcedureParamMixin = {
this.createdVariables_.push(model);
}
}
return varName;
},
@@ -1210,6 +1212,10 @@ const procedureCallerUpdateShapeMixin = {
this.updateName_();
this.updateEnabled_();
this.updateParameters_();
// Temporarily maintained for code that relies on arguments_
this.arguments_ =
this.getProcedureModel().getParameters().map((p) => p.getName());
},
/**