DevTools: Move "enter" logic from ConsoleView to ConsolePrompt

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 759 matching lines @@
 
     /**
      * @param {!Event} event
      */
     _promptKeyDown: function(event)
     {
         var keyboardEvent = /** @type {!KeyboardEvent} */ (event);
         if (keyboardEvent.key === "PageUp") {
             this._updateStickToBottomOnWheel();
             return;
-        } else if (isEnterKey(keyboardEvent)) {
-            this._enterKeyPressed(keyboardEvent);
-            return;
         }
 
         var shortcut = WebInspector.KeyboardShortcut.makeKeyFromEvent(keyboardEvent);
         var handler = this._shortcuts[shortcut];
         if (handler) {
             handler();
             keyboardEvent.preventDefault();
         }
     },
 
-    _enterKeyPressed: function(event)
-    {
-        if (event.altKey || event.ctrlKey || event.shiftKey)
-            return;
-
-        event.consume(true);
-
-        this._prompt.clearAutocomplete();
-
-        var str = this._prompt.text();
-        if (!str.length)
-            return;
-
-        var target = WebInspector.targetManager.mainTarget();
-        var currentExecutionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
-        if (!this._prompt.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.ConsoleView}
-         */
-        function compileCallback(scriptId, exceptionDetails)
-        {
-            if (str !== this._prompt.text())
-                return;
-            if (exceptionDetails && (exceptionDetails.exception.description === "SyntaxError: Unexpected end of input"
-                || exceptionDetails.exception.description === "SyntaxError: Unterminated template literal")) {
-                this._prompt.newlineAndIndent();
-                return;
-            }
-            this._appendCommand(str, true);
-        }
-    },
-
     /**
      * @param {?WebInspector.RemoteObject} result
      * @param {!WebInspector.ConsoleMessage} originatingConsoleMessage
      * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
      */
     _printResult: function(result, originatingConsoleMessage, exceptionDetails)
     {
         if (!result)
             return;
 
         var level = !!exceptionDetails ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log;
         var message;
         if (!exceptionDetails)
             message = new WebInspector.ConsoleMessage(result.target(), WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, undefined, undefined, undefined, undefined, [result]);
         else
             message = WebInspector.ConsoleMessage.fromException(result.target(), exceptionDetails, WebInspector.ConsoleMessage.MessageType.Result, undefined, undefined);
         message.setOriginatingMessage(originatingConsoleMessage);
         result.target().consoleModel.addMessage(message);
     },
 
     /**
-     * @param {string} text
-     * @param {boolean} useCommandLineAPI
-     */
-    _appendCommand: function(text, useCommandLineAPI)
-    {
-        this._prompt.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);
-        }
-    },
-
-    /**
      * @param {!WebInspector.Event} event
      */
     _commandEvaluated: function(event)
     {
         var data = /** @type {{result: ?WebInspector.RemoteObject, text: string, commandMessage: !WebInspector.ConsoleMessage, exceptionDetails: (!RuntimeAgent.ExceptionDetails|undefined)}} */ (event.data);
         this._prompt.history().pushHistoryItem(data.text);
         this._consoleHistorySetting.set(this._prompt.history().historyData().slice(-WebInspector.ConsoleView.persistedHistorySize));
         this._printResult(data.result, data.commandMessage, data.exceptionDetails);
     },
 
@@ skipping 563 matching lines @@
             return true;
         }
         return false;
     }
 }
 
 /**
 * @typedef {{messageIndex: number, matchIndex: number}}
 */
 WebInspector.ConsoleView.RegexMatchRange;