Extract validation to method

This commit is contained in:
SysC0mp 2020-02-26 19:40:20 +01:00
parent 4f4e423a4b
commit 3d917e0258

View file

@ -45,10 +45,7 @@ namespace Wox.Plugin.Caculator
public List<Result> Query(Query query)
{
// Don't affect when user only input "e" or "i" keyword
if (query.Search.Length < 2
|| !RegValidExpressChar.IsMatch(query.Search)
|| !IsBracketComplete(query.Search))
if (!CanCalculate(query))
{
return new List<Result>();
}
@ -100,6 +97,27 @@ namespace Wox.Plugin.Caculator
return new List<Result>();
}
private bool CanCalculate(Query query)
{
// Don't execute when user only input "e" or "i" keyword
if (query.Search.Length < 2)
{
return false;
}
if (!RegValidExpressChar.IsMatch(query.Search))
{
return false;
}
if (!IsBracketComplete(query.Search))
{
return false;
}
return true;
}
private string ChangeDecimalSeparator(object value, string newDecimalSeparator)
{
if (value == null || String.IsNullOrEmpty(value.ToString()))