Devtools: Pretty print fix for CSS coverage decorations.

third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
       this._origin = '';
       this._parentURL = '';
       this._name = url;
     }
 
     this._contentType = contentType;
     /** @type {?function(?string)} */
     this._requestContentCallback = null;
     /** @type {?Promise<?string>} */
     this._requestContentPromise = null;
-    /** @type {!Map<string, !Map<number, !Workspace.UISourceCode.LineMarker>>} */
-    this._lineDecorations = new Map();
+    /** @type {!Map<string, !Array<!Workspace.UISourceCode.LineMarker>>} */

[lushnikov, 2016/11/16 22:53:54]

Map<string, Array<LineMarker>> is a... Multimap<string, LineMarker>!

+    this._decorations = new Map();
 
     /** @type {!Array.<!Workspace.Revision>} */
     this.history = [];
 
     /** @type {!Array<!Workspace.UISourceCode.Message>} */
     this._messages = [];
   }
 
   /**
    * @return {!Promise<?Workspace.UISourceCodeMetadata>}
@@ skipping 526 matching lines @@
     for (var message of messages)
       this.dispatchEventToListeners(Workspace.UISourceCode.Events.MessageRemoved, message);
   }
 
   /**
    * @param {number} lineNumber
    * @param {string} type
    * @param {?} data
    */
   addLineDecoration(lineNumber, type, data) {
-    var markers = this._lineDecorations.get(type);
-    if (!markers) {
-      markers = new Map();
-      this._lineDecorations.set(type, markers);
-    }
-    var marker = new Workspace.UISourceCode.LineMarker(lineNumber, type, data);
-    markers.set(lineNumber, marker);
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationAdded, marker);
+    this.addDecoration(Common.TextRange.createFromLocation(lineNumber, 0), type, data);
   }
 
   /**
-   * @param {number} lineNumber
+   * @param {!Common.TextRange} range
    * @param {string} type
+   * @param {?} data
    */
-  removeLineDecoration(lineNumber, type) {
-    var markers = this._lineDecorations.get(type);
-    if (!markers)
-      return;
-    var marker = markers.get(lineNumber);
-    if (!marker)
-      return;
-    markers.delete(lineNumber);
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationRemoved, marker);
-    if (!markers.size)
-      this._lineDecorations.delete(type);
+  addDecoration(range, type, data) {
+    var markers = this._decorations.get(type);
+    if (!markers) {
+      markers = [];
+      this._decorations.set(type, markers);
+    }
+    var marker = new Workspace.UISourceCode.LineMarker(range, type, data);
+    markers.push(marker);
+    this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationAdded, marker);
   }
 
   /**
    * @param {string} type
    */
-  removeAllLineDecorations(type) {
-    var markers = this._lineDecorations.get(type);
+  removeAllTypeDecorations(type) {

[lushnikov, 2016/11/16 22:53:54]

removeDecorationsForType

+    var markers = this._decorations.get(type);
     if (!markers)
       return;
-    this._lineDecorations.delete(type);
+    this._decorations.delete(type);
     markers.forEach(marker => {
       this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationRemoved, marker);
     });
   }
 
   /**
+   * @return {!Map<string, !Array<!Workspace.UISourceCode.LineMarker>>}

[lushnikov, 2016/11/16 22:53:54]

why does it return a map? Let's just return an array

+   */
+  get allDecorations() {

[lushnikov, 2016/11/16 22:53:54]

let's not use getters

+    return this._decorations;
+  }
+
+  removeAllDecorations() {
+    this._decorations.clear();

[lushnikov, 2016/11/16 22:53:54]

this should dispatch LineDecorationRemoved events

+  }
+
+  /**
    * @param {string} type
-   * @return {?Map<number, !Workspace.UISourceCode.LineMarker>}
+   * @return {!Array<!Workspace.UISourceCode.LineMarker>}
    */
-  lineDecorations(type) {
-    return this._lineDecorations.get(type) || null;
+  decorations(type) {

[lushnikov, 2016/11/16 22:53:54]

decorationsForType

+    return this._decorations.get(type) || null;
   }
 };
 
 /** @enum {symbol} */
 Workspace.UISourceCode.Events = {
   WorkingCopyChanged: Symbol('WorkingCopyChanged'),
   WorkingCopyCommitted: Symbol('WorkingCopyCommitted'),
   TitleChanged: Symbol('TitleChanged'),
   SourceMappingChanged: Symbol('SourceMappingChanged'),
   MessageAdded: Symbol('MessageAdded'),
@@ skipping 232 matching lines @@
 Workspace.UISourceCode.Message.Level = {
   Error: 'Error',
   Warning: 'Warning'
 };
 
 /**
  * @unrestricted
  */
 Workspace.UISourceCode.LineMarker = class {
   /**
-   * @param {number} line
+   * @param {!Common.TextRange} range
    * @param {string} type
    * @param {?} data
    */
-  constructor(line, type, data) {
-    this._line = line;
+  constructor(range, type, data) {
+    this._range = range;
     this._type = type;
     this._data = data;
   }
 
   /**
    * @return {number}
    */
   line() {

[lushnikov, 2016/11/16 22:53:54]

can we drop this method now?

-    return this._line;
+    return this._range.startLine;
   }
 
   /**
+   * @return {!Common.TextRange}
+   */
+  range() {
+    return this._range;
+  }
+
+  /**
    * @return {string}
    */
   type() {
     return this._type;
   }
 
   /**
    * @return {*}
    */
   data() {
     return this._data;
   }
 };
 
 /**
  * @unrestricted
  */
 Workspace.UISourceCodeMetadata = class {
   /**
    * @param {?Date} modificationTime
    * @param {?number} contentSize
    */
   constructor(modificationTime, contentSize) {
     this.modificationTime = modificationTime;
     this.contentSize = contentSize;
   }
 };