DevTools: move ui messages from SourceFrame to UISourceCodeFrame (step2)

third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * 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 21 matching lines @@
  * @param {!WebInspector.UISourceCode} uiSourceCode
  */
 WebInspector.UISourceCodeFrame = function(uiSourceCode)
 {
     this._uiSourceCode = uiSourceCode;
     WebInspector.SourceFrame.call(this, this._uiSourceCode);
     this.textEditor.setAutocompleteDelegate(new WebInspector.SimpleAutocompleteDelegate());
     this._rowMessageBuckets = {};
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
+    this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.MessageAdded, this._onMessageAdded, this);
+    this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.MessageRemoved, this._onMessageRemoved, this);
     this._updateStyle();
 
     this._errorPopoverHelper = new WebInspector.PopoverHelper(this.element, this._getErrorAnchor.bind(this), this._showErrorPopover.bind(this));
     this._errorPopoverHelper.setTimeout(100, 100);
 }
 
 WebInspector.UISourceCodeFrame.prototype = {
     /**
      * @return {!WebInspector.UISourceCode}
      */
@@ skipping 49 matching lines @@
     commitEditing: function()
     {
         if (!this._uiSourceCode.isDirty())
             return;
 
         this._muteSourceCodeEvents = true;
         this._uiSourceCode.commitWorkingCopy();
         delete this._muteSourceCodeEvents;
     },
 
+    onTextEditorContentLoaded: function()

[dgozman, 2015/10/27 21:43:49]

@override

[pfeldman, 2015/10/27 22:35:17]

Done.

+    {
+        WebInspector.SourceFrame.prototype.onTextEditorContentLoaded.call(this);
+        this._clearMessages();
+        for (var message of this._uiSourceCode.messages())
+            this._addMessageToSource(message);
+    },
+
     onTextChanged: function(oldRange, newRange)

[dgozman, 2015/10/27 21:43:49]

mind adding JSDoc?

[pfeldman, 2015/10/27 22:35:17]

Done.

     {
         WebInspector.SourceFrame.prototype.onTextChanged.call(this, oldRange, newRange);
-        this.clearMessages();
+        this._clearMessages();

[dgozman, 2015/10/27 21:43:49]

Do we abandon old messages? If so, who will clear them in UISourceCode? If not,
where do we show them again?

[pfeldman, 2015/10/27 22:35:17]

Good call. Let me erase all messages from uiSourceCode upon editing.

         if (this._isSettingContent)
             return;
         this._muteSourceCodeEvents = true;
         if (this._textEditor.isClean())
             this._uiSourceCode.resetWorkingCopy();
         else
             this._uiSourceCode.setWorkingCopyGetter(this._textEditor.text.bind(this._textEditor));
         delete this._muteSourceCodeEvents;
     },
 
-    onTextEditorContentLoaded: function()
-    {
-        WebInspector.SourceFrame.prototype.onTextEditorContentLoaded.call(this);
-        this.clearMessages();
-    },
-
     /**
      * @param {!WebInspector.Event} event
      */
     _onWorkingCopyChanged: function(event)
     {
         if (this._muteSourceCodeEvents)
             return;
         this._innerSetContent(this._uiSourceCode.workingCopy());
         this.onUISourceCodeContentChanged();
     },
@@ skipping 53 matching lines @@
         this.doResize();
     },
 
     dispose: function()
     {
         this._textEditor.dispose();
         this.detach();
     },
 
     /**
+     * @param {!WebInspector.Event} event
+     */
+    _onMessageAdded: function(event)
+    {
+        var message = /** @type {!WebInspector.UISourceCode.Message} */ (event.data);
+        this._addMessageToSource(message);
+    },
+
+    /**
      * @param {!WebInspector.UISourceCode.Message} message
      */
