Skip to content
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

Adjust IME action buffering to only apply to insert actions #12702

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

mikayla-maki
Copy link
Contributor

Follow up to #12678
fixes #11829

In this solution, we only buffer Insert Text actions from the macOS IME. The marked text and unmark actions are eagerly processed, so that the IME state is synchronized with the editor state during multi step pre-edit composition.

Release Notes:

  • Fixed an issue where the IME pre-edit could desynchronize from the editor on macOS (#11829).

Add documentation for more IME edge cases

co-authored-by: Conrad <conrad@zed.dev>
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jun 5, 2024
@mikayla-maki mikayla-maki marked this pull request as ready for review June 5, 2024 21:46
@mikayla-maki mikayla-maki merged commit d3d0d01 into main Jun 5, 2024
8 checks passed
@mikayla-maki mikayla-maki deleted the fix-ime-pre-edit-2 branch June 5, 2024 23:13
@d1y
Copy link
Contributor

d1y commented Jun 12, 2024

Ooopppps, @mikayla-maki After my testing
The #12862 was resolved when I deleted this commit
Can you help me fix it?

Screen.Recording.2024-06-13.at.07.17.16.mov

@suxiaoshao
Copy link

suxiaoshao commented Jun 13, 2024

@mikayla-maki After this commit, the value of ime in KeyDownEvent within gpui's on_key_down has always been None. Does this meet your expectations? If so, what should I do to revert it back to being able to obtain ime as before?

@mikayla-maki
Copy link
Contributor Author

@suxiaoshao That was a bug, it has been fixed!

mikayla-maki added a commit that referenced this pull request Jun 20, 2024
This fixes a bug introduced by
#12702, where GPUI would only
generate the correct key events if you had an input handler set.

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

IME pre-edit is unusable on macOS
4 participants