gpui: Prevent crash on macOS by adding characterIndexForPoint on GPUIView #23469
Conversation
This file contains 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
|
We require contributors to sign our Contributor License Agreement, and we don't have @LouisBrunner on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
@cla-bot check |
cla-bot
bot
added
the
cla-signed
|
The cla-bot has been summoned, and re-checked this pull request! |
maxdeviant
changed the title
mikayla-maki
requested changes
Jan 22, 2025
| @@ -1827,6 +1832,10 @@ extern "C" fn accepts_first_mouse(this: &Object, _: Sel, _: id) -> BOOL { | |||
| YES | |||
| } | |||
|
|
|||
| extern "C" fn character_index_for_point(_this: &Object, _: Sel, _position: NSPoint) -> u64 { | |||
| NSNotFound as u64 | |||
There was a problem hiding this comment.
I'm not sure if we want this solution, but not crashing is > crashing. So lets at least mark this with a TODO :)
There was a problem hiding this comment.
100% agree, I am just unsure how to do that correctly.
Not sure on the guidelines on TODOs, but I added an explanation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Partially resolves #22939
This PR adds the missing selector and makes it return
NSNotFound, meaning the cursor is not within a character bounding box. This is not completely correct but it does prevent zed from crashing and doesn't cause any further bug apart from the input method selector disappearing very quickly.A more thorough check would be to calculate if and where the user has clicked inside the editor and return the offset of the selected character. It seems like a deeper change which also requires
ViewInputHandlerto calculate Screen mouse position (x, y) to Editor (row, column) which was unclear to me.For reference, this is the input method selector:
Release Notes: