Skip to content

Handle complex calculator results #47506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MuyuanMS merged 1 commit into from
May 28, 2026
Merged

Handle complex calculator results #47506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/QueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public void Initialize()
[DataRow("=2^96", "Result value was either too large or too small for a decimal number")]
[DataRow("=+()", "Calculation result is not a valid number (NaN)")]
[DataRow("=[10,10]", "Unsupported use of square brackets")]
[DataRow("=sqrt(-1)", "Complex numbers are not supported")]
[DataRow("=5/0", "Expression contains division by zero")]
[DataRow("=5 / 0", "Expression contains division by zero")]
[DataRow("10+(8*9)/0+7", "Expression contains division by zero")]
Expand All @@ -63,6 +64,7 @@ public void ErrorResultOnInvalidKeywordQuery(string typedString, string expected
[DataRow("2^96")]
[DataRow("+()")]
[DataRow("[10,10]")]
[DataRow("sqrt(-1)")]
[DataRow("5/0")]
[DataRow("5 / 0")]
[DataRow("10+(8*9)/0+7")]
Expand Down
6 changes: 6 additions & 0 deletions src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Numerics;
using System.Text.RegularExpressions;

using Mages.Core;
Expand Down Expand Up @@ -122,6 +123,11 @@ private static dynamic TransformResult(object result)
return Properties.Resources.wox_plugin_calculator_double_array_returned;
}

if (result is Complex)
{
return Properties.Resources.wox_plugin_calculator_complex_number_returned;
}

return result;
}

Expand Down
9 changes: 9 additions & 0 deletions ...uncher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion ...ules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@
<data name="wox_plugin_calculator_double_array_returned" xml:space="preserve">
<value>Unsupported use of square brackets</value>
</data>
<data name="wox_plugin_calculator_complex_number_returned" xml:space="preserve">
<value>Complex numbers are not supported</value>
</data>
<data name="wox_plugin_calculator_not_covert_to_decimal" xml:space="preserve">
<value>Result value was either too large or too small for a decimal number</value>
</data>
Expand Down Expand Up @@ -187,4 +190,4 @@
<value>Gradians</value>
<comment>Text for angle unit.</comment>
</data>
</root>
</root>
Loading