Bug 451760 - Allow matching at beginning of title/url by pref. r=dietrich

browser/app/profile/firefox.js

@@ -216,6 +216,7 @@ pref("browser.urlbar.matchOnlyTyped", false);
 // 0: Match anywhere (e.g., middle of words)
 // 1: Match on word boundaries and then try matching anywhere
 // 2: Match only on word boundaries (e.g., after / or .)
+// 3: Match at the beginning of the url or title
 pref("browser.urlbar.matchBehavior", 1);
 pref("browser.urlbar.filter.javascript", true);
 

toolkit/components/places/src/nsNavHistory.cpp

@@ -1885,6 +1885,10 @@ nsNavHistory::LoadPrefs(PRBool aInitializing)
     case 2:
       mAutoCompleteMatchBehavior = MATCH_BOUNDARY;
       break;
+    case 3:
+      mAutoCompleteMatchBehavior = MATCH_BEGINNING;
+      break;
+    case 1:
     default:
       mAutoCompleteMatchBehavior = MATCH_BOUNDARY_ANYWHERE;
       break;

toolkit/components/places/src/nsNavHistory.h

@@ -664,7 +664,8 @@ protected:
   enum MatchType {
     MATCH_ANYWHERE,
     MATCH_BOUNDARY_ANYWHERE,
-    MATCH_BOUNDARY
+    MATCH_BOUNDARY,
+    MATCH_BEGINNING
   };
 
   nsresult InitAutoComplete();

toolkit/components/places/src/nsNavHistoryAutoComplete.cpp

@@ -224,6 +224,15 @@ FindAnywhere(const nsAString &aToken, const nsAString &aTarget)
   return CaseInsensitiveFindInReadable(aToken, aTarget);
 }
 
+/**
+ * A local wrapper to case insensitive StringBeginsWith
+ */
+inline PRBool
+FindBeginning(const nsAString &aToken, const nsAString &aTarget)
+{
+  return StringBeginsWith(aTarget, aToken, nsCaseInsensitiveStringComparator());
+}
+
 // nsNavHistory::InitAutoComplete
 nsresult
 nsNavHistory::InitAutoComplete()
@@ -805,8 +814,20 @@ nsNavHistory::AutoCompleteProcessSearch(mozIStorageStatement* aQuery,
     !StartsWithJS(mCurrentSearchString);
 
   // Determine what type of search to try matching tokens against targets
-  PRBool (*tokenMatchesTarget)(const nsAString &, const nsAString &) =
-    mCurrentMatchType != MATCH_ANYWHERE ? FindOnBoundary : FindAnywhere;
+  PRBool (*tokenMatchesTarget)(const nsAString &, const nsAString &);
+  switch (mCurrentMatchType) {
+    case MATCH_ANYWHERE:
+      tokenMatchesTarget = FindAnywhere;
+      break;
+    case MATCH_BEGINNING:
+      tokenMatchesTarget = FindBeginning;
+      break;
+    case MATCH_BOUNDARY_ANYWHERE:
+    case MATCH_BOUNDARY:
+    default:
+      tokenMatchesTarget = FindOnBoundary;
+      break;
+  }
 
   PRBool hasMore = PR_FALSE;
   // Determine the result of the search

toolkit/components/places/tests/autocomplete/test_match_beginning.js

@@ -0,0 +1,77 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Places Test Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Edward Lee <edward.lee@engineering.uiuc.edu>.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Test bug 451760 which allows matching only at the beginning of urls or
+ * titles to simulate Firefox 2 functionality.
+ */
+
+// Define some shared uris and titles (each page needs its own uri)
+let kURIs = [
+  "http://x.com/y",
+  "https://y.com/x",
+];
+let kTitles = [
+  "a b",
+  "b a",
+];
+
+addPageBook(0, 0);
+addPageBook(1, 1);
+
+// Provide for each test: description; search terms; array of gPages indices of
+// pages that should match; optional function to be run before the test
+let gTests = [
+  // Tests after this one will match at the beginning
+  ["0: Match at the beginning of titles",
+   "a", [0],
+   function() setBehavior(3)],
+  ["1: Match at the beginning of titles",
+   "b", [1]],
+  ["2: Match at the beginning of urls",
+   "x", [0]],
+  ["3: Match at the beginning of urls",
+   "y", [1]],
+  
+  // Tests after this one will match against word boundaries and anywhere
+  ["4: Sanity check that matching anywhere finds more",
+   "a", [0,1],
+   function() setBehavior(1)],
+];
+
+function setBehavior(aType) {
+  prefs.setIntPref("browser.urlbar.matchBehavior", aType);
+}