-
Notifications
You must be signed in to change notification settings - Fork 1k
Prevent composer crash from Slate node-key errors (MAILSPRING-CLIENT-2X) #2795
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.
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
Open
bengotow
wants to merge
1
commit into
master
Choose a base branch
from
claude/awesome-ritchie-8ql4q9
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+31
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Latent:
tmp.normalizestuck atfalseafter this catch fires.Both
unwrapBlockAtRange(slate.js:7161) andinsertFragmentAtRange(slate.js:6721) do their moves insideeditor.withoutNormalizing(fn), and that helper (slate.js:11515) is not exception-safe:Once
fnthrows,this.tmp.normalizestaysfalsefor the lifetime of the Editor.normalizeDirtyPaths(slate.js:11697) is a no-op whentmp.normalize === false, so every subsequent command in this composer session runs without schema normalization. Dirty paths accumulate and the document can drift into invalid shapes thatComposerEditor.onChange'sgetDocumentBrokenReasonrecovery won't catch (only the most severe shapes are repaired).The same applies to the sibling catch in
composer-editor.tsxaroundeditor.insertFragment. A pragmatic mitigation in both catches:try { editor.tmp.normalize = true; } catch {}(or reset via the controller) before returning, so at least the next command re-enables normalization. Scope is bounded to the current composer session — closing/reopening the draft rebuilds the Editor and clears the flag — but a user who hits this once will keep editing in a non-normalizing editor until then.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, thank you — confirmed against the actual vendored bundle and fixed in 6de5899.
One correction to the suggested mitigation:
editor.tmp.normalize = trueon its own wouldn't have worked here. Theeditorobject these catch blocks receive is slate-react's<Editor>React component, not the core Slate editor — it has its own unrelatedtmp(React-internal bookkeeping:resolves/mounted/updates/change/isUpdatingSelection, see slate-react.js ~5212), while the realtmp.normalize/tmp.dirtyflags live oneditor.controller(the coreslate.Editorinstance the component forwards commands to, per the "Mimic the API of the Editor controller" comment at slate-react.js:5238). So the fix reaches througheditor.controller.tmp.normalizeinstead, and also calls.controller.normalize()to force an immediate re-normalization pass rather than just waiting for the next incidental command.That second part turned out to matter for another reason you also flagged in the PR summary: Slate schedules its flush-to-
onChangeon a microtask queued by the first successful operation in a batch (slate.js:11179-11184), so a partial mutation from an interrupted command does reachComposerEditor.onChange— my original commit message was wrong to claim otherwise. Calling.normalize()synchronously in the catch, before that pending microtask fires, cleans up the partial mutation so what actually reachesonChangeis normalized rather than raw. Extracted both fixes into a sharedrecoverFromInterruptedSlateCommandhelper used by both catch sites.Generated by Claude Code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, thank you — confirmed against the actual vendored bundle and fixed in 6de5899.
One correction to the suggested mitigation:
editor.tmp.normalize = trueon its own wouldn't have worked here. Theeditorobject these catch blocks receive is slate-react's<Editor>React component, not the core Slate editor — it has its own unrelatedtmp(React-internal bookkeeping:resolves/mounted/updates/change/isUpdatingSelection, see slate-react.js ~5212), while the realtmp.normalize/tmp.dirtyflags live oneditor.controller(the coreslate.Editorinstance the component forwards commands to, per the "Mimic the API of the Editor controller" comment at slate-react.js:5238). So the fix reaches througheditor.controller.tmp.normalizeinstead, and also calls.controller.normalize()to force an immediate re-normalization pass rather than just waiting for the next incidental command.That second part turned out to matter for another reason you also flagged in the PR summary: Slate schedules its flush-to-
onChangeon a microtask queued by the first successful operation in a batch (slate.js:11179-11184), so a partial mutation from an interrupted command does reachComposerEditor.onChange— my original commit message was wrong to claim otherwise. Calling.normalize()synchronously in the catch, before that pending microtask fires, cleans up the partial mutation so what actually reachesonChangeis normalized rather than raw. Extracted both fixes into a sharedrecoverFromInterruptedSlateCommandhelper used by both catch sites.Generated by Claude Code