merge updates from official devtools

Author: darwin

resources/unpacked/devtools/front_end/object_ui/ObjectPropertiesSection.js

@@ -185,18 +185,23 @@ ObjectUI.ObjectPropertiesSection = class extends UI.TreeOutlineInShadow {
    */
   static valueElementForFunctionDescription(description, includePreview, defaultName) {
     var valueElement = createElementWithClass('span', 'object-value-function');
-    var text = description ? description.replace(/^function [gs]et /, 'function ') : '';
+    var text = '';
+    if (description) {
+      text = description.replace(/^function [gs]et /, 'function ')
+                 .replace(/^function [gs]et\(/, 'function\(')
+                 .replace(/^[gs]et /, '');
+    }
     defaultName = defaultName || '';
 
     // This set of best-effort regular expressions captures common function descriptions.
     // Ideally, some parser would provide prefix, arguments, function body text separately.
-    var isAsync = text.startsWith('async function ');
-    var isGenerator = text.startsWith('function* ');
+    var asyncMatch = text.match(/^(async\s+function)/);
+    var isGenerator = text.startsWith('function*');
     var isGeneratorShorthand = text.startsWith('*');
-    var isBasic = !isGenerator && text.startsWith('function ');
+    var isBasic = !isGenerator && text.startsWith('function');
     var isClass = text.startsWith('class ') || text.startsWith('class{');
     var firstArrowIndex = text.indexOf('=>');
-    var isArrow = !isAsync && !isGenerator && !isBasic && !isClass && firstArrowIndex > 0;
+    var isArrow = !asyncMatch && !isGenerator && !isBasic && !isClass && firstArrowIndex > 0;
 
     var textAfterPrefix;
     if (isClass) {
@@ -206,8 +211,8 @@ ObjectUI.ObjectPropertiesSection = class extends UI.TreeOutlineInShadow {
       if (classNameMatch)
         className = classNameMatch[0].trim() || defaultName;
       addElements('class', textAfterPrefix, className);
-    } else if (isAsync) {
-      textAfterPrefix = text.substring('async function'.length);
+    } else if (asyncMatch) {
+      textAfterPrefix = text.substring(asyncMatch[1].length);
       addElements('async \u0192', textAfterPrefix, nameAndArguments(textAfterPrefix));
     } else if (isGenerator) {
       textAfterPrefix = text.substring('function*'.length);

resources/unpacked/devtools/front_end/persistence/IsolatedFileSystem.js

@@ -261,69 +261,67 @@ Persistence.IsolatedFileSystem = class {
 
   /**
    * @param {string} path
-   * @return {!Promise<?string>}
+   * @return {!Promise<?Blob>}
    */
-  requestFileContentPromise(path) {
-    var fulfill;
-    var promise = new Promise(x => fulfill = x);
-    this.requestFileContent(path, fulfill);
-    return promise;
+  requestFileBlob(path) {
+    return new Promise(resolve => {
+      this._domFileSystem.root.getFile(path, undefined, entry => {
+        entry.file(resolve, errorHandler.bind(this));
+      }, errorHandler.bind(this));
+
+      /**
+       * @this {Persistence.IsolatedFileSystem}
+       */
+      function errorHandler(error) {
+        if (error.name === 'NotFoundError') {
+          resolve(null);
+          return;
+        }
+
+        var errorMessage = Persistence.IsolatedFileSystem.errorMessage(error);
+        console.error(errorMessage + ' when getting content for file \'' + (this._path + '/' + path) + '\'');
+        resolve(null);
+      }
+    });
   }
 
   /**
    * @param {string} path
-   * @param {function(?string)} callback
+   * @return {!Promise<?string>}
    */
-  requestFileContent(path, callback) {
-    this._domFileSystem.root.getFile(path, undefined, fileEntryLoaded.bind(this), errorHandler.bind(this));
-
-    /**
-     * @param {!FileEntry} entry
-     * @this {Persistence.IsolatedFileSystem}
-     */
-    function fileEntryLoaded(entry) {
-      entry.file(fileLoaded, errorHandler.bind(this));
+  async requestFileContentPromise(path) {
+    var blob = await this.requestFileBlob(path);
+    if (!blob)
+      return null;
+
+    var reader = new FileReader();
+    var fileContentsLoadedPromise = new Promise(resolve => reader.onloadend = resolve);
+    if (Persistence.IsolatedFileSystem.ImageExtensions.has(Common.ParsedURL.extractExtension(path)))
+      reader.readAsDataURL(blob);
+    else
+      reader.readAsText(blob);
+    await fileContentsLoadedPromise;
+    if (reader.error) {
+      console.error('Can\'t read file: ' + path + ': ' + reader.error);
+      return null;
     }
-
-    /**
-     * @param {!Blob} file
-     */
-    function fileLoaded(file) {
-      var reader = new FileReader();
-      reader.onloadend = readerLoadEnd;
-      if (Persistence.IsolatedFileSystem.ImageExtensions.has(Common.ParsedURL.extractExtension(path)))
-        reader.readAsDataURL(file);
-      else
-        reader.readAsText(file);
+    try {
+      var result = reader.result;
+    } catch (e) {
+      result = null;
+      console.error('Can\'t read file: ' + path + ': ' + e);
     }
+    if (result === undefined)
+      return null;
+    return result;
+  }
 
-    /**
-     * @this {!FileReader}
-     */
-    function readerLoadEnd() {
-      /** @type {?string} */
-      var string = null;
-      try {
-        string = /** @type {string} */ (this.result);
-      } catch (e) {
-        console.error('Can\'t read file: ' + path + ': ' + e);
-      }
-      callback(string);
-    }
-
-    /**
-     * @this {Persistence.IsolatedFileSystem}
-     */
-    function errorHandler(error) {
-      if (error.name === 'NotFoundError') {
-        callback(null);
-        return;
-      }
-
-      var errorMessage = Persistence.IsolatedFileSystem.errorMessage(error);
-      console.error(errorMessage + ' when getting content for file \'' + (this._path + '/' + path) + '\'');
-      callback(null);
-    }
+  /**
+   * @param {string} path
+   * @param {function(?string)} callback
+   */
+  requestFileContent(path, callback) {
+    this.requestFileContentPromise(path).then(callback);
   }
 
   /**