From ed98a4a7ea5716a05c2ecf6ca224c931dbad5cbf Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Thu, 16 Jun 2022 08:41:01 +0800
Subject: [PATCH] InputState // Defer certain variable initialization
 processes.

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

diff --git a/Source/Modules/ControllerModules/InputState.swift b/Source/Modules/ControllerModules/InputState.swift
index afd3bd6e..9cdbdfd2 100644
--- a/Source/Modules/ControllerModules/InputState.swift
+++ b/Source/Modules/ControllerModules/InputState.swift
@@ -114,7 +114,8 @@ class InputState {
 
     init(composingBuffer: String, cursorIndex: Int) {
       self.composingBuffer = composingBuffer
-      self.cursorIndex = cursorIndex
+      super.init()
+      defer { self.cursorIndex = cursorIndex }
     }
 
     var description: String {
@@ -223,12 +224,12 @@ class InputState {
     private(set) var readings: [String]
 
     init(composingBuffer: String, cursorIndex: Int, markerIndex: Int, readings: [String]) {
-      self.markerIndex = markerIndex
       let begin = min(cursorIndex, markerIndex)
       let end = max(cursorIndex, markerIndex)
       markedRange = begin..<end
       self.readings = readings
       super.init(composingBuffer: composingBuffer, cursorIndex: cursorIndex)
+      defer { self.markerIndex = markerIndex }
     }
 
     var attributedString: NSAttributedString {