Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Limit Calculator trigger must has one number at least

Browse Source 
make not affect some keyword like "pi"
This commit is contained in:
cxfksword
2014-03-19 21:34:18 +08:00
parent 19f25e45bb
commit fe124310de
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Wox.Plugin.System/Calculator.cs
View File

@@ -20,6 +20,7 @@ namespace Wox.Plugin.System
@"==|~=|&&|\|\||" + @"==|~=|&&|\|\||" +
@"[ei]|[0-9]|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" + @"[ei]|[0-9]|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
@")+$", RegexOptions.Compiled); @")+$", RegexOptions.Compiled);
private static Regex regHasNumber = new Regex(@"[0-9]", RegexOptions.Compiled);
private static Regex regBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled); private static Regex regBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled);
private static ParseContext yampContext = null; private static ParseContext yampContext = null;
private PluginInitContext context { get; set; } private PluginInitContext context { get; set; }
@@ -35,6 +36,7 @@ namespace Wox.Plugin.System
{ {
if (string.IsNullOrEmpty(query.RawQuery) if (string.IsNullOrEmpty(query.RawQuery)
|| query.RawQuery.Length < 2 // don't affect when user only input "e" or "i" keyword || 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) || !regValidExpressChar.IsMatch(query.RawQuery)
|| !IsBracketComplete(query.RawQuery)) return new List<Result>(); || !IsBracketComplete(query.RawQuery)) return new List<Result>();