DevTools: Move "enter" logic from ConsoleView to ConsolePrompt

third_party/WebKit/Source/devtools/front_end/console/ConsolePrompt.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @extends {WebInspector.Widget}
  */
 WebInspector.ConsolePrompt = function()
 {
@@ skipping 50 matching lines @@
 
     clearAutocomplete: function()
     {
         if (this._editor)
             this._editor.clearAutocomplete();
     },
 
     /**
      * @return {boolean}
      */
-    isCaretInsidePrompt: function()
-    {
-        return this.hasFocus();
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isCaretAtEndOfPrompt: function()
+    _isCaretAtEndOfPrompt: function()
     {
         return !!this._editor && this._editor.selection().collapseToEnd().equal(this._editor.fullRange().collapseToEnd());
     },
 
-    /**

[einbinder, 2016/09/22 22:38:14]

All these helper methods get to go away!

-     * @return {boolean}
-     */
-    isCaretOnLastLine: function()
-    {
-        return !!this._editor && this._editor.selection().endLine === this._editor.fullRange().endLine;
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isCaretOnFirstLine: function()
-    {
-        return !!this._editor && this._editor.selection().endLine === 0;
-    },
-
     moveCaretToEndOfPrompt: function()
     {
         if (this._editor)
             this._editor.setSelection(WebInspector.TextRange.createFromLocation(Infinity,Infinity));
     },
 
-    moveCaretToEndOfFirstLine: function()
-    {
-        if (this._editor)
-            this._editor.setSelection(WebInspector.TextRange.createFromLocation(0,Infinity));
-    },
-
     /**
      * @param {string} text
      */
     setText: function(text)
     {
         if (this._editor)
             this._editor.setText(text);
         else
             this._initialText = text;
     },
 
     /**
      * @return {string}
      */
     text: function()
     {
         return this._editor ? this._editor.text() : this._initialText;
     },
 
-    newlineAndIndent: function()
-    {
-        this._editor.newlineAndIndent();
-    },
-
     /**
      * @param {boolean} value
      */
     setAddCompletionsFromHistory: function(value)
     {
         this._addCompletionsFromHistory = value;
     },
 
     /**
      * @param {!Event} event
      */
     _editorKeyDown: function(event)
     {
         var keyboardEvent = /** @type {!KeyboardEvent} */ (event);
         var newText;
         var isPrevious;
 
         switch (keyboardEvent.keyCode) {
         case WebInspector.KeyboardShortcut.Keys.Up.code:
-            if (!this.isCaretOnFirstLine())
+            if (this._editor.selection().endLine > 0)
                 break;
             newText = this._history.previous(this.text());
             isPrevious = true;
             break;
         case WebInspector.KeyboardShortcut.Keys.Down.code:
-            if (!this.isCaretOnLastLine())
+            if (this._editor.selection().endLine < this._editor.fullRange().endLine)
                 break;
             newText = this._history.next();
             break;
         case WebInspector.KeyboardShortcut.Keys.P.code: // Ctrl+P = Previous
             if (WebInspector.isMac() && keyboardEvent.ctrlKey && !keyboardEvent.metaKey && !keyboardEvent.altKey && !keyboardEvent.shiftKey) {
                 newText = this._history.previous(this.text());
                 isPrevious = true;
             }
             break;
         case WebInspector.KeyboardShortcut.Keys.N.code: // Ctrl+N = Next
             if (WebInspector.isMac() && keyboardEvent.ctrlKey && !keyboardEvent.metaKey && !keyboardEvent.altKey && !keyboardEvent.shiftKey)
                 newText = this._history.next();
             break;
+        case WebInspector.KeyboardShortcut.Keys.Enter.code:
+            this._enterKeyPressed(keyboardEvent);
+            break;
         }
 
         if (newText === undefined)
             return;
         keyboardEvent.consume(true);
         this.setText(newText);
 
         if (isPrevious)
-            this.moveCaretToEndOfFirstLine();
+            this._editor.setSelection(WebInspector.TextRange.createFromLocation(0,Infinity));
         else
             this.moveCaretToEndOfPrompt();
     },
 
     /**
+     * @param {!KeyboardEvent} event
+     */
+    _enterKeyPressed: function(event)
+    {
+        if (event.altKey || event.ctrlKey || event.shiftKey)
+            return;
+
+        event.consume(true);
+
+        this.clearAutocomplete();
+
+        var str = this.text();
+        if (!str.length)
+            return;
+
+        var target = WebInspector.targetManager.mainTarget();
+        var currentExecutionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
+        if (!this._isCaretAtEndOfPrompt() || !target || !currentExecutionContext) {
+            this._appendCommand(str, true);
+            return;
+        }
+        target.runtimeModel.compileScript(str, "", false, currentExecutionContext.id, compileCallback.bind(this));
+
+        /**
+         * @param {!RuntimeAgent.ScriptId=} scriptId
+         * @param {?RuntimeAgent.ExceptionDetails=} exceptionDetails
+         * @this {WebInspector.ConsolePrompt}
+         */
+        function compileCallback(scriptId, exceptionDetails)
+        {
+            if (str !== this.text())
+                return;
+            if (exceptionDetails && (exceptionDetails.exception.description === "SyntaxError: Unexpected end of input"
+                || exceptionDetails.exception.description === "SyntaxError: Unterminated template literal")) {
+                this._editor.newlineAndIndent();
+                this._enterProcessedForTest();
+                return;
+            }
+            this._appendCommand(str, true);
+            this._enterProcessedForTest();
+        }
+    },
+
+    /**
+     * @param {string} text
+     * @param {boolean} useCommandLineAPI
+     */
+    _appendCommand: function(text, useCommandLineAPI)
+    {
+        this.setText("");
+        var currentExecutionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
+        if (currentExecutionContext) {
+            WebInspector.ConsoleModel.evaluateCommandInConsole(currentExecutionContext, text, useCommandLineAPI);
+            if (WebInspector.inspectorView.currentPanel() && WebInspector.inspectorView.currentPanel().name === "console")
+                WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.CommandEvaluatedInConsolePanel);
+        }
+    },
+
+    _enterProcessedForTest: function() { },
+
+    /**
      * @param {string} prefix
      * @return {!WebInspector.SuggestBox.Suggestions}
      */
     _historyCompletions: function(prefix)
     {
-        if (!this._addCompletionsFromHistory || !this.isCaretAtEndOfPrompt())
+        if (!this._addCompletionsFromHistory || !this._isCaretAtEndOfPrompt())
             return [];
         var result = [];
         var text = this.text();
         var set = new Set();
         var data = this._history.historyData();
         for (var i = data.length - 1; i >= 0 && result.length < 50; --i) {
             var item = data[i];
             if (!item.startsWith(text))
                 continue;
             if (set.has(item))
@@ skipping 52 matching lines @@
         function innerWordsWithPrefix(words)
         {
             fulfill(words.map(item => ({title:item})).concat(historyWords));
         }
     },
 
     _editorSetForTest: function() { },
 
     __proto__: WebInspector.Widget.prototype
 }