diff --git a/Plugins/Wox.Plugin.Everything/Main.cs b/Plugins/Wox.Plugin.Everything/Main.cs index ce0d01a8f..a5ad006d4 100644 --- a/Plugins/Wox.Plugin.Everything/Main.cs +++ b/Plugins/Wox.Plugin.Everything/Main.cs @@ -16,7 +16,8 @@ namespace Wox.Plugin.Everything var results = new List(); if (query.ActionParameters.Count > 0 && query.ActionParameters[0].Length > 0) { - IEnumerable enumerable = api.Search(query.ActionParameters[0], 0, 100); + var keyword = string.Join(" ", query.ActionParameters.ToArray()); + IEnumerable enumerable = api.Search(keyword, 0, 100); foreach (string s in enumerable) { var path = s; diff --git a/Wox.Plugin.System/Calculator.cs b/Wox.Plugin.System/Calculator.cs index a1863507a..04ddf7f06 100644 --- a/Wox.Plugin.System/Calculator.cs +++ b/Wox.Plugin.System/Calculator.cs @@ -20,6 +20,7 @@ namespace Wox.Plugin.System @"==|~=|&&|\|\||" + @"[ei]|[0-9]|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" + @")+$", RegexOptions.Compiled); + private static Regex regHasNumber = new Regex(@"[0-9]", RegexOptions.Compiled); private static Regex regBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled); private static ParseContext yampContext = null; private PluginInitContext context { get; set; } @@ -35,6 +36,7 @@ namespace Wox.Plugin.System { if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.Length < 2 // don't affect when user only input "e" or "i" keyword + || !regHasNumber.IsMatch(query.RawQuery) // must has one number || !regValidExpressChar.IsMatch(query.RawQuery) || !IsBracketComplete(query.RawQuery)) return new List();