DevTools: [console] Logged promise rejections do not change state once handled

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 118 matching lines @@
 
     this._registerShortcuts();
 
     this._messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
     WebInspector.moduleSetting("monitoringXHREnabled").addChangeListener(this._monitoringXHREnabledSettingChanged, this);
 
     this._linkifier = new WebInspector.Linkifier();
 
     /** @type {!Array.<!WebInspector.ConsoleViewMessage>} */
     this._consoleMessages = [];
+    this._viewMessageSymbol = Symbol("viewMessage");
 
     this._prompt = new WebInspector.TextPromptWithHistory(WebInspector.ExecutionContextSelector.completionsForTextPromptInCurrentContext);
     this._prompt.setSuggestBoxEnabled(true);
     this._prompt.setAutocompletionTimeout(0);
     this._prompt.renderAsBlock();
     var proxyElement = this._prompt.attach(this._promptElement);
     proxyElement.addEventListener("keydown", this._promptKeyDown.bind(this), false);
 
     this._consoleHistorySetting = WebInspector.settings.createLocalSetting("consoleHistory", []);
     var historyData = this._consoleHistorySetting.get();
@@ skipping 143 matching lines @@
         var level = WebInspector.ConsoleMessage.MessageLevel.Debug;
         switch (message.level) {
         case WebInspector.Console.MessageLevel.Error:
             level = WebInspector.ConsoleMessage.MessageLevel.Error;
             break;
         case WebInspector.Console.MessageLevel.Warning:
             level = WebInspector.ConsoleMessage.MessageLevel.Warning;
             break;
         }
 
