mirror
/
turtlestitch
kopia lustrzana https://github.com/backface/turtlestitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Custom block templates also visited, both options available from context menu

pull/29/head
bromagosa 2017-01-03 11:35:36 +01:00
rodzic c462786a9a
commit 7623cc9f4a
2 zmienionych plików z 71 dodań i 50 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

109
blocks.js
Wyświetl plik

@ -2394,10 +2394,9 @@ BlockMorph.prototype.userMenu = function () {
'refactorThisVar'
);
}
return menu;
}
menu.addLine();
} else {
menu.addLine();
}
if (this.selector === 'reportGetVar') {
blck = this.fullCopy();
@ -2405,19 +2404,26 @@ BlockMorph.prototype.userMenu = function () {
menu.addItem(
'rename just here...',
function () {
new DialogBoxMorph(
myself,
myself.userSetSpec,
myself
).prompt(
"Variable name",
myself.blockSpec,
world,
blck.fullImage(), // pic
InputSlotMorph.prototype.getVarNamesDict.call(myself)
);
if (this.isTemplate) {
myself.refactorThisVar(true); // just the template
} else {
new DialogBoxMorph(
myself,
myself.userSetSpec,
myself
).prompt(
"Variable name",
myself.blockSpec,
world,
blck.fullImage(), // pic
InputSlotMorph.prototype.getVarNamesDict.call(myself)
);
}
}
);
if (this.isTemplate) {
return menu;
}
} else if (SpriteMorph.prototype.blockAlternatives[this.selector]) {
menu.addItem(
'relabel...',
@ -3064,14 +3070,15 @@ BlockMorph.prototype.codeMappingHeader = function () {
// Variable refactoring
BlockMorph.prototype.refactorThisVar = function () {
// Rename all occurrences of the variable this block is holding, taking care of its
// lexical scope
BlockMorph.prototype.refactorThisVar = function (justTheTemplate) {
// Rename all occurrences of the variable this block is holding,
// taking care of its lexical scope
var oldName = this.blockSpec,
var myself = this,
oldName = this.blockSpec,
receiver = this.receiver(),
ide = this.parentThatIsA(IDE_Morph),
stage = receiver.parentThatIsA(StageMorph),
stage = ide.stage,
oldWatcher = receiver.findVariableWatcher(oldName),
oldValue, newWatcher;
@ -3082,6 +3089,10 @@ BlockMorph.prototype.refactorThisVar = function () {
if (this.parent instanceof SyntaxElementMorph) {
// script var
if (justTheTemplate) {
myself.userSetSpec(newName);
return;
}
definer = this.parentThatIsA(CommandBlockMorph);
if (definer.definesScriptVariable(newName)) {
varExistsError();
@ -3098,10 +3109,22 @@ BlockMorph.prototype.refactorThisVar = function () {
varExistsError('as a global variable');
return;
} else {
receiver.refactorVariableInstances(oldName, newName, false);
receiver.customBlocks.forEach(function (eachBlock) {
eachBlock.definition.body.expression.refactorVarInStack(oldName, newName);
});
oldValue = receiver.variables.getVar(oldName);
receiver.deleteVariable(oldName);
receiver.addVariable(newName, false);
receiver.variables.setVar(newName, oldValue);
if (oldWatcher && oldWatcher.isVisible) {
newWatcher = receiver.toggleVariableWatcher(newName, false);
newWatcher.setPosition(oldWatcher.position());
}
if (!justTheTemplate) {
receiver.refactorVariableInstances(oldName, newName, false);
receiver.customBlocks.forEach(function (eachBlock) {
eachBlock.body.expression.refactorVarInStack(oldName, newName);
});
}
}
} else {
// global var
@ -3112,31 +3135,41 @@ BlockMorph.prototype.refactorThisVar = function () {
detect(
stage.children,
function (any) {
return any.hasSpriteVariable(newName);
return any instanceof SpriteMorph &&
any.hasSpriteVariable(newName);
})
) {
varExistsError('as a sprite local variable');
return;
} else {
oldValue = ide.globalVariables.vars[oldName];
oldValue = ide.globalVariables.getVar(oldName);
stage.deleteVariable(oldName);
stage.addVariable(newName, true);
ide.globalVariables.vars[newName] = oldValue;
ide.globalVariables.setVar(newName, oldValue);
stage.refactorVariableInstances(oldName, newName, true);
stage.forAllChildren(function (child) {
if (child instanceof SpriteMorph) {
child.refactorVariableInstances(oldName, newName, true);
}
});
if (oldWatcher && oldWatcher.isVisible) {
newWatcher = receiver.toggleVariableWatcher(newName, true);
newWatcher.setPosition(oldWatcher.position());
}
if (!justTheTemplate) {
stage.refactorVariableInstances(oldName, newName, true);
stage.globalBlocks.forEach(function (eachBlock) {
eachBlock.body.expression.refactorVarInStack(oldName, newName);
});
stage.forAllChildren(function (child) {
if (child instanceof SpriteMorph) {
child.refactorVariableInstances(oldName, newName, true);
child.customBlocks.forEach(function (eachBlock) {
eachBlock.body.expression.refactorVarInStack(oldName, newName);
});
}
});
}
}
}
if (oldWatcher && oldWatcher.isVisible) {
newWatcher = stage.toggleVariableWatcher(newName, true);
newWatcher.setPosition(oldWatcher.position());
}
ide.flushBlocksCache('variables');
ide.refreshPalette();
},

12
objects.js
Wyświetl plik

@ -4821,22 +4821,10 @@ SpriteMorph.prototype.hasSpriteVariable = function (varName) {
// Variable refactoring
SpriteMorph.prototype.refactorVariableInstances = function (oldName, newName, isGlobal) {
var oldValue;
if (isGlobal && this.hasSpriteVariable(oldName)) {
return;
}
if (!isGlobal) {
oldValue = this.variables.vars[oldName];
this.deleteVariable(oldName);
this.addVariable(newName, false);
this.variables.vars[newName] = oldValue;
this.blocksCache['variables'] = null;
this.paletteCache['variables'] = null;
this.parentThatIsA(IDE_Morph).refreshPalette();
}
this.scripts.children.forEach(function (child) {
if (child instanceof BlockMorph) {
child.refactorVarInStack(oldName, newName);