Fix restoring preferences may fail Now it cannot fail even for non-objects.

Changes

2 changed files (+12/-5)

• src/Preferences.elm
  • @@ -96,15 +96,22 @@ , fieldHighlight = DoNotHighlight
    } + {-| This decoder should not fail for backwards/forwards compatibility. + Always fallback to safe defaults. + -} decoder : Decode.Decoder Preferences decoder = Decode.map2 Preferences - (Decode.field "preview_theme" - (Decode.oneOf [ previewThemeDecoder, Decode.succeed defaultPreferences.previewTheme ]) + (Decode.oneOf + [ Decode.field "preview_theme" previewThemeDecoder + , Decode.succeed defaultPreferences.previewTheme + ] ) - (Decode.field "field_highlight" - (Decode.oneOf [ fieldHighlightDecoder, Decode.succeed defaultPreferences.fieldHighlight ]) + (Decode.oneOf + [ Decode.field "field_highlight" fieldHighlightDecoder + , Decode.succeed defaultPreferences.fieldHighlight + ] )
• src/Preferences/App.elm
  • @@ -41,7 +41,7 @@ Ok preferences ->
    { preferences = preferences } Err _ -> - -- TODO: Notify decode error + -- As `Preferences.decoder` never fails, this is unreachable. { preferences = Preferences.defaultPreferences }