Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix exceptions and incorrect results within the calculator plugin (#7438)

Browse Source 
* remove functions which mages cannot interpret and add in functions which mages can

* set validResult when the result is explicitly created to differentiate it form an empty CalculateResult

* Add condition to check that the input is not ending with a binary operation

* add tests for all the cases

* use valid result while calculating hash as well

* add test for e is valid within regex

* removed i from regex

* remove valid result to use decimal? instead

* remove duplicate rand and exp
This commit is contained in:
Alekhya
2020-10-21 16:19:37 -07:00
committed by GitHub
parent 86d77103e9
commit dd2627dbbc
4 changed files with 83 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/ResultHelper.cs
View File

@@ -17,11 +17,17 @@ namespace Microsoft.Plugin.Calculator
return CreateResult(result.RoundedResult, iconPath);
}
public static Result CreateResult(decimal roundedResult, string iconPath)
public static Result CreateResult(decimal? roundedResult, string iconPath)
{
// Return null when the expression is not a valid calculator query.
if (roundedResult == null)
{
return null;
}
return new Result
{
Title = roundedResult.ToString(CultureInfo.CurrentCulture),
Title = roundedResult?.ToString(CultureInfo.CurrentCulture),
IcoPath = iconPath,
Score = 300,
SubTitle = Properties.Resources.wox_plugin_calculator_copy_number_to_clipboard,
@@ -29,26 +35,29 @@ namespace Microsoft.Plugin.Calculator
};
}
public static bool Action(decimal roundedResult)
public static bool Action(decimal? roundedResult)
{
var ret = false;
var thread = new Thread(() =>
if (roundedResult != null)
{
try
var thread = new Thread(() =>
{
Clipboard.SetText(roundedResult.ToString(CultureInfo.CurrentUICulture.NumberFormat));
ret = true;
}
catch (ExternalException)
{
MessageBox.Show(Properties.Resources.wox_plugin_calculator_copy_failed);
}
});
try
{
Clipboard.SetText(roundedResult?.ToString(CultureInfo.CurrentUICulture.NumberFormat));
ret = true;
}
catch (ExternalException)
{
MessageBox.Show(Properties.Resources.wox_plugin_calculator_copy_failed);
}
});
thread.SetApartmentState(ApartmentState.STA);
thread.Start();
thread.Join();
thread.SetApartmentState(ApartmentState.STA);
thread.Start();
thread.Join();
}
return ret;
}