From 3d917e02581ffc6df6c5449d7c1344071230f899 Mon Sep 17 00:00:00 2001
From: SysC0mp <kevineck93@gmail.com>
Date: Wed, 26 Feb 2020 19:40:20 +0100
Subject: [PATCH] Extract validation to method

---
 Plugins/Wox.Plugin.Calculator/Main.cs | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/Plugins/Wox.Plugin.Calculator/Main.cs b/Plugins/Wox.Plugin.Calculator/Main.cs
index db3016fad..5d7b347d1 100644
--- a/Plugins/Wox.Plugin.Calculator/Main.cs
+++ b/Plugins/Wox.Plugin.Calculator/Main.cs
@@ -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()))