Devtools: use TextRange in UISourceCode.Message, allow addMessage to take a TextRange

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 579 matching lines @@
      * @return {!Array<!WebInspector.UISourceCode.Message>}
      */
     messages: function()
     {
         return this._messages.slice();
     },
 
     /**
      * @param {!WebInspector.UISourceCode.Message.Level} level
      * @param {string} text
-     * @param {number} lineNumber
+     * @param {number|!WebInspector.TextRange} lineNumberOrRange

[pfeldman, 2015/11/19 19:18:25]

Lets always use the range - we try to not do instanceof unless absolutely
necessary. You can add a convenience addLineMessage beside.

[wes, 2015/11/19 22:11:25]

Acknowledged.

      * @param {number=} columnNumber
      * @return {!WebInspector.UISourceCode.Message} message
      */
-    addMessage: function(level, text, lineNumber, columnNumber)
+    addMessage: function(level, text, lineNumberOrRange, columnNumber)
     {
-        var message = new WebInspector.UISourceCode.Message(this, level, text, lineNumber, columnNumber);
+        /** @type {!WebInspector.TextRange} */
+        var textRange;
+        if (lineNumberOrRange instanceof WebInspector.TextRange) {
+            textRange = lineNumberOrRange;
+        } else {
+            textRange = new WebInspector.TextRange(lineNumberOrRange, columnNumber || 0, lineNumberOrRange, columnNumber || 0);
+        }
+        var message = new WebInspector.UISourceCode.Message(this, level, text, textRange);
         this._messages.push(message);
         this.dispatchEventToListeners(WebInspector.UISourceCode.Events.MessageAdded, message);
         return message;
     },
 
     /**
      * @param {!WebInspector.UISourceCode.Message} message
      */
     removeMessage: function(message)
     {
@@ skipping 146 matching lines @@
     {
         callback([]);
     }
 }
 
 /**
  * @constructor
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {!WebInspector.UISourceCode.Message.Level} level
  * @param {string} text
- * @param {number} lineNumber
- * @param {number=} columnNumber
+ * @param {!WebInspector.TextRange} range
  */
-WebInspector.UISourceCode.Message = function(uiSourceCode, level, text, lineNumber, columnNumber)
+WebInspector.UISourceCode.Message = function(uiSourceCode, level, text, range)
 {
     this._uiSourceCode = uiSourceCode;
     this._level = level;
     this._text = text;
-    this._lineNumber = lineNumber;
-    this._columnNumber = columnNumber;
+    this._range = range;
 }
 
 /**
  * @enum {string}
  */
 WebInspector.UISourceCode.Message.Level = {
     Error: "Error",
     Warning: "Warning"
 }
 
@@ skipping 16 matching lines @@
 
     /**
      * @return {string}
      */
     text: function()
     {
         return this._text;
     },
 
     /**
+     * @return {!WebInspector.TextRange} 
+     */
+    range: function() {
+        return this._range;
+    },
+
+    /**
      * @return {number}
      */
     lineNumber: function()
     {
-        return this._lineNumber;
+        return this._range.startLine;
     },
 
     /**
      * @return {(number|undefined)}
      */
     columnNumber: function()
     {
-        return this._columnNumber;
+        return this._range.startColumn;
     },
 
     /**
      * @param {!WebInspector.UISourceCode.Message} another
      * @return {boolean}
      */
     isEqual: function(another)
     {
-        return this._uiSourceCode === another._uiSourceCode && this.text() === another.text() && this.level() === another.level() && this.lineNumber() === another.lineNumber() && this.columnNumber() === another.columnNumber();
+        return this._uiSourceCode === another._uiSourceCode && this.text() === another.text() && this.level() === another.level() && this.range().equal(another.range());
     },
 
     remove: function()
     {
         this._uiSourceCode.removeMessage(this);
     }
 }