DevTools: show array entries that are getters

third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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
@@ skipping 135 matching lines @@
         var cellProperty = rowPreview.properties[j];
         var columnRendered = columnNames.indexOf(cellProperty.name) !== -1;
         if (!columnRendered) {
           if (columnNames.length === maxColumnsToRender)
             continue;
           columnRendered = true;
           columnNames.push(cellProperty.name);
         }
 
         if (columnRendered) {
-          var cellElement = this._renderPropertyPreviewOrAccessor(table, [rowProperty, cellProperty]);
+          var cellElement = this._previewFormatter.renderPropertyPreviewOrAccessor([rowProperty, cellProperty], table);
           cellElement.classList.add('console-message-nowrap-below');
           rowValue[cellProperty.name] = cellElement;
         }
       }
       rows.push([rowProperty.name, rowValue]);
     }
 
     var flatValues = [];
     for (var i = 0; i < rows.length; ++i) {
       var rowName = rows[i][0];
@@ skipping 348 matching lines @@
 
   /**
    * @param {!SDK.RemoteObject} obj
    * @param {boolean=} includePreview
    * @return {!Element}
    */
   _formatParameterAsObject(obj, includePreview) {
     var titleElement = createElement('span');
     if (includePreview && obj.preview) {
       titleElement.classList.add('console-object-preview');
-      this._previewFormatter.appendObjectPreview(titleElement, obj.preview);
+      this._previewFormatter.appendObjectPreview(titleElement, obj.preview, obj);
     } else if (obj.type === 'function') {
       Components.ObjectPropertiesSection.formatObjectAsFunction(obj, titleElement, false);
       titleElement.classList.add('object-value-function');
     } else {
       titleElement.createTextChild(obj.description || '');
     }
 
     var section = new Components.ObjectPropertiesSection(obj, titleElement, this._linkifier);
     section.element.classList.add('console-view-object-properties-section');
     section.enableContextMenu();
@@ skipping 31 matching lines @@
    * @param {!SDK.RemoteObject} obj
    * @param {!Event} event
    */
   _contextMenuEventFired(obj, event) {
     var contextMenu = new UI.ContextMenu(event);
     contextMenu.appendApplicableItems(obj);
     contextMenu.show();
   }
 
   /**
-   * @param {?SDK.RemoteObject} object
-   * @param {!Array.<!Protocol.Runtime.PropertyPreview>} propertyPath
-   * @return {!Element}
-   */
-  _renderPropertyPreviewOrAccessor(object, propertyPath) {
-    var property = propertyPath.peekLast();
-    if (property.type === 'accessor')
-      return this._formatAsAccessorProperty(object, propertyPath.map(property => property.name), false);
-    return this._previewFormatter.renderPropertyPreview(
-        property.type, /** @type {string} */ (property.subtype), property.value);
-  }
-
-  /**
    * @param {!SDK.RemoteObject} object
    * @return {!Element}
    */
   _formatParameterAsNode(object) {
     var result = createElement('span');
     Common.Renderer.renderPromise(object).then(appendRenderer.bind(this), failedToRender.bind(this));
     return result;
 
     /**
      * @param {!Element} rendererElement
@@ skipping 39 matching lines @@
         return;
       }
 
       var titleElement = createElement('span');
       var elements = {};
       for (var i = 0; i < properties.length; ++i) {
         var property = properties[i];
         var name = property.name;
         if (isNaN(name))
           continue;
-        if (property.getter)
-          elements[name] = this._formatAsAccessorProperty(array, [name], true);
-        else if (property.value)
-          elements[name] = this._formatAsArrayEntry(property.value);
+        var formatter = this._previewFormatter;
+        if (property.getter) {
+          elements[name] = formatter.formatAsAccessorProperty([name], array);
+        } else if (property.value) {
+          var output = property.value;
+          elements[name] = formatter.renderPropertyPreview(output.type, output.subtype, output.description);
+        }
       }
 
       titleElement.createTextChild('[');
       var lastNonEmptyIndex = -1;
 
       function appendUndefined(titleElement, index) {
         if (index - lastNonEmptyIndex <= 1)
           return;
         var span = titleElement.createChild('span', 'object-value-undefined');
         span.textContent = Common.UIString('undefined × %d', index - lastNonEmptyIndex - 1);
@@ skipping 46 matching lines @@
    * @return {!Element}
    */
   _formatParameterAsError(output) {
     var result = createElement('span');
     var errorSpan = this._tryFormatAsError(output.description || '');
     result.appendChild(errorSpan ? errorSpan : Components.linkifyStringAsFragment(output.description || ''));
     return result;
   }
 
   /**
-   * @param {!SDK.RemoteObject} output
-   * @return {!Element}
-   */
-  _formatAsArrayEntry(output) {
-    return this._previewFormatter.renderPropertyPreview(output.type, output.subtype, output.description);
-  }
-
-  /**
-   * @param {?SDK.RemoteObject} object
-   * @param {!Array.<string>} propertyPath
-   * @param {boolean} isArrayEntry
-   * @return {!Element}
-   */
-  _formatAsAccessorProperty(object, propertyPath, isArrayEntry) {
-    var rootElement = Components.ObjectPropertyTreeElement.createRemoteObjectAccessorPropertySpan(
-        object, propertyPath, onInvokeGetterClick.bind(this));
-
-    /**
-     * @param {?SDK.RemoteObject} result
-     * @param {boolean=} wasThrown
-     * @this {Console.ConsoleViewMessage}
-     */
-    function onInvokeGetterClick(result, wasThrown) {
-      if (!result)
-        return;
-      rootElement.removeChildren();
-      if (wasThrown) {
-        var element = rootElement.createChild('span');
-        element.textContent = Common.UIString('<exception>');
-        element.title = /** @type {string} */ (result.description);
-      } else if (isArrayEntry) {
-        rootElement.appendChild(this._formatAsArrayEntry(result));
-      } else {
-        // Make a PropertyPreview from the RemoteObject similar to the backend logic.
-        const maxLength = 100;
-        var type = result.type;
-        var subtype = result.subtype;
-        var description = '';
-        if (type !== 'function' && result.description) {
-          if (type === 'string' || subtype === 'regexp')
-            description = result.description.trimMiddle(maxLength);
-          else
-            description = result.description.trimEnd(maxLength);
-        }
-        rootElement.appendChild(this._previewFormatter.renderPropertyPreview(type, subtype, description));
-      }
-    }
-
-    return rootElement;
-  }
-
-  /**
    * @param {string} format
    * @param {!Array.<!SDK.RemoteObject>} parameters
    * @param {!Element} formattedResult
    */
   _formatWithSubstitutionString(format, parameters, formattedResult) {
     var formatters = {};
 
     /**
      * @param {boolean} force
      * @param {!SDK.RemoteObject} obj
@@ skipping 453 matching lines @@
    * @return {!Element}
    */
   toMessageElement() {
     if (!this._element) {
       super.toMessageElement();
       this._element.classList.toggle('collapsed', this._collapsed);
     }
     return this._element;
   }
 };