refactor: SKK辞書の註釈削除処理を関数として抽出

emanon001 · Mar 12, 2023 · e6c66cd · e6c66cd
1 parent b14a2c3
commit e6c66cd
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/SkkDict.elm b/src/SkkDict.elm
@@ -42,17 +42,21 @@ fromDictString dictStr =
                 _ :: [] ->
                     Nothing
 
-                key :: henkanList ->
+                key :: conversionList ->
                     Just
                         ( String.trim key
-                        , List.map (String.split ";" >> List.head) henkanList
-                            |> List.map (Maybe.withDefault "")
+                        , List.map removeAnnotation conversionList
+                            |> Maybe.Extra.values
                             |> List.filter (not << String.isEmpty)
                         )
 
                 _ ->
                     Nothing
 
+        removeAnnotation : String -> Maybe String
+        removeAnnotation s =
+            (String.split ";" >> List.head) s
+
         buildDict : List String -> SkkDict
         buildDict lines =
             List.filterMap toEntry lines |> Dict.fromList