Infinite Suggest for mac

chrome/browser/autocomplete/search_provider.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 91 matching lines @@
   return false;
 }
 
 // Builds the match contents and classification for the contents, and updates
 // the given |AutocompleteMatch|.
 void SetAndClassifyMatchContents(const base::string16& query_string,
                                  const base::string16& input_text,
                                  const base::string16& match_contents,
                                  AutocompleteMatch* match) {
   match->contents = match_contents.empty() ? query_string : match_contents;
-
+  base::string16 lookup_text = input_text;
+  if (match->type == AutocompleteMatchType::SEARCH_SUGGEST_INFINITE) {
+    size_t query_length = query_string.length();
+    size_t contents_index = query_length - match_contents.length();
+    if ((query_string.compare(0, input_text.length(), input_text) == 0) &&
+        (query_string.compare(
+            contents_index, query_length, match_contents) == 0))

[Scott Hess - ex-Googler, 2013/12/16 22:22:05]

{} isn't optional if the if() condition causes line breaks.

Also, I generally prefer the style being used |(x.compare(...) == 0)| because it
reads like it means, but if |!x.compare(...)| fits without breaking the lines,
I'm comfortable with that, too.

Also, I think using contents_index as the anchor and query_length as the length
isn't right.  I think it should either be match_contents.length() or
base::string16::npos.  I think the latter is probably better, actually, albeit a
little uglier.

[Anuj, 2013/12/19 05:36:13]

Done.

[Scott Hess - ex-Googler, 2013/12/19 20:15:02]

Still don't see the {}, here, did you need to re-upload?

+      lookup_text = input_text.substr(contents_index);
+  }
   // We do intra-string highlighting for suggestions - the suggested segment
   // will be highlighted, e.g. for input_text = "you" the suggestion may be
   // "youtube", so we'll bold the "tube" section: you*tube*.
-  if (input_text != match_contents) {
-    size_t input_position = match->contents.find(input_text);
-    if (input_position == base::string16::npos) {
+  if (lookup_text != match_contents) {
+    size_t lookup_position = match->contents.find(lookup_text);
+    if (lookup_position == base::string16::npos) {
       // The input text is not a substring of the query string, e.g. input
       // text is "slasdot" and the query string is "slashdot", so we bold the
       // whole thing.
       match->contents_class.push_back(ACMatchClassification(
           0, ACMatchClassification::MATCH));
     } else {
       // TODO(beng): ACMatchClassification::MATCH now seems to just mean
       //             "bold" this. Consider modifying the terminology.
       // We don't iterate over the string here annotating all matches because
       // it looks odd to have every occurrence of a substring that may be as
       // short as a single character highlighted in a query suggestion result,
       // e.g. for input text "s" and query string "southwest airlines", it
       // looks odd if both the first and last s are highlighted.
-      if (input_position != 0) {
+      if (lookup_position != 0) {
         match->contents_class.push_back(ACMatchClassification(
             0, ACMatchClassification::MATCH));
       }
       match->contents_class.push_back(
-          ACMatchClassification(input_position, ACMatchClassification::NONE));
-      size_t next_fragment_position = input_position + input_text.length();
+          ACMatchClassification(lookup_position, ACMatchClassification::NONE));
+      size_t next_fragment_position = lookup_position + lookup_text.length();
       if (next_fragment_position < query_string.length()) {
         match->contents_class.push_back(ACMatchClassification(
             next_fragment_position, ACMatchClassification::MATCH));
       }
     }
   } else {
     // Otherwise, |match| is a verbatim (what-you-typed) match, either for the
     // default provider or a keyword search provider.
     match->contents_class.push_back(ACMatchClassification(
         0, ACMatchClassification::NONE));
@@ skipping 1877 matching lines @@
   if (!OmniboxFieldTrial::InZeroSuggestFieldTrial() ||
       service == NULL ||
       !service->IsSyncEnabledAndLoggedIn() ||
       !sync_prefs.GetPreferredDataTypes(syncer::UserTypes()).Has(
           syncer::PROXY_TABS) ||
       service->GetEncryptedDataTypes().Has(syncer::SESSIONS))
     return false;
 
   return true;
 }