Merge branch 'feature/type-in-the-middle-hack' into develop

intitni · intitni · commit 8edc3f85f656 · 2024-04-28T23:05:42.000+08:00
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit f09006a89bc1353614585bc1c03439db0145f993
+Subproject commit c0a332daa062acc788599393627a73b5714e2443
diff --git a/Tool/Sources/Preferences/Keys.swift b/Tool/Sources/Preferences/Keys.swift
@@ -362,6 +362,10 @@ public extension UserDefaultPreferenceKeys {
     var isSuggestionSenseEnabled: PreferenceKey<Bool> {
         .init(defaultValue: false, key: "IsSuggestionSenseEnabled")
     }
+    
+    var isSuggestionTypeInTheMiddleEnabled: PreferenceKey<Bool> {
+        .init(defaultValue: true, key: "IsSuggestionTypeInTheMiddleEnabled")
+    }
 }
 
 // MARK: - Chat
diff --git a/Tool/Sources/Preferences/Types/StorableFont.swift b/Tool/Sources/Preferences/Types/StorableFont.swift
@@ -13,7 +13,7 @@ public struct StorableFont: Codable {
     }
 
     public init(from decoder: Decoder) throws {
-        var container = try decoder.container(keyedBy: CodingKeys.self)
+        let container = try decoder.container(keyedBy: CodingKeys.self)
         let fontData = try container.decode(Data.self, forKey: .nsFont)
         guard let nsFont = try NSKeyedUnarchiver.unarchivedObject(
             ofClass: NSFont.self,

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,10 @@ public extension UserDefaultPreferenceKeys {`
`362`	`362`	`var isSuggestionSenseEnabled: PreferenceKey<Bool> {`
`363`	`363`	`.init(defaultValue: false, key: "IsSuggestionSenseEnabled")`
`364`	`364`	`}`
	`365`	`+`
	`366`	`+ var isSuggestionTypeInTheMiddleEnabled: PreferenceKey<Bool> {`
	`367`	`+ .init(defaultValue: true, key: "IsSuggestionTypeInTheMiddleEnabled")`
	`368`	`+ }`
`365`	`369`	`}`
`366`	`370`
`367`	`371`	`// MARK: - Chat`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public struct StorableFont: Codable {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public init(from decoder: Decoder) throws {`
`16`		`- var container = try decoder.container(keyedBy: CodingKeys.self)`
	`16`	`+ let container = try decoder.container(keyedBy: CodingKeys.self)`
`17`	`17`	`let fontData = try container.decode(Data.self, forKey: .nsFont)`
`18`	`18`	`guard let nsFont = try NSKeyedUnarchiver.unarchivedObject(`
`19`	`19`	`ofClass: NSFont.self,`