fix: restrict kana input-source lookup to keyboard category#116
Merged
Conversation
v2.4.7 selected any enabled input source with language "ja", which could match the palette-category Kana Palette and open a floating palette window instead of switching the IME. Restrict the TIS lookup to keyboard input sources, require select-capable, and match the Hiragana input mode by its mode ID (the input source ID carries an IME-specific prefix, so the previous exact-ID match never hit).
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
1 participant
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.
Problem (v2.4.7 regression)
The kana switch picked any enabled input source with language "ja". On machines with the 50-on Kana Palette enabled, this selected the palette-category source — opening a floating kana palette window instead of switching to Hiragana.
The intended Hiragana preference also never matched: it compared the input source ID against
com.apple.inputmethod.Japanese, but that value is the input mode ID (the source ID carries an IME-specific prefix, e.g.…Kotoeri.RomajiTyping.Japanese).Fix
TISCreateInputSourceListtokTISCategoryKeyboardInputSourceand requirekTISPropertyInputSourceIsSelectCapable.kTISPropertyInputModeID == "com.apple.inputmethod.Japanese".Verification
testJapaneseInputSource_NeverPicksPaletteasserts the picked source is keyboard-category and the Hiragana mode; passes (not skipped) on a machine with Japanese IME + palettes enabled — reproduced environment of the report.swift buildclean, 34/34 tests pass, swiftlint 0 errors (violations back to the pre-existing 8).Version 2.4.8 (auto-release on merge → Sparkle update).