Implement Bookmark Autocomplete Provider

chrome/browser/history/query_parser.cc

 // Copyright (c) 2011 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/history/query_parser.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 
 namespace {
 
 // Returns true if |mp1.first| is less than |mp2.first|. This is used to
 // sort match positions.
 int CompareMatchPosition(const Snippet::MatchPosition& mp1,
                          const Snippet::MatchPosition& mp2) {
   return mp1.first < mp2.first;
 }
 
 // Returns true if |mp2| intersects |mp1|. This is intended for use by
-// CoalesceMatchesFrom and isn't meant as a general intersectpion comparison
+// CoalesceMatchesFrom and isn't meant as a general intersection comparison
 // function.
 bool SnippetIntersects(const Snippet::MatchPosition& mp1,
                        const Snippet::MatchPosition& mp2) {
   return mp2.first >= mp1.first && mp2.first <= mp1.second;
 }
 
 // Coalesces match positions in |matches| after index that intersect the match
 // position at |index|.
 void CoalesceMatchesFrom(size_t index, Snippet::MatchPositions* matches) {
   Snippet::MatchPosition& mp = (*matches)[index];
   for (Snippet::MatchPositions::iterator i = matches->begin() + index + 1;
        i != matches->end(); ) {
     if (SnippetIntersects(mp, *i)) {
-      mp.second = i->second;
+      mp.first = std::min(mp.first, i->first);

[sky, 2012/10/15 23:32:34]

I get the need for std::max on 40, bug 39 shouldn't be needed, right? The
snippets are ordered by 'first'.

[mrossetti, 2012/10/16 16:38:05]

Makes sense. Thanks.

+      mp.second = std::max(mp.second, i->second);
       i = matches->erase(i);
     } else {
       return;
     }
   }
 }
 
 // Sorts the match positions in |matches| by their first index, then coalesces
 // any match positions that intersect each other.
 void CoalseAndSortMatchPositions(Snippet::MatchPositions* matches) {
@@ skipping 68 matching lines @@
 
 bool QueryNodeWord::Matches(const string16& word, bool exact) const {
   if (exact || !QueryParser::IsWordLongEnoughForPrefixSearch(word_))
     return word == word_;
   return word.size() >= word_.size() &&
          (word_.compare(0, word_.size(), word, 0, word_.size()) == 0);
 }
 
 bool QueryNodeWord::HasMatchIn(const std::vector<QueryWord>& words,
                                Snippet::MatchPositions* match_positions) const {
+  bool matched = false;
   for (size_t i = 0; i < words.size(); ++i) {
     if (Matches(words[i].word, false)) {
       size_t match_start = words[i].position;
       match_positions->push_back(
           Snippet::MatchPosition(match_start,
                                  match_start + static_cast<int>(word_.size())));
-      return true;
+      matched = true;
     }
   }
-  return false;
+  return matched;
 }
 
 void QueryNodeWord::AppendWords(std::vector<string16>* words) const {
   words->push_back(word_);
 }
 
 // A QueryNodeList has a collection of QueryNodes which are deleted in the end.
 class QueryNodeList : public QueryNode {
  public:
   typedef std::vector<QueryNode*> QueryNodeVector;
@@ skipping 259 matching lines @@
     if (iter.IsWord()) {
       string16 word = iter.GetString();
       if (!word.empty()) {
         words->push_back(QueryWord());
         words->back().word = word;
         words->back().position = iter.prev();
       }
     }
   }
 }