[EsLint] Don't use empty blocks

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

Author: Lightning00Blade

eslint.config.mjs

@@ -174,6 +174,14 @@ export default [
         },
       ],
 
+      'no-empty': [
+        'error',
+        {
+          allowEmptyCatch: true,
+        },
+      ],
+      'no-lonely-if': 'error',
+
       'no-empty-character-class': 'error',
       'no-global-assign': 'error',
       'no-implied-eval': 'error',

extensions/cxx_debugging/e2e/TestDriver.ts

@@ -119,12 +119,10 @@ describe('CXX Debugging Extension Test Suite', function() {
                 } else if (value) {
                   assert.isTrue(scopeVariable?.endsWith(`: ${value}`));
                 }
-              } else {
-                if (variableType) {
-                  assert.strictEqual(scopeVariable, `${variableName}: ${variableType}`);
-                } else if (value) {
-                  assert.strictEqual(scopeVariable, `${variableName}: ${value}`);
-                }
+              } else if (variableType) {
+                assert.strictEqual(scopeVariable, `${variableName}: ${variableType}`);
+              } else if (value) {
+                assert.strictEqual(scopeVariable, `${variableName}: ${value}`);
               }
             }
           }

extensions/cxx_debugging/src/WorkerRPC.ts

@@ -112,6 +112,7 @@ export class WorkerRPC<LocalInterface extends Record<string, any>, RemoteInterfa
       },
     });
     while (Atomics.wait(this.semaphore, 0, 0) !== 'not-equal') {
+      // Await the semaphore to be equal
     }
     const [response] = this.semaphore;
 

front_end/core/platform/TypedArrayUtilities.ts

@@ -166,8 +166,9 @@ class BitVectorImpl extends Uint8Array {
       }
     }
     // Next, iterate by bytes to skip over ranges of zeros.
-    let byteIndex: number;
-    for (byteIndex = (index >> 3) - 1; byteIndex >= 0 && this[byteIndex] === 0; --byteIndex) {
+    let byteIndex: number = (index >> 3) - 1;
+    while (byteIndex >= 0 && this[byteIndex] === 0) {
+      --byteIndex;
     }
     if (byteIndex < 0) {
       return -1;

front_end/core/sdk/NetworkManager.ts

@@ -1776,12 +1776,10 @@ export class InterceptedRequest {
           } else {
             result.set(match[1], [header.value]);
           }
+        } else if (result.has(header.value)) {
+          result.get(header.value)?.push(header.value);
         } else {
-          if (result.has(header.value)) {
-            result.get(header.value)?.push(header.value);
-          } else {
-            result.set(header.value, [header.value]);
-          }
+          result.set(header.value, [header.value]);
         }
       }
       return result;

front_end/core/sdk/SourceMapManager.ts

@@ -145,13 +145,11 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
   cancelAttachSourceMap(client: T): void {
     if (client === this.#attachingClient) {
       this.#attachingClient = null;
-    } else {
       // This should not happen.
-      if (this.#attachingClient) {
-        console.error('cancel attach source map requested but a different source map was being attached');
-      } else {
-        console.error('cancel attach source map requested but no source map was being attached');
-      }
+    } else if (this.#attachingClient) {
+      console.error('cancel attach source map requested but a different source map was being attached');
+    } else {
+      console.error('cancel attach source map requested but no source map was being attached');
     }
   }
 

front_end/devtools_compatibility.js

@@ -100,15 +100,13 @@ const DevToolsAPIImpl = class {
     // Support for legacy front-ends (<M41).
     if (window['WebInspector'] && window['WebInspector']['addExtensions']) {
       window['WebInspector']['addExtensions'](extensions);
-    } else {
       // The addExtensions command is sent as the onload event happens for
       // DevTools front-end. We should buffer this command until the frontend
       // is ready for it.
-      if (this._addExtensionCallback) {
-        extensions.forEach(this._addExtensionCallback);
-      } else {
-        this._pendingExtensionDescriptors.push(...extensions);
-      }
+    } else if (this._addExtensionCallback) {
+      extensions.forEach(this._addExtensionCallback);
+    } else {
+      this._pendingExtensionDescriptors.push(...extensions);
     }
   }
 

