DevTools: Support line markers in UISourceCode and Code Mirror

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 19 matching lines @@
  * @constructor
  * @extends {WebInspector.SourceFrame}
  * @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 = {};
+    /** @type {!Set<string>} */
+    this._typeDecorationsPending = new Set();
     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._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.LineDecorationAdded, this._onLineDecorationAdded, this);
+    this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.LineDecorationRemoved, this._onLineDecorationRemoved, 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 57 matching lines @@
     },
 
     /**
      * @override
      */
     onTextEditorContentLoaded: function()
     {
         WebInspector.SourceFrame.prototype.onTextEditorContentLoaded.call(this);
         for (var message of this._uiSourceCode.messages())
             this._addMessageToSource(message);
+        this._decorateAllTypes();
     },
 
     /**
      * @override
      * @param {!WebInspector.TextRange} oldRange
      * @param {!WebInspector.TextRange} newRange
      */
     onTextChanged: function(oldRange, newRange)
     {
         WebInspector.SourceFrame.prototype.onTextChanged.call(this, oldRange, newRange);
@@ skipping 192 matching lines @@
     },
 
     _updateBucketDecorations: function()
     {
         for (var line in this._rowMessageBuckets) {
             var bucket = this._rowMessageBuckets[line];
             bucket._updateDecoration();
         }
     },
 
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _onLineDecorationAdded: function(event)
+    {
+        var marker = /** @type {!WebInspector.UISourceCode.LineMarker} */ (event.data);
+        this._decorateTypeThrottled(marker.type());
+    },
+
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _onLineDecorationRemoved: function(event)
+    {
+        var marker = /** @type {!WebInspector.UISourceCode.LineMarker} */ (event.data);
+        this._decorateTypeThrottled(marker.type());
+    },
+
+    /**
+     * @param {string} type
+     */
+    _decorateTypeThrottled: function(type)
+    {
+        if (this._typeDecorationsPending.has(type))
+            return;
+        this._typeDecorationsPending.add(type);
+        self.runtime.extensions(WebInspector.UISourceCodeFrame.LineDecorator).find(extension => extension.descriptor()["decoratorType"] === type).instancePromise().then(decorator => {
+            decorator.decorate(this.uiSourceCode(), this._textEditor);

[pfeldman, 2016/03/09 23:52:57]

swap these lines.

[alph, 2016/03/09 23:58:22]

Done.

+            this._typeDecorationsPending.delete(type);
+        });
+    },
+
+    _decorateAllTypes: function()
+    {
+        var extensions = self.runtime.extensions(WebInspector.UISourceCodeFrame.LineDecorator);
+        extensions.forEach(extension => this._decorateTypeThrottled(extension.descriptor()["decoratorType"]));
+    },
+
     __proto__: WebInspector.SourceFrame.prototype
 }
 
 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";
 
 /**
+ * @interface
+ */
+WebInspector.UISourceCodeFrame.LineDecorator = function() { }
+
+WebInspector.UISourceCodeFrame.LineDecorator.prototype = {
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     * @param {!WebInspector.CodeMirrorTextEditor} textEditor
+     */
+    decorate: function(uiSourceCode, textEditor) { }
+}
+
+/**
  * @constructor
  * @param {!WebInspector.UISourceCode.Message} message
  */
 WebInspector.UISourceCodeFrame.RowMessage = function(message)
 {
     this._message = message;
     this._repeatCount = 1;
     this.element = createElementWithClass("div", "text-editor-row-message");
     this._icon = this.element.createChild("label", "", "dt-icon-label");
     this._icon.type = WebInspector.UISourceCodeFrame._iconClassPerLevel[message.level()];
@@ skipping 192 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()];
 }