DevTools: move message management from UISourceCodeFrame to UISourceCode

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 28 matching lines @@
     this.setEditable(this._canEditSource());
 
     if (Runtime.experiments.isEnabled('sourceDiff'))
       this._diff = new Sources.SourceCodeDiff(uiSourceCode.requestOriginalContent(), this.textEditor);
 
     /** @type {?UI.AutocompleteConfig} */
     this._autocompleteConfig = {isWordChar: Common.TextUtils.isWordChar};
     Common.moduleSetting('textEditorAutocompletion').addChangeListener(this._updateAutocomplete, this);
     this._updateAutocomplete();
 
-    this._rowMessageBuckets = {};
+    /** @type {!Map<number, !Sources.UISourceCodeFrame.RowMessageBucket>} */
+    this._rowMessageBuckets = new Map();
     /** @type {!Set<string>} */
     this._typeDecorationsPending = new Set();
     this._uiSourceCode.addEventListener(
         Workspace.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
     this._uiSourceCode.addEventListener(
         Workspace.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
     this._uiSourceCode.addEventListener(Workspace.UISourceCode.Events.MessageAdded, this._onMessageAdded, this);
     this._uiSourceCode.addEventListener(Workspace.UISourceCode.Events.MessageRemoved, this._onMessageRemoved, this);
     this._uiSourceCode.addEventListener(
         Workspace.UISourceCode.Events.LineDecorationAdded, this._onLineDecorationAdded, this);
@@ skipping 107 matching lines @@
 
   /**
    * @override
    * @param {!Common.TextRange} oldRange
    * @param {!Common.TextRange} newRange
    */
   onTextChanged(oldRange, newRange) {
     if (this._diff)
       this._diff.updateDiffMarkersWhenPossible();
     super.onTextChanged(oldRange, newRange);
-    this._clearMessages();
+    this._errorPopoverHelper.hidePopover();
     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;
   }
 
@@ skipping 116 matching lines @@
   /**
    * @param {!Workspace.UISourceCode.Message} message
    */
   _addMessageToSource(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 Sources.UISourceCodeFrame.RowMessageBucket(this, this._textEditor, lineNumber);
+    var messageBucket = this._rowMessageBuckets.get(lineNumber);
+    if (!messageBucket) {
+      messageBucket = new Sources.UISourceCodeFrame.RowMessageBucket(this, this._textEditor, lineNumber);
+      this._rowMessageBuckets.set(lineNumber, messageBucket);
     }
-    var messageBucket = this._rowMessageBuckets[lineNumber];
     messageBucket.addMessage(message);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onMessageRemoved(event) {
     if (!this.loaded)
       return;
     var message = /** @type {!Workspace.UISourceCode.Message} */ (event.data);
     this._removeMessageFromSource(message);
   }
 
   /**
    * @param {!Workspace.UISourceCode.Message} message
    */
   _removeMessageFromSource(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];
+    var messageBucket = this._rowMessageBuckets.get(lineNumber);
     if (!messageBucket)
       return;
     messageBucket.removeMessage(message);
     if (!messageBucket.uniqueMessagesCount()) {
       messageBucket.detachFromEditor();
-      delete this._rowMessageBuckets[lineNumber];
+      this._rowMessageBuckets.delete(lineNumber);
     }
   }
 
-  _clearMessages() {
-    for (var line in this._rowMessageBuckets) {
-      var bubble = this._rowMessageBuckets[line];
-      bubble.detachFromEditor();
-    }
-
-    this._rowMessageBuckets = {};
-    this._errorPopoverHelper.hidePopover();
-    this._uiSourceCode.removeAllMessages();
-  }
-
   /**
    * @param {!Element} target
    * @param {!Event} event
    * @return {(!Element|undefined)}
    */
   _getErrorAnchor(target, event) {
     var element = target.enclosingNodeOrSelfWithClass('text-editor-line-decoration-icon') ||
         target.enclosingNodeOrSelfWithClass('text-editor-line-decoration-wave');
     if (!element)
       return;
     this._errorWavePopoverAnchor = new AnchorBox(event.clientX, event.clientY, 1, 1);
     return element;
   }
 
   /**
    * @param {!Element} anchor
    * @param {!UI.Popover} popover
    */
   _showErrorPopover(anchor, popover) {
     var messageBucket = anchor.enclosingNodeOrSelfWithClass('text-editor-line-decoration')._messageBucket;
     var messagesOutline = messageBucket.messagesDescription();
     var popoverAnchor =
         anchor.enclosingNodeOrSelfWithClass('text-editor-line-decoration-icon') ? anchor : this._errorWavePopoverAnchor;
     popover.showForAnchor(messagesOutline, popoverAnchor);
   }
 
   _updateBucketDecorations() {
-    for (var line in this._rowMessageBuckets) {
-      var bucket = this._rowMessageBuckets[line];
+    for (var bucket of this._rowMessageBuckets.values())
       bucket._updateDecoration();
-    }
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onLineDecorationAdded(event) {
     var marker = /** @type {!Workspace.UISourceCode.LineMarker} */ (event.data);
     this._decorateTypeThrottled(marker.type());
   }
 
@@ skipping 249 matching lines @@
 
 /**
  * @param {!Workspace.UISourceCode.Message} a
  * @param {!Workspace.UISourceCode.Message} b
  * @return {number}
  */
 Workspace.UISourceCode.Message.messageLevelComparator = function(a, b) {
   return Workspace.UISourceCode.Message._messageLevelPriority[a.level()] -
       Workspace.UISourceCode.Message._messageLevelPriority[b.level()];
 };