front_end/entrypoints/heap_snapshot_worker/HeapSnapshot.ts

@@ -1124,12 +1124,10 @@ export abstract class HeapSnapshot {
         if (stringIndexes.has(nodes.getValue(nodeIndex + nodeNameOffset))) {
           nodeIds.push(nodes.getValue(nodeIndex + nodeIdOffset));
         }
-      } else {
         // If the node is displaying a customized name, then we must perform the
         // full string search within that name here.
-        if (useRegExp ? regexp.test(name) : (name.indexOf(query) !== -1)) {
-          nodeIds.push(nodes.getValue(nodeIndex + nodeIdOffset));
-        }
+      } else if (useRegExp ? regexp.test(name) : (name.indexOf(query) !== -1)) {
+        nodeIds.push(nodes.getValue(nodeIndex + nodeIdOffset));
       }
     }
     return nodeIds;

front_end/legacy_test_runner/data_grid_test_runner/data_grid_test_runner.js

@@ -9,7 +9,11 @@ import {TestRunner} from '../test_runner/test_runner.js';
  */
 export const DataGridTestRunner = {};
 
-DataGridTestRunner.dumpDataGrid = function(root, descentIntoCollapsed, prefix) {
+DataGridTestRunner.dumpDataGrid = function(
+    root,
+    descentIntoCollapsed,
+    prefix,
+) {
   if (!prefix) {
     prefix = '';
   }
@@ -43,16 +47,16 @@ DataGridTestRunner.validateDataGrid = function(root) {
       throw 'Wrong parent for child ' + child.data.id + ' of ' + root.data.id;
     }
 
-    if (child.nextSibling !== ((i + 1 === children.length ? null : children[i + 1]))) {
-      throw 'Wrong child.nextSibling for ' + child.data.id + ' (' + i + ' of ' + children.length + ') ';
+    if (child.nextSibling !== (i + 1 === children.length ? null : children[i + 1])) {
+      throw ('Wrong child.nextSibling for ' + child.data.id + ' (' + i + ' of ' + children.length + ') ');
     }
 
-    if (child.previousSibling !== ((i ? children[i - 1] : null))) {
-      throw 'Wrong child.previousSibling for ' + child.data.id + ' (' + i + ' of ' + children.length + ') ';
+    if (child.previousSibling !== (i ? children[i - 1] : null)) {
+      throw ('Wrong child.previousSibling for ' + child.data.id + ' (' + i + ' of ' + children.length + ') ');
     }
 
     if (child.parent && !child.parent.isRoot && child.depth !== root.depth + 1) {
-      throw 'Wrong depth for ' + child.data.id + ' expected ' + (root.depth + 1) + ' but got ' + child.depth;
+      throw ('Wrong depth for ' + child.data.id + ' expected ' + (root.depth + 1) + ' but got ' + child.depth);
     }
 
     DataGridTestRunner.validateDataGrid(child);
@@ -65,11 +69,12 @@ DataGridTestRunner.validateDataGrid = function(root) {
       throw 'Selected node is not selectable';
     }
     let node = selectedNode;
-    for (; node && node !== root; node = node.parent) {
+    while (node && node !== root) {
+      node = node.parent;
     }
 
     if (!node) {
-      throw 'Selected node (' + selectedNode.data.id + ') is not within the DataGrid';
+      throw ('Selected node (' + selectedNode.data.id + ') is not within the DataGrid');
     }
   }
 };

front_end/models/persistence/Automapping.ts

@@ -246,11 +246,9 @@ export class Automapping {
               PersistenceImpl.rewrapNodeJSContent(status.fileSystem, fileContent, networkContent.content);
           isValid = fileContent === rewrappedNetworkContent;
         }
-      } else {
-        if (networkContent.content) {
-          // Trim trailing whitespaces because V8 adds trailing newline.
-          isValid = fileContent.trimEnd() === networkContent.content.trimEnd();
-        }
+      } else if (networkContent.content) {
+        // Trim trailing whitespaces because V8 adds trailing newline.
+        isValid = fileContent.trimEnd() === networkContent.content.trimEnd();
       }
       if (!isValid) {
         this.prevalidationFailedForTest(status);