fix(features): enable ImeMarkedText on macOS regardless of release_bundle#10547
fix(features): enable ImeMarkedText on macOS regardless of release_bundle#10547spalagu wants to merge 1 commit into
Conversation
…ndle Without this flag, `setMarkedText:` callbacks from the macOS input system are short-circuited inside the terminal view (`set_marked_text_on_terminal` returns early) and no IME preedit is ever drawn. That breaks text input for any user typing through an IME — CJK pinyin / wubi, Japanese kana / romaji, Korean hangul, dead-key Latin (French / German / Spanish / Vietnamese), macOS auto-correct candidates, emoji candidate windows, etc. Visible symptom: typing pinyin shows no Latin preedit characters in the input box; the only thing that ever appears is the final committed Chinese characters after picking a candidate. Effectively, CJK users can't type at all in OSS macOS builds. Stable / Preview macOS already get this flag via `RELEASE_FLAGS` because they build with `cfg!(feature = "release_bundle")` — so the rendering code path is well-exercised and stable. The OSS distribution simply doesn't pass that cargo feature when running `cargo bundle --bin warp-oss --features gui`, so `is_release_bundle()` returns false, `RELEASE_FLAGS` is never extended, and macOS OSS users lose IME entirely. Fix: insert `FeatureFlag::ImeMarkedText` unconditionally for macOS in `enabled_features()`, after the release-bundle gate. This matches the existing `#[cfg(target_os = "macos")]` guard in `RELEASE_FLAGS` so the behavior on Linux / Windows is unchanged (their marked-text paths are separate and gated by their own platform-specific work, e.g. warpdotdev#9602 for Linux/Wayland IME enable). ## Repro (before this patch) `cargo bundle --bin warp-oss --features gui --release`, install /Applications, launch in macOS, type pinyin into any TUI input (zsh, vim, Claude Code, etc.). Expected: Latin letters of the in-progress pinyin appear inline (often underlined). Actual: nothing appears until a Chinese candidate is committed. ## Verification `cargo check -p warp --bin warp-oss --features gui` clean. Manual repro on a re-built bundle: IME preedit now renders inline correctly. ## Notes This is functionally equivalent to passing `--features release_bundle` at build time, but scoped to just the IME rendering flag rather than also turning on `Autoupdate` / `Changelog` / `CrashReporting` / `SshRemoteServer` (which all have their own cargo-feature dependencies and may not be desired for OSS bundles).
github-actions
Bot
added
the
external-contributor
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I reviewed this pull request and requested human review from: Comment Powered by Oz |
![oz-for-oss[bot]](https://avatars.githubusercontent.com/in/3450139?s=60&v=4){kind=small}
There was a problem hiding this comment.
Overview
This PR enables FeatureFlag::ImeMarkedText for macOS builds regardless of the release_bundle feature, preserving the existing release-bundle behavior while restoring IME marked-text rendering for OSS macOS bundles.
Concerns
- No blocking correctness or security concerns found in the changed hunk.
- No single eligible bare-login reviewer could be selected from the provided stakeholder rules for
app/src/lib.rs; the only matching rule is the catch-all team owner.
Verdict
Found: 0 critical, 0 important, 0 suggestions
Approve
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
oz-for-oss
Bot
requested review from
a team and
peicodes
and removed request for
a team
|
Sorry — the source branch was accidentally deleted during a downstream cleanup, which auto-closed this PR. Branch is restored to the same head SHA |
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I reviewed this pull request and requested human review from: Comment Powered by Oz |
There was a problem hiding this comment.
Overview
This PR enables FeatureFlag::ImeMarkedText unconditionally for macOS in enabled_features(), so macOS OSS builds get the same IME marked-text rendering path that release bundles already receive through RELEASE_FLAGS.
Concerns
- No blocking correctness or security concerns found in the annotated diff.
Verdict
Found: 0 critical, 0 important, 0 suggestions
Approve
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
vkodithala
requested review from
abhishekp106
and removed request for
a team and
peicodes
|
@abhishekp106 adding you here since you have the most context re: IME! |
2 participants
Summary
Without
FeatureFlag::ImeMarkedText,setMarkedText:callbacks from the macOS input system are short-circuited inside the terminal view (set_marked_text_on_terminalearly-returns) and no IME preedit is ever drawn. That breaks text input for any user typing through an IME — CJK pinyin / wubi, Japanese kana / romaji, Korean hangul, dead-key Latin (French / German / Spanish / Vietnamese), macOS auto-correct candidates, emoji candidate windows, etc.Visible symptom: typing pinyin shows no Latin preedit characters in the input box; the only thing that appears is the final committed Chinese after picking a candidate. Effectively, CJK users can't type at all in OSS macOS builds.
Why this only affects OSS
Stable / Preview macOS get this flag via
RELEASE_FLAGSbecause they build withcfg!(feature = "release_bundle")— so the rendering code path is well-exercised and stable. The OSS distribution simply doesn't pass that cargo feature when runningcargo bundle --bin warp-oss --features gui, sois_release_bundle()returns false,RELEASE_FLAGSis never extended, and macOS OSS users lose IME entirely.Repro (before this patch)
Type pinyin into any TUI input (zsh, vim, Claude Code, etc.) inside WarpOss.
Fix
Insert
FeatureFlag::ImeMarkedTextunconditionally for macOS inenabled_features(), after the release-bundle gate. Matches the existing#[cfg(target_os = "macos")]guard inRELEASE_FLAGSso behavior on Linux / Windows is unchanged (their marked-text paths are separate and gated by their own platform-specific work, e.g. #9602 for Linux/Wayland IME enable).9 lines added, no other changes.
Verification
cargo check -p warp --bin warp-oss --features guiclean (0 errors).Notes
This is functionally equivalent to passing
--features release_bundleat build time, but scoped to just the IME rendering flag rather than also turning onAutoupdate/Changelog/CrashReporting/SshRemoteServer(each of which has its own cargo-feature dependencies and may not be desired for OSS bundles).Linux / Windows are unaffected by this change. Their respective IME paths are tracked elsewhere — Linux/Wayland enable in #9602, Windows IMM32/TSF would need a separate implementation.