From aca0bb943f24c57854062b1a0bc13b1d64d73136 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 24 Sep 2019 08:30:18 -0700
Subject: [PATCH 1/3] Fix lint on master

---
 src/compiler/checker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7a44ac66229..71c72a4cf82 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -33314,7 +33314,7 @@ namespace ts {
 
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    for (const mod of prop.modifiers!) { // TODO: GH#19955
+                    for (const mod of prop.modifiers) {
                         if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) {
                             grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod));
                         }

From 4ddf1919bbdf3df09fe32cfdbe3fef7423fc5e51 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 24 Sep 2019 08:47:45 -0700
Subject: [PATCH 2/3] try eslint-disable-next-line instead

---
 src/compiler/checker.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 71c72a4cf82..e3494a1f341 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -33314,7 +33314,8 @@ namespace ts {
 
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    for (const mod of prop.modifiers) {
+                    // eslint-disable-next-line no-unnecessary-type-assertion
+                    for (const mod of prop.modifiers!) { // TODO: GH#19955
                         if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) {
                             grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod));
                         }

From 41c3e545457005c6c8fe3c78f1da56b4379bcf03 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 24 Sep 2019 09:38:44 -0700
Subject: [PATCH 3/3] change eslint-disable rule name

---
 src/compiler/checker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e3494a1f341..2a3f2390cf3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -33314,7 +33314,7 @@ namespace ts {
 
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    // eslint-disable-next-line no-unnecessary-type-assertion
+                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                     for (const mod of prop.modifiers!) { // TODO: GH#19955
                         if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) {
                             grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod));