Fixing a bug with word-boundary ratio calculation

cpp/ycm/Result.cpp

@@ -36,11 +36,11 @@ int NumWordBoundaryCharMatches( const std::string &query,
   while ( j < query.size() && i < word_boundary_chars.size() )
   {
     if ( toupper( query[ j ] ) == toupper( word_boundary_chars[ i ] ) )
-      ++i;
       ++j;
+    ++i;
   }
 
-  return i;
+  return j;
 }
 
 } // unnamed namespace

cpp/ycm/tests/Completer_test.cpp

@@ -116,6 +116,18 @@ TEST( CompleterTest, CompleteMatchForWordBoundaryCharsWins )
 
 TEST( CompleterTest, RatioUtilizationTieBreak )
 {
+	EXPECT_THAT( Completer( Candidates(
+               "aGaaFooBarQux",
+               "aBaafbq" ) ).CandidatesForQuery( "fbq" ),
+	             ElementsAre( "aGaaFooBarQux",
+	                          "aBaafbq" ) );
+
+	EXPECT_THAT( Completer( Candidates(
+               "aFooBarQux",
+               "afbq" ) ).CandidatesForQuery( "fbq" ),
+	             ElementsAre( "aFooBarQux",
+	                          "afbq" ) );
+
 	EXPECT_THAT( Completer( Candidates(
                "FooBarQux",
                "FooBarQuxZaa" ) ).CandidatesForQuery( "fbq" ),