Changeset 141607 in webkit

Timestamp:

Feb 1, 2013 10:49:10 AM (11 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: [file selector dialog] for mixed case queries, score uppercase letters only when assessing camelcase.
​https://bugs.webkit.org/show_bug.cgi?id=108639

Reviewed by Vsevolod Vlasov.

Source/WebCore:

• inspector/front-end/FilteredItemSelectionDialog.js:

(WebInspector.FilteredItemSelectionDialog.prototype._createScoringRegex):

LayoutTests:

• inspector/filtered-item-selection-dialog-filtering-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/filtered-item-selection-dialog-filtering-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-01  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: [file selector dialog] for mixed case queries, score uppercase letters only when assessing camelcase.
+        https://bugs.webkit.org/show_bug.cgi?id=108639
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/filtered-item-selection-dialog-filtering-expected.txt:
+
 2013-02-01  Robert Hogan  <robert@webkit.org>
 

trunk/LayoutTests/inspector/filtered-item-selection-dialog-filtering-expected.txt

@@ -10 +10 @@
 Query:"aB"
 Input:["abc","acB"]
-Output:["abc","acB"]
+Output:["acB","abc"]
 
 Case insensitive matching
@@ -30 +30 @@
 Query:"fBaB"
 Input:["fooBarBaz","FooBarBaz","Foo_Bar_Baz","foo_bar_baz","foobarbaz","foobarBaz","afooBarBaz","aFooBarBaz","a fooBarBaz","fooBorBaz","fooBorCaz"]
-Output:["fooBarBaz","foo_bar_baz","foobarBaz","foobarbaz","FooBarBaz","Foo_Bar_Baz","a fooBarBaz","aFooBarBaz","afooBarBaz"]
+Output:["fooBarBaz","FooBarBaz","Foo_Bar_Baz","a fooBarBaz","aFooBarBaz","afooBarBaz","foo_bar_baz","foobarBaz","foobarbaz"]
 
 Underscore matching

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: [file selector dialog] for mixed case queries, score uppercase letters only when assessing camelcase.
+        https://bugs.webkit.org/show_bug.cgi?id=108639
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/front-end/FilteredItemSelectionDialog.js:
+        (WebInspector.FilteredItemSelectionDialog.prototype._createScoringRegex):
+
 2013-02-01  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js

@@ -191 +191 @@
     /**
      * @param {string} query
+     * @param {boolean} ignoreCase
      * @param {boolean} camelCase
      * @return {RegExp}
      */
-    _createScoringRegex: function(query, camelCase)
-    {
-        query = query.toUpperCase();
+    _createScoringRegex: function(query, ignoreCase, camelCase)
+    {
+        if (!camelCase || (camelCase && ignoreCase))
+            query = query.toUpperCase();
         var regexString = "";
         for (var i = 0; i < query.length; ++i) {
@@ -221 +223 @@
 
         var filterRegex = query ? this._createSearchRegex(query) : null;
-        var camelCaseScoringRegex = query ? this._createScoringRegex(query, true) : null;
-        var underscoreScoringRegex = query ? this._createScoringRegex(query, false) : null;
+        var camelCaseScoringRegex = query ? this._createScoringRegex(query, ignoreCase, true) : null;
+        var underscoreScoringRegex = query ? this._createScoringRegex(query, ignoreCase, false) : null;
 
         var oldSelectedAbsoluteIndex = this._filteredItems[this._selectedIndexInFiltered];