From 6e6899a231ef305222a89abb1cefba48053f5949 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed, 18 Jul 2018 11:25:41 -0400
Subject: [PATCH] tslint: Enable variable-name

---
 src/backend/backend.ts | 6 +++---
 src/backend/mi2/mi2.ts | 8 ++++----
 test/mi_parse.test.ts  | 4 ++--
 tslint.json            | 3 +--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/backend/backend.ts b/src/backend/backend.ts
index 2294da6..0f35d06 100644
--- a/src/backend/backend.ts
+++ b/src/backend/backend.ts
@@ -84,7 +84,7 @@ export class VariableObject {
 	frozen: boolean;
 	dynamic: boolean;
 	displayhint: string;
-	has_more: boolean;
+	hasMore: boolean;
 	id: number;
 	constructor(node: any) {
 		this.name = MINode.valueOf(node, "name");
@@ -97,7 +97,7 @@ export class VariableObject {
 		this.dynamic = !!MINode.valueOf(node, "dynamic");
 		this.displayhint = MINode.valueOf(node, "displayhint");
 		// TODO: use has_more when it's > 0
-		this.has_more = !!MINode.valueOf(node, "has_more");
+		this.hasMore = !!MINode.valueOf(node, "has_more");
 	}
 
 	public applyChanges(node: MINode) {
@@ -107,7 +107,7 @@ export class VariableObject {
 		}
 		this.dynamic = !!MINode.valueOf(node, "dynamic");
 		this.displayhint = MINode.valueOf(node, "displayhint");
-		this.has_more = !!MINode.valueOf(node, "has_more");
+		this.hasMore = !!MINode.valueOf(node, "has_more");
 	}
 
 	public isCompound(): boolean {
diff --git a/src/backend/mi2/mi2.ts b/src/backend/mi2/mi2.ts
index 173cc3b..01842f5 100644
--- a/src/backend/mi2/mi2.ts
+++ b/src/backend/mi2/mi2.ts
@@ -743,12 +743,12 @@ export class MI2 extends EventEmitter implements IBackend {
 	}
 
 	async sendCliCommand(command: string, threadId: number = 0, frameLevel: number = 0) {
-		let mi_command = "interpreter-exec ";
+		let miCommand = "interpreter-exec ";
 		if (threadId != 0) {
-			mi_command += `--thread ${threadId} --frame ${frameLevel} `;
+			miCommand += `--thread ${threadId} --frame ${frameLevel} `;
 		}
-		mi_command += `console "${command.replace(/[\\"']/g, '\\$&')}"`;
-		await this.sendCommand(mi_command);
+		miCommand += `console "${command.replace(/[\\"']/g, '\\$&')}"`;
+		await this.sendCommand(miCommand);
 	}
 
 	sendCommand(command: string, suppressFailure: boolean = false): Thenable<MINode> {
diff --git a/test/mi_parse.test.ts b/test/mi_parse.test.ts
index e187c15..e9dd260 100644
--- a/test/mi_parse.test.ts
+++ b/test/mi_parse.test.ts
@@ -95,7 +95,7 @@ suite("MI Parse", () => {
 		assert.notEqual(parsed.resultRecords, undefined);
 		assert.equal(parsed.resultRecords.resultClass, "done");
 		assert.equal(parsed.resultRecords.results.length, 1);
-		const asm_insns = [
+		const asmInsns = [
 			"asm_insns",
 			[
 				[
@@ -125,7 +125,7 @@ suite("MI Parse", () => {
 				]
 			]
 		];
-		assert.deepEqual(parsed.resultRecords.results[0], asm_insns);
+		assert.deepEqual(parsed.resultRecords.results[0], asmInsns);
 		assert.equal(parsed.result("asm_insns.src_and_asm_line.line_asm_insn[1].address"), "0x00000000004e7da5");
 	});
 	test("valueof children", () => {
diff --git a/tslint.json b/tslint.json
index e95e5f1..bc8ed79 100644
--- a/tslint.json
+++ b/tslint.json
@@ -34,7 +34,6 @@
 		"space-before-function-paren": false,
 		"trailing-comma": false,
 		"triple-equals": false,
-		"typedef-whitespace": false,
-		"variable-name": false
+		"typedef-whitespace": false
 	}
 }