Changeset 116244 in webkit

Timestamp:

May 6, 2012 3:19:45 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: "Goto Function" filtering should be less restrictive.
​https://bugs.webkit.org/show_bug.cgi?id=85586

Patch by Eugene Klyuchnikov <​eustas.bug@gmail.com> on 2012-05-06
Reviewed by Pavel Feldman.

Added tests for generated regex.

Changes:
1) Avoid asterisks in filtering queue.
2) Optimization: do not create regexp for each item.

• inspector/front-end/FilteredItemSelectionDialog.js:

(WebInspector.FilteredItemSelectionDialog.prototype.get _itemsLoaded):
Applied new filtering workflow.
(WebInspector.FilteredItemSelectionDialog.prototype._checkItemAt):
Removed.
(WebInspector.FilteredItemSelectionDialog.prototype._createSearchRegExp):
Removed unused "suffix" logic; changed the way regexp is composed from query.
(WebInspector.FilteredItemSelectionDialog.prototype._filterItems):
Applied new filtering workflow.
(WebInspector.FilteredItemSelectionDialog.prototype._onKeyDown):
Removed unused var.

Location:

trunk

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-06  Eugene Klyuchnikov  <eustas.bug@gmail.com>
+
+        Web Inspector: "Goto Function" filtering should be less restrictive.
+        https://bugs.webkit.org/show_bug.cgi?id=85586
+
+        Reviewed by Pavel Feldman.
+
+        Added tests for generated regex.
+
+        Changes:
+        1) Avoid asterisks in filtering queue.
+        2) Optimization: do not create regexp for each item.
+
+        * inspector/front-end/FilteredItemSelectionDialog.js: 
+        (WebInspector.FilteredItemSelectionDialog.prototype.get _itemsLoaded):
+        Applied new filtering workflow.
+        (WebInspector.FilteredItemSelectionDialog.prototype._checkItemAt):
+        Removed.
+        (WebInspector.FilteredItemSelectionDialog.prototype._createSearchRegExp):
+        Removed unused "suffix" logic; changed the way regexp is composed from query.
+        (WebInspector.FilteredItemSelectionDialog.prototype._filterItems):
+        Applied new filtering workflow.
+        (WebInspector.FilteredItemSelectionDialog.prototype._onKeyDown):
+        Removed unused var.
+
 2012-05-06  Kent Tamura  <tkent@chromium.org>
 

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

@@ -124 +124 @@
         var fragment = document.createDocumentFragment();
         var candidateItem = this._selectedElement;
+        var regex = this._createSearchRegExp(this._promptElement.value);
         for (var i = index; i < index + chunkLength; ++i) {
             var itemElement = this._createItemElement(i, this._delegate.itemTitleAt(i));
-            if (this._checkItemAt(i, this._promptElement.value)) {
+            if (regex.test(this._delegate.itemKeyAt(i))) {
                 if (!candidateItem)
                     candidateItem = itemElement;
@@ -188 +189 @@
 
     /**
-     * @param {number} index
-     */
-    _checkItemAt: function(index, query)
-    {
-        if (!query)
-            return true;
-        var regExp = this._createSearchRegExp(query);
-        var key = this._delegate.itemKeyAt(index);
-        return regExp.test(key);
-    },
-
-    /**
-     * @param {string=} query
+     * @param {?string} query
      * @param {boolean=} isGlobal
      */
     _createSearchRegExp: function(query, isGlobal)
     {
+        if (!query || !query.trim())
+            return new RegExp(".*");
+
         var trimmedQuery = query.trim();
-        var regExpString = trimmedQuery.escapeForRegExp().replace(/\\\*/g, ".*").replace(/(?!^)([A-Z])/g, "[^A-Z]*$1");
-        var isSuffix = (query.charAt(query.length - 1) === " ");
-        if (isSuffix)
-            regExpString += "$";
-        return new RegExp(regExpString, (trimmedQuery === trimmedQuery.toLowerCase() ? "i" : "") + (isGlobal ? "g" : ""));
+
+        var ignoreCase = (trimmedQuery === trimmedQuery.toLowerCase());
+
+        const toEscape = "^[]{}()\\.$*+?|";
+
+        var regExpString = "";
+        for (var i = 0; i < trimmedQuery.length; ++i) {
+            var c = trimmedQuery.charAt(i);
+            if (toEscape.indexOf(c) !== -1)
+                c = "\\" + c;
+            if (i)
+                regExpString += "[^" + c + "]*";
+            regExpString += c;
+        }
+
+        return new RegExp(regExpString, (ignoreCase ? "i" : "") + (isGlobal ? "g" : ""));
     },
 
@@ -221 +224 @@
         this._previousInputLength = query.length;
         query = query.trim();
+        var regex = this._createSearchRegExp(query);
 
         var firstElement;
@@ -227 +231 @@
             
             if (this._itemElementVisible(itemElement)) { 
-                if (!this._checkItemAt(i, query))
+                if (!regex.test(this._delegate.itemKeyAt(i)))
                     this._hideItemElement(itemElement);
-            } else if (!charsAdded && this._checkItemAt(i, query))
+            } else if (!charsAdded && regex.test(this._delegate.itemKeyAt(i)))
                 this._showItemElement(itemElement);
             
@@ -270 +274 @@
         }
 
-        var isPageScroll = false;
-
         if (this._selectedElement) {
             var candidate;
@@ -355 +357 @@
 
     /**
-     * @param {string=} query
+     * @param {!string} query
      */
     _highlightItems: function(query)