github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 05:13:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

handle optional props

Browse source
This commit is contained in:
Tian Liao 2024-11-06 12:25:48 +08:00
commit c8cfe10ed0
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Calculator/Utils/JsonUtils.cs
View file

@ -160,10 +160,10 @@ namespace CalculatorApp.JsonUtils
public CalcManagerSnapshot Value; public CalcManagerSnapshot Value;
[JsonPropertyName("h")] [JsonPropertyName("h")]
public IEnumerable<CalcManagerHistoryItemAlias> HistoryItems public IEnumerable<CalcManagerHistoryItemAlias> HistoryItems // optional
{ {
get => Value.HistoryItems.Select(x => new CalcManagerHistoryItemAlias { Value = x }); get => Value?.HistoryItems.Select(x => new CalcManagerHistoryItemAlias { Value = x });
set => Value.HistoryItems = value.Select(x => new CalcManagerHistoryItem set => Value.HistoryItems = value?.Select(x => new CalcManagerHistoryItem
{ {
Tokens = x.Tokens.Select(Helpers.MapHistoryToken).ToList(), Tokens = x.Tokens.Select(Helpers.MapHistoryToken).ToList(),
Commands = x.Commands.Select(Helpers.MapCommandAlias).ToList(), Commands = x.Commands.Select(Helpers.MapCommandAlias).ToList(),
@ -238,10 +238,10 @@ namespace CalculatorApp.JsonUtils
set => Value.PrimaryDisplay = value.Value; set => Value.PrimaryDisplay = value.Value;
} }
[JsonPropertyName("e")] [JsonPropertyName("e")]
public ExpressionDisplaySnapshotAlias ExpressionDisplay public ExpressionDisplaySnapshotAlias ExpressionDisplay // optional
{ {
get => new ExpressionDisplaySnapshotAlias(Value.ExpressionDisplay); get => Value != null ? new ExpressionDisplaySnapshotAlias(Value.ExpressionDisplay) : null;
set => Value.ExpressionDisplay = value.Value; set => Value.ExpressionDisplay = value?.Value;
} }
[JsonPropertyName("c")] [JsonPropertyName("c")]
public IEnumerable<ICalcManagerIExprCommandAlias> Commands public IEnumerable<ICalcManagerIExprCommandAlias> Commands
@ -262,10 +262,10 @@ namespace CalculatorApp.JsonUtils
[JsonPropertyName("m")] [JsonPropertyName("m")]
public int Mode { get => Value.Mode; set => Value.Mode = value; } public int Mode { get => Value.Mode; set => Value.Mode = value; }
[JsonPropertyName("s")] [JsonPropertyName("s")]
public StandardCalculatorSnapshotAlias StandardCalculatorSnapshot public StandardCalculatorSnapshotAlias StandardCalculatorSnapshot // optional
{ {
get => new StandardCalculatorSnapshotAlias(Value.StandardCalculator); get => Value != null ? new StandardCalculatorSnapshotAlias(Value.StandardCalculator) : null;
set => Value.StandardCalculator = value.Value; set => Value.StandardCalculator = value?.Value;
} }
public ApplicationSnapshotAlias() => Value = new ApplicationSnapshot(); public ApplicationSnapshotAlias() => Value = new ApplicationSnapshot();