fix dummy preedit shown as ZWSP in JetBrains

Author: eagleoflqj

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
         run: ctest --test-dir build/${{ matrix.arch }} --output-on-failure
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Fcitx5-${{ matrix.arch }}${{ matrix.postfix }}
           path: |
@@ -107,7 +107,7 @@ jobs:
 
       - name: Upload meta.json
         if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: meta.json
           path: |
@@ -119,7 +119,7 @@ jobs:
 
       - name: Upload version.json
         if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: version.json
           path: |
@@ -140,7 +140,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           merge-multiple: true
 

.github/workflows/compare.yml

@@ -11,7 +11,7 @@ jobs:
         run: wget -O release.tar.bz2 https://github.com/fcitx-contrib/fcitx5-macos/releases/download/latest/Fcitx5-arm64.tar.bz2
 
       - name: Download artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           merge-multiple: true
 

macosfrontend/macosfrontend.swift

@@ -20,6 +20,10 @@ private let appsWithoutDummyPreedit: Set<String> = [
   "com.alibaba.DingTalkMac",
 ]
 
+private func isJetBrains(_ app: String) -> Bool {
+  return app == "com.google.android.studio" || app.starts(with: "com.jetbrains.")
+}
+
 private var controller: IMKInputController? = nil
 
 public func setController(_ ctrl: Any) {
@@ -77,24 +81,29 @@ public func commitAndSetPreeditSync(
   if !commit.isEmpty {
     commitString(client, commit)
   }
+  let app = client.bundleIdentifier() ?? ""
   // Without client preedit, Backspace bypasses IM in Terminal, every key is both
-  // processed by IM and passed to client in iTerm and VSCode terminal, Backspace
-  // is double-processed in Chrome address bar/VSCode editor/Bruno URL input, ArrowDown
-  // is swallowed in Spotlight, so we force a dummy client preedit here.
+  // processed by IM and passed to client in iTerm, JetBrains and VSCode terminal,
+  // Backspace is double-processed in Chrome address bar/VSCode editor/Bruno URL input,
+  // ArrowDown is swallowed in Spotlight, so we force a dummy client preedit here.
   // Some apps also need it to get accurate caret position to place candidate window.
   // This is fine even when there is selected text. In Word, not using dummy preedit to
   // replace selected text will let Esc bypass IM. When using Shift+click to select, if
   // interval is too little, IM switch happens, but dummyPreedit is false in that case.
   if preedit.isEmpty && dummyPreedit {
-    if appsWithoutDummyPreedit.contains(client.bundleIdentifier() ?? "") {
+    if appsWithoutDummyPreedit.contains(app) {
       return
     }
     let length = client.length()
     let selectedRange = client.selectedRange()
+    // We prefer ZWS to avoid text layout shift after caret, e.g. VSCode.
     // For SwiftUI TextField, there is a bug that if caret is at the end of text, zero-width space preedit
     // spreads from the start to the end, making the whole text underlined. Fortunately, SwiftUI's length
     // and selectedRange are reliable, so we use a normal space in this case.
-    if length > 0 && length - currentPreedit.count == NSMaxRange(selectedRange) {
+    // JetBrains-based IDEs displays zero-width space as "ZWSP" so we'd rather use a normal space.
+    if (length > 0 && length - currentPreedit.count == NSMaxRange(selectedRange))
+      || isJetBrains(app)
+    {
       setPreedit(client, " ", 0)
     } else {
       setPreedit(client, zeroWidthSpace, 0)