KeyHandler // Put UOM suggestions into candidate array.

Source/Modules/ControllerModules/KeyHandler_Core.swift

@@ -239,17 +239,17 @@ class KeyHandler {
 
   /// 獲取候選字詞陣列資料內容。
   var candidatesArray: [String] {
+    var arrNodes: [Megrez.NodeAnchor] = rawNodes
     var arrCandidates: [String] = []
-    var arrNodes: [Megrez.NodeAnchor] = []
-    arrNodes.append(contentsOf: rawNodes)
 
     /// 原理：nodes 這個回饋結果包含一堆子陣列，分別對應不同詞長的候選字。
     /// 這裡先對陣列排序、讓最長候選字的子陣列的優先權最高。
     /// 這個過程不會傷到子陣列內部的排序。
-    if !arrNodes.isEmpty {
+    if arrNodes.isEmpty { return arrCandidates }
+
     // sort the nodes, so that longer nodes (representing longer phrases)
     // are placed at the top of the candidate list
-      arrNodes.sort { $0.keyLength > $1.keyLength }
+    arrNodes = arrNodes.stableSort { $0.keyLength > $1.keyLength }
 
     // then use the Swift trick to retrieve the candidates for each node at/crossing the cursor
     for currentNodeAnchor in arrNodes {
@@ -262,6 +262,12 @@ class KeyHandler {
         }
       }
     }
+    if mgrPrefs.fetchSuggestionsFromUserOverrideModel, !mgrPrefs.useSCPCTypingMode {
+      let arrSuggestedUnigrams: [Megrez.Unigram] = fetchSuggestedCandidates().stableSort { $0.score > $1.score }
+      let arrSuggestedCandidates: [String] = arrSuggestedUnigrams.map { $0.keyValue.value }
+      arrCandidates = arrSuggestedCandidates.filter { arrCandidates.contains($0) } + arrCandidates
+      arrCandidates = arrCandidates.deduplicate
+      arrCandidates = arrCandidates.stableSort { $0.count > $1.count }
     }
     return arrCandidates
   }