From 82dbed78153d91ff325805676da224a2baafecd0 Mon Sep 17 00:00:00 2001
From: zonble <zonble@gmail.com>
Date: Tue, 1 Feb 2022 08:41:36 +0800
Subject: [PATCH] Fixes a crash on adding user phrases.

---
 Source/InputState.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/InputState.swift b/Source/InputState.swift
index 869559a1..3e7e0a47 100644
--- a/Source/InputState.swift
+++ b/Source/InputState.swift
@@ -222,8 +222,9 @@ class InputState: NSObject {
 
         @objc var userPhrase: String {
             let text = (composingBuffer as NSString).substring(with: markedRange)
-            let end = markedRange.location + markedRange.length
-            let readings = readings[markedRange.location..<end]
+            let exactBegin = StringUtils.convertToCharIndex(from: markedRange.location, in: composingBuffer)
+            let exactEnd = StringUtils.convertToCharIndex(from: markedRange.location + markedRange.length, in: composingBuffer)
+            let readings = readings[exactBegin..<exactEnd]
             let joined = readings.joined(separator: "-")
             return "\(text) \(joined)"
         }