Changeset 107402 in webkit

Timestamp:

Feb 10, 2012 7:41:41 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [TextPrompt] TAB should complete suggestions up to their common prefix in Console
​https://bugs.webkit.org/show_bug.cgi?id=78236

Reviewed by Vsevolod Vlasov.

• inspector/front-end/TextPrompt.js:

(WebInspector.TextPrompt.prototype._completionsReady):
(WebInspector.TextPrompt.prototype._completeCommonPrefix):
(WebInspector.TextPrompt.prototype.acceptSuggestion):
(WebInspector.TextPrompt.prototype.tabKeyPressed):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextPrompt.js (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-10  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [TextPrompt] TAB should complete suggestions up to their common prefix in Console
+        https://bugs.webkit.org/show_bug.cgi?id=78236
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/front-end/TextPrompt.js:
+        (WebInspector.TextPrompt.prototype._completionsReady):
+        (WebInspector.TextPrompt.prototype._completeCommonPrefix):
+        (WebInspector.TextPrompt.prototype.acceptSuggestion):
+        (WebInspector.TextPrompt.prototype.tabKeyPressed):
+
 2012-02-10  Pavel Feldman  <pfeldman@google.com>
 

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

@@ -401 +401 @@
 
     /**
+     * @param {Array.<string>} completions
+     * @param {number} wordPrefixLength
+     */
+    _buildCommonPrefix: function(completions, wordPrefixLength)
+    {
+        var commonPrefix = completions[0];
+        for (var i = 0; i < completions.length; ++i) {
+            var completion = completions[i];
+            var lastIndex = Math.min(commonPrefix.length, completion.length);
+            for (var j = wordPrefixLength; j < lastIndex; ++j) {
+                if (commonPrefix[j] !== completion[j]) {
+                    commonPrefix = commonPrefix.substr(0, j);
+                    break;
+                }
+            }
+        }
+        return commonPrefix;
+    },
+
+    /**
      * @param {Selection} selection
      * @param {boolean} auto
@@ -431 +451 @@
         var wordPrefixLength = originalWordPrefixRange.toString().length;
 
-        if (auto)
+        if (auto) {
             var completionText = completions[0];
-        else {
+            var commonPrefix = this._buildCommonPrefix(completions, wordPrefixLength);
+
+            this._commonPrefix = commonPrefix;
+        } else {
             if (completions.length === 1) {
                 var completionText = completions[0];
                 wordPrefixLength = completionText.length;
             } else {
-                var commonPrefix = completions[0];
-                for (var i = 0; i < completions.length; ++i) {
-                    var completion = completions[i];
-                    var lastIndex = Math.min(commonPrefix.length, completion.length);
-                    for (var j = wordPrefixLength; j < lastIndex; ++j) {
-                        if (commonPrefix[j] !== completion[j]) {
-                            commonPrefix = commonPrefix.substr(0, j);
-                            break;
-                        }
-                    }
-                }
+                var commonPrefix = this._buildCommonPrefix(completions, wordPrefixLength);
                 wordPrefixLength = commonPrefix.length;
 
@@ -499 +512 @@
     },
 
+    _completeCommonPrefix: function()
+    {
+        if (!this.autoCompleteElement || !this._commonPrefix || !this._userEnteredText || this._commonPrefix.indexOf(this._userEnteredText) !== 0)
+            return;
+
+        if (!this.isSuggestBoxVisible()) {
+            this.acceptAutoComplete();
+            return;
+        }
+
+        this.autoCompleteElement.textContent = this._commonPrefix.substring(this._userEnteredText.length);
+        this.acceptSuggestion(true)
+    },
+
     /**
      * @param {Range=} originalPrefixRange
@@ -534 +561 @@
     },
 
-    acceptSuggestion: function()
+    /**
+     * @param {boolean=} prefixAccepted
+     */
+    acceptSuggestion: function(prefixAccepted)
     {
         if (this._isAcceptingSuggestion)
@@ -555 +585 @@
         selection.addRange(finalSelectionRange);
 
-        this.hideSuggestBox();
-        this.dispatchEventToListeners(WebInspector.TextPrompt.Events.ItemAccepted);
+        if (!prefixAccepted) {
+            this.hideSuggestBox();
+            this.dispatchEventToListeners(WebInspector.TextPrompt.Events.ItemAccepted);
+        } else
+            this.autoCompleteSoon(true);
 
         return true;
@@ -664 +697 @@
     tabKeyPressed: function(event)
     {
-        // Just consume the key.
+        this._completeCommonPrefix();
+
+        // Consume the key.
         return true;
     },