Changeset 186217 in webkit

Timestamp:

Jul 1, 2015 9:30:53 PM (9 years ago)

Author:

Devin Rousso

Message:

Web Inspector: When autocompleting, pressing tab twice shouldn't insert a tab character
​https://bugs.webkit.org/show_bug.cgi?id=145885

Reviewed by Timothy Hatcher.

• UserInterface/Controllers/CodeMirrorCompletionController.js:

(WebInspector.CodeMirrorCompletionController):
(WebInspector.CodeMirrorCompletionController.prototype.updateCompletions): Resolves the promise as having completions.
(WebInspector.CodeMirrorCompletionController.prototype.hideCompletions): Resolves the promise as not having completions.
(WebInspector.CodeMirrorCompletionController.prototype.completeAtCurrentPositionIfNeeded): Returns a WrappedPromise that allows
callers of this function to determine if the autocomplete had any values or was instead not shown.
(WebInspector.CodeMirrorCompletionController.prototype._resolveUpdatePromise):

• UserInterface/Main.html: Added WrappedPromise class.
• UserInterface/Models/WrappedPromise.js: Added WrappedPromise object to expose resolve and reject functions.
• UserInterface/Views/ConsolePrompt.js:

(WebInspector.ConsolePrompt.prototype._handleTabKey): Attempts to find completions for current text. If there are none, beep.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/CodeMirrorCompletionController.js (modified) (6 diffs)
• UserInterface/Main.html (modified) (1 diff)
• UserInterface/Models/WrappedPromise.js (added)
• UserInterface/Views/ConsolePrompt.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-07-01  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: When autocompleting, pressing tab twice shouldn't insert a tab character
+        https://bugs.webkit.org/show_bug.cgi?id=145885
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Controllers/CodeMirrorCompletionController.js:
+        (WebInspector.CodeMirrorCompletionController):
+        (WebInspector.CodeMirrorCompletionController.prototype.updateCompletions): Resolves the promise as having completions.
+        (WebInspector.CodeMirrorCompletionController.prototype.hideCompletions): Resolves the promise as not having completions.
+        (WebInspector.CodeMirrorCompletionController.prototype.completeAtCurrentPositionIfNeeded): Returns a WrappedPromise that allows
+        callers of this function to determine if the autocomplete had any values or was instead not shown.
+        (WebInspector.CodeMirrorCompletionController.prototype._resolveUpdatePromise):
+        * UserInterface/Main.html: Added WrappedPromise class.
+        * UserInterface/Models/WrappedPromise.js: Added WrappedPromise object to expose resolve and reject functions.
+        * UserInterface/Views/ConsolePrompt.js:
+        (WebInspector.ConsolePrompt.prototype._handleTabKey): Attempts to find completions for current text.  If there are none, beep.
+
 2015-07-01  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js

@@ -69 +69 @@
         this._codeMirror.on("blur", this._handleHideActionListener);
         this._codeMirror.on("scroll", this._handleHideActionListener);
+
+        this._updatePromise = null;
     }
 
@@ -126 +128 @@
 
         this._applyCompletionHint(completions[index]);
+
+        this._resolveUpdatePromise(WebInspector.CodeMirrorCompletionController.UpdatePromise.CompletionsFound);
     }
 
@@ -159 +163 @@
         delete this._currentCompletion;
         delete this._ignoreNextCursorActivity;
+
+        this._resolveUpdatePromise(WebInspector.CodeMirrorCompletionController.UpdatePromise.NoCompletionsFound);
     }
 
@@ -171 +177 @@
     }
 
+    completeAtCurrentPositionIfNeeded(force)
+    {
+        this._resolveUpdatePromise(WebInspector.CodeMirrorCompletionController.UpdatePromise.Canceled);
+
+        var update = this._updatePromise = new WebInspector.WrappedPromise;
+
+        this._completeAtCurrentPosition(force);
+
+        return update.promise;
+    }
+
     // Protected
 
@@ -193 +210 @@
 
     // Private
+
+    _resolveUpdatePromise(message)
+    {
+        if (!this._updatePromise)
+            return;
+
+        this._updatePromise.resolve(message);
+        this._updatePromise = null;
+    }
 
     get _currentReplacementText()
@@ -803 +829 @@
 };
 
+WebInspector.CodeMirrorCompletionController.UpdatePromise = {
+    Canceled: "code-mirror-completion-controller-canceled",
+    CompletionsFound: "code-mirror-completion-controller-completions-found",
+    NoCompletionsFound: "code-mirror-completion-controller-no-completions-found"
+};
+
 WebInspector.CodeMirrorCompletionController.GenericStopCharactersRegex = /[\s=:;,]/;
 WebInspector.CodeMirrorCompletionController.DefaultStopCharactersRegexModeMap = {"css": /[\s:;,{}()]/, "javascript": /[\s=:;,!+\-*/%&|^~?<>.{}()[\]]/};

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -311 +311 @@
     <script src="Models/TypeSet.js"></script>
     <script src="Models/UnitBezier.js"></script>
+    <script src="Models/WrappedPromise.js"></script>
 
     <script src="Views/ConsoleCommandView.js"></script>

trunk/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js

@@ -52 +52 @@
         "Enter": this._handleEnterKey.bind(this),
         "Cmd-Enter": this._handleCommandEnterKey.bind(this),
+        "Tab": this._handleTabKey.bind(this),
         "Esc": this._handleEscapeKey.bind(this)
     };
@@ -164 +165 @@
 
     // Private
+
+    _handleTabKey: function(codeMirror)
+    {
+        this._completionController.completeAtCurrentPositionIfNeeded().then(function(result) {
+            if (result === WebInspector.CodeMirrorCompletionController.UpdatePromise.NoCompletionsFound)
+                InspectorFrontendHost.beep();
+        });
+    },
 
     _handleEscapeKey: function(codeMirror)