[cleanup] Use Promise with resolvers

Bug: none
Change-Id: I854b980b875f915b9257b7a663473a3726eb9133
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6225539
Reviewed-by: Benedikt Meurer <[email protected]>
Commit-Queue: Nikolay Vitkov <[email protected]>

Author: Lightning00Blade

front_end/core/common/ResolverBase.ts

@@ -34,7 +34,7 @@ export abstract class ResolverBase<Id, T> {
   }
 
   /**
-   * Resolve the `id`. Returns the object immediatelly if it can be resolved,
+   * Resolve the `id`. Returns the object immediately if it can be resolved,
    * and otherwise waits for the object to appear and calls `callback` once
    * it is resolved.
    */
@@ -68,12 +68,7 @@ export abstract class ResolverBase<Id, T> {
     if (promiseInfo) {
       return promiseInfo.promise;
     }
-    let resolve: (value: T) => void = () => {};
-    let reject: (error: Error) => void = () => {};
-    const promise = new Promise<T>((res, rej) => {
-      resolve = res;
-      reject = rej;
-    });
+    const {resolve, reject, promise} = Promise.withResolvers<T>();
     this.#unresolvedIds.set(id, {promise, resolve, reject});
     this.startListening();
     return promise;

front_end/models/persistence/IsolatedFileSystemManager.ts

@@ -132,10 +132,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   private requestFileSystems(): Promise<IsolatedFileSystem[]> {
-    let fulfill: (arg0: IsolatedFileSystem[]) => void;
-    const promise = new Promise<IsolatedFileSystem[]>(f => {
-      fulfill = f;
-    });
+    const {resolve, promise} = Promise.withResolvers<IsolatedFileSystem[]>();
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
         Host.InspectorFrontendHostAPI.Events.FileSystemsLoaded, onFileSystemsLoaded, this);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.requestFileSystems();
@@ -153,7 +150,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     }
 
     function onFileSystemsAdded(fileSystems: (IsolatedFileSystem|null)[]): void {
-      fulfill(fileSystems.filter(fs => Boolean(fs)) as IsolatedFileSystem[]);
+      resolve(fileSystems.filter(fs => Boolean(fs)) as IsolatedFileSystem[]);
     }
   }
 

front_end/models/workspace/UISourceCode.ts

@@ -160,10 +160,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   }
 
   rename(newName: Platform.DevToolsPath.RawPathString): Promise<boolean> {
-    let fulfill: (arg0: boolean) => void;
-    const promise = new Promise<boolean>(x => {
-      fulfill = x;
-    });
+    const {resolve, promise} = Promise.withResolvers<boolean>();
     this.projectInternal.rename(this, newName, innerCallback.bind(this));
     return promise;
 
@@ -175,7 +172,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
             newName as Platform.DevToolsPath.RawPathString, newURL as Platform.DevToolsPath.UrlString,
             newContentType as Common.ResourceType.ResourceType);
       }
-      fulfill(success);
+      resolve(success);
     }
   }
 

front_end/panels/recorder/models/RecordingPlayer.ts

@@ -243,13 +243,10 @@ export class RecordingPlayer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
       }
 
       override async beforeEachStep?(step: Step, flow: UserFlow): Promise<void> {
-        let resolver: () => void = () => {};
-        const promise = new Promise<void>(r => {
-          resolver = r;
-        });
+        const {resolve, promise} = Promise.withResolvers<void>();
         player.dispatchEventToListeners(Events.STEP, {
           step,
-          resolve: resolver,
+          resolve,
         });
         await promise;
         const currentStepIndex = flow.steps.indexOf(step);

front_end/testing/MockConnection.ts

@@ -57,10 +57,7 @@ export function clearAllMockConnectionResponseHandlers() {
 export function registerListenerOnOutgoingMessage(method: ProtocolCommand): Promise<void> {
   let outgoingMessageListenerEntry = outgoingMessageListenerEntryMap.get(method);
   if (!outgoingMessageListenerEntry) {
-    let resolve = () => {};
-    const promise = new Promise<void>(r => {
-      resolve = r;
-    });
+    const {resolve, promise} = Promise.withResolvers<void>();
     outgoingMessageListenerEntry = {promise, resolve};
     outgoingMessageListenerEntryMap.set(method, outgoingMessageListenerEntry);
   }

front_end/testing/TrackAsyncOperations.ts

@@ -245,7 +245,7 @@ function getStack(error: Error): string {
   return (error.stack ?? 'No stack').split('\n').slice(2).join('\n');
 }
 
-// We can't use Sinon for stubbing as 1) we need to double wrap somtimes and 2)
+// We can't use Sinon for stubbing as 1) we need to double wrap sometimes and 2)
 // we need to access original values.
 interface Stub<TKey extends keyof typeof window> {
   name: TKey;

front_end/ui/components/issue_counter/IssueLinkIcon.test.ts

@@ -57,10 +57,7 @@ class MockIssueResolver {
     if (entry) {
       return entry.promise;
     }
-    let resolve: (issue: IssuesManager.Issue.Issue|null) => void = () => {};
-    const promise = new Promise<IssuesManager.Issue.Issue|null>(r => {
-      resolve = r;
-    });
+    const {resolve, promise} = Promise.withResolvers<IssuesManager.Issue.Issue|null>();
     this.#promiseMap.set(issueId, {resolve, promise});
     return promise;
   }

front_end/ui/components/request_link_icon/RequestLinkIcon.test.ts

@@ -64,10 +64,7 @@ class MockRequestResolver {
     if (entry) {
       return entry.promise;
     }
-    let resolve: (request: SDK.NetworkRequest.NetworkRequest|null) => void = () => {};
-    const promise = new Promise<SDK.NetworkRequest.NetworkRequest|null>(r => {
-      resolve = r;
-    });
+    const {resolve, promise} = Promise.withResolvers<SDK.NetworkRequest.NetworkRequest|null>();
     this.#promiseMap.set(requestId, {resolve, promise});
     return promise;
   }