-        var consoleMessage = new WebInspector.ConsoleMessage(null, WebInspector.ConsoleMessage.MessageSource.Other, level, message.text,
+        var consoleMessage = new WebInspector.ConsoleMessage(null, 0, WebInspector.ConsoleMessage.MessageSource.Other, level, message.text,
                 undefined, undefined, undefined, undefined, undefined, undefined, undefined, message.timestamp);
         this._addConsoleMessage(consoleMessage);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _consoleTimestampsSettingChanged: function(event)
     {
         var enabled = /** @type {boolean} */ (event.data);
@@ skipping 237 matching lines @@
         /**
          * @param {!WebInspector.ConsoleViewMessage} viewMessage1
          * @param {!WebInspector.ConsoleViewMessage} viewMessage2
          * @return {number}
          */
         function compareTimestamps(viewMessage1, viewMessage2)
         {
             return WebInspector.ConsoleMessage.timestampComparator(viewMessage1.consoleMessage(), viewMessage2.consoleMessage());
         }
 
+        if (message.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError) {
+            var relatedMessage = message.relatedMessage();
+            if (relatedMessage) {
+                relatedMessage.level = WebInspector.ConsoleMessage.MessageLevel.RevokedError;

[dgozman, 2015/04/21 09:16:35]

Why does view mutate model objects? Let's move this logic to ConsoleModel.

[pfeldman, 2015/04/21 12:15:27]

Done.

+                var viewMessage = relatedMessage[this._viewMessageSymbol];
+                if (viewMessage)
+                    viewMessage.updateMessageElement();
+            }
+            return;
+        }
+
         if (message.type === WebInspector.ConsoleMessage.MessageType.Command || message.type === WebInspector.ConsoleMessage.MessageType.Result)
             message.timestamp = this._consoleMessages.length ? this._consoleMessages.peekLast().consoleMessage().timestamp : 0;
         var viewMessage = this._createViewMessage(message);
+        message[this._viewMessageSymbol] = viewMessage;

[dgozman, 2015/04/21 09:16:35]

I think we will not get rid of this, even if we completely revamp console
later...

[pfeldman, 2015/04/21 12:15:27]

Model and ui messages go hand in hand. When model is cleared, view is cleared.

         var insertAt = insertionIndexForObjectInListSortedByFunction(viewMessage, this._consoleMessages, compareTimestamps, true);
         var insertedInMiddle = insertAt < this._consoleMessages.length;
         this._consoleMessages.splice(insertAt, 0, viewMessage);
 
         if (this._urlToMessageCount[message.url])
             ++this._urlToMessageCount[message.url];
         else
             this._urlToMessageCount[message.url] = 1;
 
         if (!insertedInMiddle) {
@@ skipping 27 matching lines @@
             return;
 
         var lastMessage = this._visibleViewMessages.peekLast();
         if (viewMessage.consoleMessage().type === WebInspector.ConsoleMessage.MessageType.EndGroup) {
             if (lastMessage && !this._currentGroup.messagesHidden())
                 lastMessage.incrementCloseGroupDecorationCount();
             this._currentGroup = this._currentGroup.parentGroup();
             return;
         }
         if (!this._currentGroup.messagesHidden()) {
-            var originatingMessage = viewMessage.consoleMessage().originatingMessage();
-            if (lastMessage && originatingMessage && lastMessage.consoleMessage() === originatingMessage)
+            var relatedMessage = viewMessage.consoleMessage().relatedMessage();
+            if (lastMessage && relatedMessage && relatedMessage.type === WebInspector.ConsoleMessage.MessageType.Command && lastMessage.consoleMessage() === relatedMessage)
                 lastMessage.toMessageElement().classList.add("console-adjacent-user-command-result");
 
             this._visibleViewMessages.push(viewMessage);
             this._searchMessage(this._visibleViewMessages.length - 1);
         }
 
         if (viewMessage.consoleMessage().isGroupStartMessage())
             this._currentGroup = new WebInspector.ConsoleGroup(this._currentGroup, viewMessage);
 
         this._messageAppendedForTests();
@@ skipping 286 matching lines @@
      * @param {?DebuggerAgent.ExceptionDetails=} exceptionDetails
      */
     _printResult: function(result, wasThrown, originatingConsoleMessage, exceptionDetails)
     {
         if (!result)
             return;
 
         var level = wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log;
         var message;
         if (!wasThrown)
-            message = new WebInspector.ConsoleMessage(result.target(), WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, undefined, undefined, undefined, undefined, [result]);
+            message = new WebInspector.ConsoleMessage(result.target(), 0, WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, undefined, undefined, undefined, undefined, [result]);
         else
-            message = new WebInspector.ConsoleMessage(result.target(), WebInspector.ConsoleMessage.MessageSource.JS, level, exceptionDetails.text, WebInspector.ConsoleMessage.MessageType.Result, exceptionDetails.url, exceptionDetails.line, exceptionDetails.column, undefined, [WebInspector.UIString("Uncaught"), result], exceptionDetails.stackTrace, undefined, undefined, undefined, exceptionDetails.scriptId);
-        message.setOriginatingMessage(originatingConsoleMessage);
+            message = new WebInspector.ConsoleMessage(result.target(), 0, WebInspector.ConsoleMessage.MessageSource.JS, level, exceptionDetails.text, WebInspector.ConsoleMessage.MessageType.Result, exceptionDetails.url, exceptionDetails.line, exceptionDetails.column, undefined, [WebInspector.UIString("Uncaught"), result], exceptionDetails.stackTrace, undefined, undefined, undefined, exceptionDetails.scriptId);
+        message.setRelatedMessage(originatingConsoleMessage);
+        message.executionContextId = originatingConsoleMessage.executionContextId;
         result.target().consoleModel.addMessage(message);
     },
 
     /**
      * @param {string} text
      * @param {boolean} useCommandLineAPI
      */
     _appendCommand: function(text, useCommandLineAPI)
     {
         this._prompt.setText("");
@@ skipping 217 matching lines @@
 };
 
 WebInspector.ConsoleViewFilter.prototype = {
     addFilters: function(filterBar)
     {
         this._textFilterUI = new WebInspector.TextFilterUI(true);
         this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._textFilterChanged, this);
         filterBar.addFilter(this._textFilterUI);
 
         var levels = [
             {name: "error", label: WebInspector.UIString("Errors")},

[dgozman, 2015/04/21 09:16:35]

Either add revokedError here or better map it to error somehow.

[pfeldman, 2015/04/21 12:15:27]

Done.

             {name: "warning", label: WebInspector.UIString("Warnings")},
             {name: "info", label: WebInspector.UIString("Info")},
             {name: "log", label: WebInspector.UIString("Logs")},
             {name: "debug", label: WebInspector.UIString("Debug")}
         ];
         this._levelFilterUI = new WebInspector.NamedBitSetFilterUI(levels, this._messageLevelFiltersSetting);
         this._levelFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged, this);
         filterBar.addFilter(this._levelFilterUI);
         this._hideNetworkMessagesCheckbox = new WebInspector.CheckboxFilterUI("hide-network-messages", WebInspector.UIString("Hide network messages"), true, WebInspector.moduleSetting("hideNetworkMessages"));
         this._hideNetworkMessagesCheckbox.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this);
@@ skipping 248 matching lines @@
     handleAction: function(context, actionId)
     {
         WebInspector.console.show();
     }
 }
 
 /**
 * @typedef {{messageIndex: number, matchIndex: number}}
 */
 WebInspector.ConsoleView.RegexMatchRange;