Merge pull request #15 from Flow-Launcher/fix_substring_scoring

Fix substring scoring

Author: jjw24

Flow.Launcher.Infrastructure/StringMatcher.cs

@@ -212,8 +212,16 @@ private static int CalculateSearchScore(string query, string stringToCompare, in
             if (allSubstringsContainedInCompareString)
             {
                 int count = query.Count(c => !char.IsWhiteSpace(c));
-                int factor = count < 4 ? 10 : 5;
-                score += factor * count;
+                //10 per char is too much for long query strings, this threshhold is to avoid where long strings will override the other results too much
+                int threshold = 4;
+                if (count <= threshold)
+                {
+                    score += count * 10;
+                }
+                else
+                {
+                    score += threshold * 10 + (count - threshold) * 5;
+                }
             }
 
             return score;

Flow.Launcher.Test/FuzzyMatcherTest.cs

@@ -18,6 +18,7 @@ public class FuzzyMatcherTest
         private const string LastIsChrome = "Last is chrome";
         private const string OneOneOneOne = "1111";
         private const string MicrosoftSqlServerManagementStudio = "Microsoft SQL Server Management Studio";
+        private const string VisualStudioCode = "Visual Studio Code";
 
         public List<string> GetSearchStrings()
             => new List<string>
@@ -122,13 +123,13 @@ public void WhenGivenStringsAndAppliedPrecisionFilteringThenShouldReturnGreaterT
             }
         }
 
-        [TestCase(Chrome, Chrome, 137)]
-        [TestCase(Chrome, LastIsChrome, 83)]
+        [TestCase(Chrome, Chrome, 157)]
+        [TestCase(Chrome, LastIsChrome, 103)]
         [TestCase(Chrome, HelpCureHopeRaiseOnMindEntityChrome, 21)]
         [TestCase(Chrome, UninstallOrChangeProgramsOnYourComputer, 15)]
         [TestCase(Chrome, CandyCrushSagaFromKing, 0)]
         [TestCase("sql", MicrosoftSqlServerManagementStudio, 56)]
-        [TestCase("sql  manag", MicrosoftSqlServerManagementStudio, 79)]//double spacing intended
+        [TestCase("sql  manag", MicrosoftSqlServerManagementStudio, 99)]//double spacing intended
         public void WhenGivenQueryStringThenShouldReturnCurrentScoring(string queryString, string compareString, int expectedScore)
         {
             // When, Given
@@ -195,6 +196,9 @@ public void WhenGivenDesiredPrecisionThenShouldReturnAllResultsGreaterOrEqual(
         [TestCase("ch r", "Change settings for text-to-speech and for speech recognition (if installed).", StringMatcher.SearchPrecisionScore.Regular, true)]
         [TestCase("a test", "This is a test", StringMatcher.SearchPrecisionScore.Regular, true)]
         [TestCase("test", "This is a test", StringMatcher.SearchPrecisionScore.Regular, true)]
+        [TestCase("cod", VisualStudioCode, StringMatcher.SearchPrecisionScore.Regular, true)]
+        [TestCase("code", VisualStudioCode, StringMatcher.SearchPrecisionScore.Regular, true)]
+        [TestCase("codes", "Visual Studio Codes", StringMatcher.SearchPrecisionScore.Regular, true)]
         public void WhenGivenQueryShouldReturnResultsContainingAllQuerySubstrings(
             string queryString,
             string compareString,