Improved output for List<object?>

panoramicdata · Mar 25, 2024 · 471ec33 · 471ec33
1 parent 7332ffc
commit 471ec33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/PanoramicData.NCalc101/Components/Pages/Home.razor.cs b/PanoramicData.NCalc101/Components/Pages/Home.razor.cs
@@ -315,13 +315,15 @@ private async Task EvaluateAsync()
 				_result = output switch
 				{
 					null => "null",
+					List<object?> => string.Join("\r\n", (output as List<object?>)!.Select(ob => ob?.ToString() ?? "null")),
 					List<string> => string.Join("\r\n", output as List<string> ?? []),
 					_ => output.ToString()
 				} ?? string.Empty;
 				_resultType = output switch
 				{
 					null => "null",
 					List<string> => "List<string>",
+					List<object?> => "List<object?>",
 					_ => output.GetType().ToString()
 				};
 			}

diff --git a/PanoramicData.NCalc101/Examples/Example.cs b/PanoramicData.NCalc101/Examples/Example.cs
@@ -55,7 +55,11 @@ private void EvaluateIfRequired()
 
 			_result = expression.Evaluate();
 			_resultTypeString = _result is null ? "null" : _result.GetType().ToString();
-			_resultAsString = _result?.ToString() ?? string.Empty;
+			_resultAsString = _resultTypeString switch
+			{
+				"System.Collections.Generic.List`1[System.Object]" => string.Join("\n", (_result as List<object?>)!.Select(ob => ob?.ToString() ?? "null")),
+				_ => _result?.ToString() ?? "null"
+			};
 		}
 		catch (Exception ex)
 		{