Skip to content

fix: Fix bug that prevented redoing adding empty block comments #9568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gonfunko merged 3 commits into from
Jan 13, 2026
Merged

fix: Fix bug that prevented redoing adding empty block comments #9568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf5e22
fix: Fix bug that prevented redoing adding empty block comments
gonfunko Jan 13, 2026
bba38c7
test: Add tests for undoing/redoing adding comments
gonfunko Jan 13, 2026
d02a8a1
test: Add tests for un/redoing adding non-empty comments
gonfunko Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/events/events_block_change.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export class BlockChange extends BlockBase {
break;
}
case 'comment':
block.setCommentText((value as string) || null);
block.setCommentText((value as string) ?? null);
break;
case 'collapsed':
block.setCollapsed(!!value);
Expand Down
45 changes: 45 additions & 0 deletions tests/mocha/comment_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,49 @@ suite('Comments', function () {
assertBubbleLocation(this.comment, 100, 100);
});
});
suite('Undo/Redo', function () {
test('Adding an empty comment can be undone', function () {
const block = this.workspace.newBlock('empty_block');
block.setCommentText('');
assert.isNotNull(block.getIcon(Blockly.icons.IconType.COMMENT));
assert.equal(block.getCommentText(), '');

this.workspace.undo(false);

assert.isUndefined(block.getIcon(Blockly.icons.IconType.COMMENT));
assert.isNull(block.getCommentText());
});

test('Adding an empty comment can be redone', function () {
const block = this.workspace.newBlock('empty_block');
block.setCommentText('');
this.workspace.undo(false);
this.workspace.undo(true);

assert.isNotNull(block.getIcon(Blockly.icons.IconType.COMMENT));
assert.equal(block.getCommentText(), '');
});

test('Adding a non-empty comment can be undone', function () {
const block = this.workspace.newBlock('empty_block');
block.setCommentText('hey there');
assert.isNotNull(block.getIcon(Blockly.icons.IconType.COMMENT));
assert.equal(block.getCommentText(), 'hey there');

this.workspace.undo(false);

assert.isUndefined(block.getIcon(Blockly.icons.IconType.COMMENT));
assert.isNull(block.getCommentText());
});

test('Adding a non-empty comment can be redone', function () {
const block = this.workspace.newBlock('empty_block');
block.setCommentText('hey there');
this.workspace.undo(false);
this.workspace.undo(true);

assert.isNotNull(block.getIcon(Blockly.icons.IconType.COMMENT));
assert.equal(block.getCommentText(), 'hey there');
});
});
});
Loading