[FIX] Make code lock more resilient - #142
Closed
samuel-olivier wants to merge 3 commits into
Closed
Conversation
…ions MessageController can be missing or already disposed. Throwing from showMessage aborted pushEditOperations and blocked typing. Co-authored-by: Cursor <cursoragent@cursor.com>
A throwing custom onError aborted pushEditOperations. Catch it so forbidden edits are still rejected without blocking the editor. Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
CGNonofr
reviewed
Sep 2, 2026
| expect(onDidChangeContent).not.toHaveBeenCalled() | ||
| }) | ||
|
|
||
| test('Missing message contribution still rejects the locked edit without failing executeEdits', () => { |
Contributor
There was a problem hiding this comment.
what are we talking about exactly? 🤔
| messageContribution?.showMessage(errorMessage, operation.range.getStartPosition()) | ||
| } catch { | ||
| // Contributions can be missing or already disposed (e.g. InstantiationService has been | ||
| // disposed). Never throw from onError: that aborts pushEditOperations and blocks typing. |
CGNonofr
reviewed
Sep 2, 2026
| try { | ||
| const messageContribution = editor.getContribution('editor.contrib.messageController') as { | ||
| showMessage(message: string, position: monaco.IPosition): void | ||
| } | null |
Contributor
There was a problem hiding this comment.
you can even import the proper type from @codingame/monaco-vscode-api/vscode/vs/editor/contrib/message/browser/messageController I guess
Contributor
There was a problem hiding this comment.
Or event do MessageController.get(editor)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Locked-code edits are rejected by returning no operations. Displaying the read-only tooltip (MessageController.showMessage) or a custom onError could throw instead — for example when editor contributions are already disposed. That exception aborted pushEditOperations, so typing failed even outside locked ranges.
This change:
Forbidden ranges stay read-only. The tooltip is skipped if it cannot be shown.