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

fix: Don't clober event group when renaming vars (#6829)

Browse Source 
* fix: Don't clober event group when renaming vars

Also audit all existing event group commands and tweak a few of them where I think there's a potential issue.
This commit is contained in:
Neil Fraser
2023-03-17 20:09:51 +01:00
committed by GitHub
parent a0b4a214a9
commit 6f64d1801a
10 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/connection.ts
View File

@@ -223,8 +223,8 @@ export class Connection implements IASTNodeLocationWithBlock {
const checker = this.getConnectionChecker();
if (checker.canConnect(this, otherConnection, false)) {
const eventGroup = eventUtils.getGroup();
if (!eventGroup) {
const existingGroup = eventUtils.getGroup();
if (!existingGroup) {
eventUtils.setGroup(true);
}
// Determine which block is superior (higher in the source stack).
@@ -235,9 +235,7 @@ export class Connection implements IASTNodeLocationWithBlock {
// Inferior block.
otherConnection.connect_(this);
}
if (!eventGroup) {
eventUtils.setGroup(false);
}
eventUtils.setGroup(existingGroup);
}
return this.isConnected();
@@ -265,8 +263,10 @@ export class Connection implements IASTNodeLocationWithBlock {
throw Error('Source connection not connected.');
}
const eventGroup = eventUtils.getGroup();
if (!eventGroup) eventUtils.setGroup(true);
const existingGroup = eventUtils.getGroup();
if (!existingGroup) {
eventUtils.setGroup(true);
}
let event;
if (eventUtils.isEnabled()) {
@@ -289,7 +289,7 @@ export class Connection implements IASTNodeLocationWithBlock {
parentConnection.respawnShadow_();
}
if (!eventGroup) eventUtils.setGroup(false);
eventUtils.setGroup(existingGroup);
}
/**