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

8195675: Call to insertText with single character from custom Input Method ignored #17921

Closed
wants to merge 3 commits into from

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Feb 20, 2024


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8195675: Call to insertText with single character from custom Input Method ignored (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17921/head:pull/17921
$ git checkout pull/17921

Update a local copy of the PR:
$ git checkout pull/17921
$ git pull https://git.openjdk.org/jdk.git pull/17921/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17921

View PR using the GUI difftool:
$ git pr show -t 17921

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17921.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 20, 2024

👋 Welcome back srl! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Feb 20, 2024

@srl295 The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Feb 20, 2024
- externalize "keyman"
@srl295 srl295 changed the title 8195675: [MacOS] fix Keyman input methods on mac JDK-8195675: Call to insertText with single character from custom Input Method ignored Feb 27, 2024
@srl295 srl295 changed the title JDK-8195675: Call to insertText with single character from custom Input Method ignored 8195675: Call to insertText with single character from custom Input Method ignored Feb 27, 2024
@srl295 srl295 marked this pull request as ready for review March 1, 2024 06:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 1, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 1, 2024

Webrevs

@@ -965,7 +968,7 @@ - (void) insertText:(id)aString replacementRange:(NSRange)replacementRange

if ((utf16Length > 2) ||
((utf8Length > 1) && [self isCodePointInUnicodeBlockNeedingIMEvent:codePoint]) ||
((codePoint == 0x5c) && ([(NSString *)kbdLayout containsString:@"Kotoeri"]))) {
[(NSString *)kbdLayout containsString:@KEYMAN_LAYOUT]) {
#ifdef IM_DEBUG
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As noted in JBS Kotoeri is obsolete, which is why the reference to it here should be removed as part of this change.

@openjdk
Copy link

openjdk bot commented Mar 4, 2024

@srl295 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8195675: Call to insertText with single character from custom Input Method ignored

Reviewed-by: prr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 4, 2024
@srl295
Copy link
Member Author

srl295 commented Mar 19, 2024

I'm able to build this again, but not satisfied that it solves the issue, so I am still investigating.
Should I rebase this upon latest master or somewhere else (now that 22 is released)? @prrace

@prrace
Copy link
Contributor

prrace commented Mar 20, 2024

I'm able to build this again, but not satisfied that it solves the issue, so I am still investigating. Should I rebase this upon latest master or somewhere else (now that 22 is released)? @prrace

@srl295
You are based on main-line, which is now 23, so there should be nothing to do.
If you feel you are out of date in some important way you can re-base but the release change would have nothing to do with that.

@srl295
Copy link
Member Author

srl295 commented Mar 20, 2024

Great. I'll keep investigating

@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2024

@srl295 This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@srl295
Copy link
Member Author

srl295 commented May 8, 2024

Just got my Mac setup again today - will commence testing

@srl295
Copy link
Member Author

srl295 commented May 8, 2024

@prrace i want to verify it fixes the issue.

@srl295
Copy link
Member Author

srl295 commented May 24, 2024

Great news, this fixes the issue!!

image

Merged with master so it should be a clean PR merge.

Confirmed that the issue is still present with v22.0.1

@srl295
Copy link
Member Author

srl295 commented May 24, 2024

@prrace @naotoj recommend merging this once it passes appropriate tests.

@srl295
Copy link
Member Author

srl295 commented May 25, 2024

@prrace any hope of backporting this? I can do it if you point me at the steps

Copy link
Contributor

@prrace prrace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srl295
You just need to add a comment saying
/integrate
I can't do that for you.

Since you are a JDK committer, it will then be pushed

@openjdk
Copy link

openjdk bot commented May 25, 2024

@prrace Only the author (@srl295) is allowed to issue the integrate command.

@prrace
Copy link
Contributor

prrace commented May 25, 2024

@prrace any hope of backporting this? I can do it if you point me at the steps

@SRL - that's not my call. The update release maintainers are in charge

The general process is https://openjdk.org/projects/jdk-updates/approval.html
and the list of update releases and any specific policies they may have are here
https://openjdk.org/projects/jdk-updates/

But yes, you should be able to do it. The census indicate you have the needed status.

@srl295
Copy link
Member Author

srl295 commented May 26, 2024

@srl295 You just need to add a comment saying /integrate I can't do that for you.

Since you are a JDK committer, it will then be pushed

Thanks. I think I might not try it on the weekend before a US holiday :) But i'll do it Tuesday

@srl295
Copy link
Member Author

srl295 commented May 28, 2024

/integrate

@openjdk
Copy link

openjdk bot commented May 28, 2024

Going to push as commit b8f2ec9.
Since your change was applied there have been 35 commits pushed to the master branch:

  • 0f3e2cc: 8331670: Deprecate the Memory-Access Methods in sun.misc.Unsafe for Removal
  • 51ae08f: 8333093: Incorrect comment in zAddress_aarch64.cpp
  • 4754f05: 8333035: Parallel: Remove ParMarkBitMap::IterationStatus
  • 87a06b6: 8325805: Compiler Implementation for Flexible Constructor Bodies (Second Preview)
  • e708d13: 8332064: Implementation of Structured Concurrency (Third Preview)
  • 7b52d0a: 8332265: RISC-V: Materialize pointers faster by using a temp register
  • aa4c83a: 8332505: JEP 457: ClassRemapper forgets to remap bootstrap method references
  • cabe337: 8331921: Hotspot assembler files should use common logic to setup exported functions
  • 2edb6d9: 8330386: Replace Opaque4Node of Initialized Assertion Predicate with new OpaqueInitializedAssertionPredicateNode
  • 1850914: 8332864: Parallel: Merge ParMarkBitMapClosure into MoveAndUpdateClosure
  • ... and 25 more: https://git.openjdk.org/jdk/compare/7bf1989f59695c3d08b4bd116fb4c022cf9661f4...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 28, 2024
@openjdk openjdk bot closed this May 28, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 28, 2024
@openjdk
Copy link

openjdk bot commented May 28, 2024

@srl295 Pushed as commit b8f2ec9.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@srl295
Copy link
Member Author

srl295 commented Oct 14, 2024

@prrace hi- opened a backport as openjdk/jdk21u-dev#1052 with a backport JBS

@srl295
Copy link
Member Author

srl295 commented Oct 14, 2024

/backport 17u

@openjdk
Copy link

openjdk bot commented Oct 14, 2024

@srl295 The target repository 17u is not a valid target for backports.
List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk21u, openjdk/jdk21u-dev, openjdk/jdk23u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/jfx, openjdk/jfx17u, openjdk/jfx21u, openjdk/jfx23u, openjdk/lilliput-jdk17u, openjdk/lilliput-jdk21u, openjdk/shenandoah-jdk21u, openjdk/shenandoah-jdk8u.
Supplying the organization/group prefix is optional.

@srl295
Copy link
Member Author

srl295 commented Oct 14, 2024

/backport openjdk/jdk17u

@srl295
Copy link
Member Author

srl295 commented Oct 14, 2024

/backport openjdk/jdk11u-dev
/backport openjdk/jdk8u-dev

@openjdk
Copy link

openjdk bot commented Oct 14, 2024

@srl295 Could not automatically backport b8f2ec90 to openjdk/jdk17u due to conflicts in the following files:

  • src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-srl295-b8f2ec90-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd

# Backport the commit
$ git cherry-pick --no-commit b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u with the title Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b8f2ec90 from the openjdk/jdk repository.

The commit being backported was authored by Steven Loomis on 28 May 2024 and was reviewed by Phil Race.

Thanks!

@openjdk
Copy link

openjdk bot commented Oct 14, 2024

@srl295 Could not automatically backport b8f2ec90 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-srl295-b8f2ec90-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd

# Backport the commit
$ git cherry-pick --no-commit b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b8f2ec90 from the openjdk/jdk repository.

The commit being backported was authored by Steven Loomis on 28 May 2024 and was reviewed by Phil Race.

Thanks!

@openjdk
Copy link

openjdk bot commented Oct 14, 2024

@srl295 Could not automatically backport b8f2ec90 to openjdk/jdk8u-dev due to conflicts in the following files:

  • src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk8u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk8u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-srl295-b8f2ec90-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd

# Backport the commit
$ git cherry-pick --no-commit b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk8u-dev with the title Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b8f2ec90 from the openjdk/jdk repository.

The commit being backported was authored by Steven Loomis on 28 May 2024 and was reviewed by Phil Race.

Thanks!

@srl295
Copy link
Member Author

srl295 commented Nov 7, 2024

@prrace the backports seem to be progressing well.. there's a report that it's not working with JavaFX, though. I'm not familiar with JFX enough to know about this. Do you think there's either a special backport needed, or could there be a parallel fix in JFX that's needed?

@AndyBlack created https://github.com/AndyBlack/KeymanFX and https://github.com/AndyBlack/KeymanSwing as test cases. It seems that on the JFX side it's using
javafx.scene.control.TextField - should that be affected (that is, fixed) by this fix to AWTView or would JFX be perhaps similar parallel code needing a parallel fix?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants