Merge branch 'main' into zyzyzyryxy/bump_devtools_frontend

Author: zyzyzyryxy

src/TextSnapshot.ts

@@ -231,9 +231,12 @@ export class TextSnapshot {
     };
 
     const findDescendantNodes = async (
-      backendNodeId: number,
+      backendNodeId?: number,
     ): Promise<Set<number>> => {
       const descendantIds = new Set<number>();
+      if (!backendNodeId) {
+        return descendantIds;
+      }
       try {
         // @ts-expect-error internal API
         const client = page.pptrPage._client();
@@ -297,20 +300,26 @@ export class TextSnapshot {
     if (extraHandles.length) {
       page.extraHandles = extraHandles;
     }
+    const reorgInfo: Array<{
+      extraNode: TextSnapshotNode;
+      attachTarget: TextSnapshotNode;
+      descendantIds: Set<number>;
+    }> = [];
+
     for (const handle of page.extraHandles) {
       const extraNode = await createExtraNode(handle);
       if (!extraNode) {
         continue;
       }
       idToNode.set(extraNode.id, extraNode);
       const attachTarget = (await findAncestorNode(handle)) || rootNodeWithId;
-      if (extraNode.backendNodeId !== undefined) {
-        const descendantIds = await findDescendantNodes(
-          extraNode.backendNodeId,
-        );
-        const index = moveChildNodes(attachTarget, extraNode, descendantIds);
-        attachTarget.children.splice(index, 0, extraNode);
-      }
+      const descendantIds = await findDescendantNodes(extraNode.backendNodeId);
+      reorgInfo.push({extraNode, attachTarget, descendantIds});
+    }
+
+    for (const {extraNode, attachTarget, descendantIds} of reorgInfo) {
+      const index = moveChildNodes(attachTarget, extraNode, descendantIds);
+      attachTarget.children.splice(index, 0, extraNode);
     }
   }
 }

src/formatters/SnapshotFormatter.ts

@@ -20,7 +20,7 @@ export class SnapshotFormatter {
 
     // Top-level content of the snapshot.
     if (
-      this.#snapshot.verbose &&
+      !this.#snapshot.verbose &&
       this.#snapshot.hasSelectedElement &&
       !this.#snapshot.selectedElementUid
     ) {

tests/formatters/snapshotFormatter.test.js.snapshot

@@ -1,7 +1,4 @@
 exports[`snapshotFormatter > does not include a note if the snapshot is already verbose 1`] = `
-Note: there is a selected element in the DevTools Elements panel but it is not included into the current a11y tree snapshot.
-Get a verbose snapshot to include all elements if you are interested in the selected element.
-
 uid=1_1 checkbox "checkbox" checked
   uid=1_2 statictext "text"
 
@@ -14,6 +11,9 @@ uid=1_1 checkbox "checkbox" checked [selected in the DevTools Elements panel]
 `;
 
 exports[`snapshotFormatter > formats with DevTools data not included into a snapshot 1`] = `
+Note: there is a selected element in the DevTools Elements panel but it is not included into the current a11y tree snapshot.
+Get a verbose snapshot to include all elements if you are interested in the selected element.
+
 uid=1_1 checkbox "checkbox" checked
   uid=1_2 statictext "text"