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

PR: Prevent Chinese input method to block edit input area #23316

Merged
merged 2 commits into from
Dec 19, 2024

Conversation

ccordoba12
Copy link
Member

Description of Changes

  • This fix was suggested by a user in The Chinese input method blocks the input content. #23313 but only for the editor. I decided to apply to BaseEditMixin so it also takes effect in the IPython console and other areas where users can edit text.
  • Fix some block comments so they appear better in the Outline pane.

Issue(s) Resolved

Fixes #23313

Affirmation

By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.

I certify the above statement is true and correct:

@ccordoba12 ccordoba12 added this to the v6.0.4 milestone Dec 19, 2024
@ccordoba12 ccordoba12 self-assigned this Dec 19, 2024
@ccordoba12 ccordoba12 changed the title PR: Prevent Chinese input method to block edit input content PR: Prevent Chinese input method to block edit input area Dec 19, 2024
@ccordoba12 ccordoba12 merged commit 3f64ee3 into spyder-ide:master Dec 19, 2024
17 checks passed
@ccordoba12 ccordoba12 deleted the issue-23313 branch December 19, 2024 23:29
@ccordoba12
Copy link
Member Author

@meeseeksdev please backport to 6.x

Copy link

lumberbot-app bot commented Dec 19, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 6.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 3f64ee3c2fb7c4ae9af4b9969b66de64d0c3ffe2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #23316: PR: Prevent Chinese input method to block edit input area'
  1. Push to a named branch:
git push YOURFORK 6.x:auto-backport-of-pr-23316-on-6.x
  1. Create a PR against branch 6.x, I would have named this PR:

"Backport PR #23316 on branch 6.x (PR: Prevent Chinese input method to block edit input area)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The Chinese input method blocks the input content.
1 participant