見分けにくい単独記号の変換候補に説明を表示する

Core/Sources/Core/InputUtils/CandidatePresentationContext.swift

@@ -17,5 +17,19 @@ public struct CandidatePresentation: Sendable {
     public init(candidate: Candidate, displayContext: CandidatePresentationContext = .init()) {
         self.candidate = candidate
         self.displayContext = displayContext
+        if self.displayContext.annotationText == nil {
+            self.displayContext.annotationText = Self.symbolAnnotation(for: candidate.text)
+        }
+    }
+
+    private static func symbolAnnotation(for text: String) -> String? {
+        switch text {
+        case "-": "半角ハイフン"
+        case "－": "全角ハイフン"
+        case "ｰ": "半角長音符"
+        case "ー": "全角長音符"
+        case "−": "マイナス記号"
+        default: nil
+        }
     }
 }

Core/Tests/CoreTests/InputUtilsTests/CandidateSymbolAnnotationTests.swift

@@ -0,0 +1,38 @@
+import Core
+import Foundation
+import KanaKanjiConverterModuleWithDefaultDictionary
+import Testing
+
+private func symbolCandidate(_ text: String) -> Candidate {
+    Candidate(text: text, value: 0, composingCount: .surfaceCount(text.count), lastMid: 0, data: [])
+}
+
+@Test(arguments: [
+    ("-", "半角ハイフン"), ("－", "全角ハイフン"), ("ｰ", "半角長音符"),
+    ("ー", "全角長音符"), ("−", "マイナス記号")
+])
+func testSymbolCandidateAnnotation(text: String, annotation: String) throws {
+    let presentation = CandidatePresentation(candidate: symbolCandidate(text))
+    #expect(presentation.candidate.text == text)
+    #expect(presentation.displayContext.annotationText == annotation)
+    let transported = try JSONDecoder().decode(
+        ConverterCandidatePresentation.self,
+        from: JSONEncoder().encode(ConverterCandidatePresentation(presentation))
+    )
+    #expect(transported.text == text)
+    #expect(transported.annotationText == annotation)
+}
+
+@Test(arguments: ["", "コーヒー", "ｰｰ", "--", " -", "ー ", "A-B", "1−2", "漢字"])
+func testSymbolAnnotationRequiresEntireCandidate(text: String) {
+    #expect(CandidatePresentation(candidate: symbolCandidate(text)).displayContext.annotationText == nil)
+}
+
+@Test func testSymbolAnnotationPreservesExistingContext() {
+    let presentation = CandidatePresentation(
+        candidate: symbolCandidate("ｰ"),
+        displayContext: .init(annotationText: "半角カナ", extraValues: ["source": "additional"])
+    )
+    #expect(presentation.displayContext.annotationText == "半角カナ")
+    #expect(presentation.displayContext.extraValues == ["source": "additional"])
+}

README.md

@@ -151,3 +151,7 @@ Thanks to authors!!
 
 ## Acknowledgement
 本プロジェクトは情報処理推進機構(IPA)による[2024年度未踏IT人材発掘・育成事業](https://www.ipa.go.jp/jinzai/mitou/it/2024/koubokekka.html)の支援を受けて開発を行いました。
+
+### 記号候補の説明
+
+単独の `-`・`－`・`ｰ`・`ー`・`−` の変換候補に、それぞれ「半角ハイフン」「全角ハイフン」「半角長音符」「全角長音符」「マイナス記号」を表示します。候補の文字や順序は変わりません。語中の記号には説明を付けず、既存の「半角カナ」などの説明がある場合はそちらを優先します。

azooKeyMac/InputController/CandidateWindow/CandidateView.swift

@@ -68,6 +68,10 @@ class CandidatesViewController: BaseCandidateViewController {
         }
 
         cell.candidateTextField.attributedStringValue = attributedString
+        cell.candidateTextField.setAccessibilityLabel(
+            annotationText.map { "\(displayText)、\($0)" } ?? displayText
+        )
+        cell.candidateAnnotationTextField.setAccessibilityElement(false)
 
         if let annotationText {
             let annotationString = NSAttributedString(
@@ -100,12 +104,12 @@ class CandidatesViewController: BaseCandidateViewController {
     }
 
     override func getWindowWidth(maxContentWidth: CGFloat) -> CGFloat {
-        let hasAnnotation = self.candidates.contains { $0.annotationText != nil }
-        if self.showCandidateIndex {
-            return maxContentWidth + 48 + (hasAnnotation ? 56 : 0)
-        } else {
-            return maxContentWidth + 20 + (hasAnnotation ? 56 : 0)
-        }
+        let annotationTexts = self.candidates.compactMap(\.annotationText)
+        let annotationWidth = annotationTexts.isEmpty ? 0 : self.getMaxTextWidth(
+            candidates: annotationTexts,
+            font: .systemFont(ofSize: 12)
+        ) + 8
+        return maxContentWidth + (self.showCandidateIndex ? 48 : 20) + annotationWidth
     }
 }
 

azooKeyMacTests/CandidateSelectionFeedbackTests.swift

@@ -53,4 +53,28 @@ final class CandidateSelectionFeedbackTests: XCTestCase {
         XCTAssertEqual(controller.currentSelectedRow, 1)
         XCTAssertEqual(delegate.selectedRows, [1])
     }
+
+    func testSymbolAnnotationIsAccessibleAndClearedWhenCellIsReused() {
+        let controller = CandidatesViewController()
+        controller.candidates = [
+            ConverterCandidatePresentation(text: "-", annotationText: "半角ハイフン"),
+            ConverterCandidatePresentation(text: "文章")
+        ]
+        let cell = CandidateTableCellView()
+        controller.configureCellView(cell, forRow: 0)
+        XCTAssertFalse(cell.candidateAnnotationTextField.isHidden)
+        XCTAssertEqual(cell.candidateTextField.accessibilityLabel(), "-、半角ハイフン")
+        controller.configureCellView(cell, forRow: 1)
+        XCTAssertTrue(cell.candidateAnnotationTextField.isHidden)
+        XCTAssertEqual(cell.candidateTextField.accessibilityLabel(), "文章")
+    }
+
+    func testWindowWidthIncludesFullAnnotation() {
+        let controller = CandidatesViewController()
+        controller.candidates = [ConverterCandidatePresentation(text: "-", annotationText: "半角ハイフン")]
+        let width = controller.getWindowWidth(maxContentWidth: 18)
+        let annotationWidth = controller.getMaxTextWidth(candidates: ["半角ハイフン"], font: .systemFont(ofSize: 12))
+        XCTAssertGreaterThanOrEqual(width, 18 + 20 + 8 + annotationWidth)
+    }
+
 }