-    addMessageToSource: function(message)
+    _addMessageToSource: function(message)
     {
         var lineNumber = message.lineNumber();
         if (lineNumber >= this._textEditor.linesCount)
             lineNumber = this._textEditor.linesCount - 1;
         if (lineNumber < 0)
             lineNumber = 0;
 
         if (!this._rowMessageBuckets[lineNumber])
             this._rowMessageBuckets[lineNumber] = new WebInspector.UISourceCodeFrame.RowMessageBucket(this, this._textEditor, lineNumber);
         var messageBucket = this._rowMessageBuckets[lineNumber];
         messageBucket.addMessage(message);
     },
 
     /**
+     * @param {!WebInspector.Event} event
+     */
+    _onMessageRemoved: function(event)
+    {
+        var message = /** @type {!WebInspector.UISourceCode.Message} */ (event.data);
+        this._removeMessageFromSource(message);
+    },
+
+    /**
      * @param {!WebInspector.UISourceCode.Message} message
      */
-    removeMessageFromSource: function(message)
+    _removeMessageFromSource: function(message)
     {
         var lineNumber = message.lineNumber();
         if (lineNumber >= this._textEditor.linesCount)
             lineNumber = this._textEditor.linesCount - 1;
         if (lineNumber < 0)
             lineNumber = 0;
 
         var messageBucket = this._rowMessageBuckets[lineNumber];
         if (!messageBucket)
             return;
         messageBucket.removeMessage(message);
         if (!messageBucket.uniqueMessagesCount()) {
             messageBucket.detachFromEditor();
             delete this._rowMessageBuckets[lineNumber];
         }
     },
 
-    clearMessages: function()
+    _clearMessages: function()
     {
         for (var line in this._rowMessageBuckets) {
             var bubble = this._rowMessageBuckets[line];
             bubble.detachFromEditor();
         }
 
         this._rowMessageBuckets = {};
         this._errorPopoverHelper.hidePopover();
     },
 
@@ skipping 102 matching lines @@
     dispose: function()
     {
         this.element.remove();
         this._onResize();
         delete this._uiSourceCodeFrame;
     },
 
     __proto__: WebInspector.Infobar.prototype
 }
 
-/**
- * @param {!WebInspector.ConsoleMessage} consoleMessage
- * @param {number} lineNumber
- * @param {number} columnNumber
- * @return {!WebInspector.UISourceCode.Message}
- */
-WebInspector.UISourceCodeFrame.uiMessageFromConsoleMessage = function(consoleMessage, lineNumber, columnNumber)
-{
-    console.assert(consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Warning);
-    var level = consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error ? WebInspector.UISourceCode.Message.Level.Error : WebInspector.UISourceCode.Message.Level.Warning;
-    return new WebInspector.UISourceCode.Message(level, consoleMessage.messageText, lineNumber, columnNumber);
-}
-
 WebInspector.UISourceCodeFrame._iconClassPerLevel = {};
 WebInspector.UISourceCodeFrame._iconClassPerLevel[WebInspector.UISourceCode.Message.Level.Error] = "error-icon";
 WebInspector.UISourceCodeFrame._iconClassPerLevel[WebInspector.UISourceCode.Message.Level.Warning] = "warning-icon";
 
 WebInspector.UISourceCodeFrame._lineClassPerLevel = {};
 WebInspector.UISourceCodeFrame._lineClassPerLevel[WebInspector.UISourceCode.Message.Level.Error] = "text-editor-line-with-error";
 WebInspector.UISourceCodeFrame._lineClassPerLevel[WebInspector.UISourceCode.Message.Level.Warning] = "text-editor-line-with-warning";
 
 /**
  * @constructor
@@ skipping 201 matching lines @@
 
 /**
  * @param {!WebInspector.UISourceCode.Message} a
  * @param {!WebInspector.UISourceCode.Message} b
  * @return {number}
  */
 WebInspector.UISourceCode.Message.messageLevelComparator = function(a, b)
 {
     return WebInspector.UISourceCode.Message._messageLevelPriority[a.level()] - WebInspector.UISourceCode.Message._messageLevelPriority[b.level()];
 }