From d5c6b928ad259ebaa915a65d7586191eac18a05b Mon Sep 17 00:00:00 2001
From: George Wort <george.wort@arm.com>
Date: Wed, 7 Dec 2022 19:02:39 +0000
Subject: [PATCH] [turbolizer] Remove tslint:recommended so that presubmit can
 be run

TSLint has been deprecated and so the presubmit script will not
run because of tslint:recommended. Removing this allows the
explicit rules to be run but does not properly fix the use of
TSLint. Also fix the issues that do not pass the linter.

Bug: v8:7327
Change-Id: I9f463ba9520ee2caa4141b21b81fd15012afedff
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4085145
Reviewed-by: Nico Hartmann <nicohartmann@chromium.org>
Commit-Queue: George Wort <george.wort@arm.com>
Cr-Commit-Position: refs/heads/main@{#84725}
---
 tools/turbolizer/src/phases/schedule-phase.ts | 10 +++++-----
 tools/turbolizer/src/views/schedule-view.ts   |  8 ++++----
 tools/turbolizer/tslint.json                  |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tools/turbolizer/src/phases/schedule-phase.ts b/tools/turbolizer/src/phases/schedule-phase.ts
index 21d1fff26d..467ea297ef 100644
--- a/tools/turbolizer/src/phases/schedule-phase.ts
+++ b/tools/turbolizer/src/phases/schedule-phase.ts
@@ -65,7 +65,7 @@ export class SchedulePhase extends Phase {
     const blockId = Number.parseInt(match.groups.id, 10);
     const block = new ScheduleBlock(blockRpo, blockId, match.groups.deferred !== undefined,
       predecessors.sort());
-    this.data.blocks_rpo[block.rpo] = block;
+    this.data.blocksRpo[block.rpo] = block;
   }
 
   private setGotoSuccessor = match => {
@@ -132,15 +132,15 @@ export class ScheduleBlock {
 
 export class ScheduleData {
   nodes: Array<ScheduleNode>;
-  blocks_rpo: Array<ScheduleBlock>;
+  blocksRpo: Array<ScheduleBlock>;
 
   constructor() {
     this.nodes = new Array<ScheduleNode>();
-    this.blocks_rpo = new Array<ScheduleBlock>();
+    this.blocksRpo = new Array<ScheduleBlock>();
   }
 
   public lastBlock(): ScheduleBlock {
-    if (this.blocks_rpo.length == 0) return null;
-    return this.blocks_rpo[this.blocks_rpo.length - 1];
+    if (this.blocksRpo.length == 0) return null;
+    return this.blocksRpo[this.blocksRpo.length - 1];
   }
 }
diff --git a/tools/turbolizer/src/views/schedule-view.ts b/tools/turbolizer/src/views/schedule-view.ts
index 1020502fa0..b5d717751b 100644
--- a/tools/turbolizer/src/views/schedule-view.ts
+++ b/tools/turbolizer/src/views/schedule-view.ts
@@ -28,7 +28,7 @@ export class ScheduleView extends TextView {
   public initializeContent(schedule: SchedulePhase, rememberedSelection: SelectionStorage): void {
     this.divNode.innerHTML = "";
     this.schedule = schedule;
-    this.addBlocks(schedule.data.blocks_rpo);
+    this.addBlocks(schedule.data.blocksRpo);
     this.show();
     if (rememberedSelection) {
       const adaptedSelection = this.adaptSelection(rememberedSelection);
@@ -91,9 +91,9 @@ export class ScheduleView extends TextView {
     instrMarker.onclick = this.mkBlockLinkHandler(block.rpo);
     scheduleBlock.appendChild(instrMarker);
 
-    const blockRpo_Id = this.createElement("div", "block-id com clickable", String(block.rpo) + " Id:" + String(block.id));
-    blockRpo_Id.onclick = this.mkBlockLinkHandler(block.rpo);
-    scheduleBlock.appendChild(blockRpo_Id);
+    const blocksRpoId = this.createElement("div", "block-id com clickable", String(block.rpo) + " Id:" + String(block.id));
+    blocksRpoId.onclick = this.mkBlockLinkHandler(block.rpo);
+    scheduleBlock.appendChild(blocksRpoId);
     const blockPred = this.createElement("div", "predecessor-list block-list comma-sep-list");
     for (const pred of block.predecessors) {
       const predEl = this.createElement("div", "block-id com clickable", String(pred));
diff --git a/tools/turbolizer/tslint.json b/tools/turbolizer/tslint.json
index e07e057a62..96b95f2ee3 100644
--- a/tools/turbolizer/tslint.json
+++ b/tools/turbolizer/tslint.json
@@ -1,6 +1,5 @@
 {
   "defaultSeverity": "error",
-  "extends": "tslint:recommended",
   "jsRules": {},
   "rules": {
     "curly": [true, "ignore-same-line"],