From ae9c1415655362ddb881ba617940d2b54a6d356b Mon Sep 17 00:00:00 2001
From: yeonjuan <yeonjuan93@naver.com>
Date: Tue, 30 Mar 2021 01:01:22 +0900
Subject: [PATCH] fix(eslint-plugin): [no-unnecessary-type-assertion] correct
 removed token range

---
 .../rules/no-unnecessary-type-assertion.ts    | 24 ++++++++++++-------
 .../no-unnecessary-type-assertion.test.ts     | 16 +++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts b/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts
index 5ae12f5a33d..d051179eee3 100644
--- a/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts
+++ b/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts
@@ -258,15 +258,21 @@ export default util.createRule<Options, MessageIds>({
             node,
             messageId: 'unnecessaryAssertion',
             fix(fixer) {
-              return originalNode.kind === ts.SyntaxKind.TypeAssertionExpression
-                ? fixer.removeRange([
-                    node.range[0],
-                    node.expression.range[0] - 1,
-                  ])
-                : fixer.removeRange([
-                    node.expression.range[1] + 1,
-                    node.range[1],
-                  ]);
+              if (originalNode.kind === ts.SyntaxKind.TypeAssertionExpression) {
+                const closingAngleBracket = sourceCode.getTokenAfter(
+                  node.typeAnnotation,
+                );
+                return closingAngleBracket?.value === '>'
+                  ? fixer.removeRange([
+                      node.range[0],
+                      closingAngleBracket.range[1],
+                    ])
+                  : null;
+              }
+              return fixer.removeRange([
+                node.expression.range[1] + 1,
+                node.range[1],
+              ]);
             },
           });
         }
diff --git a/packages/eslint-plugin/tests/rules/no-unnecessary-type-assertion.test.ts b/packages/eslint-plugin/tests/rules/no-unnecessary-type-assertion.test.ts
index 65d0874dd3a..6d3563a0ccd 100644
--- a/packages/eslint-plugin/tests/rules/no-unnecessary-type-assertion.test.ts
+++ b/packages/eslint-plugin/tests/rules/no-unnecessary-type-assertion.test.ts
@@ -358,6 +358,22 @@ function foo<T extends string>(bar: T) {
     },
     {
       code: `
+declare const foo: Foo;
+const bar = <Foo>foo;
+      `,
+      output: `
+declare const foo: Foo;
+const bar = foo;
+      `,
+      errors: [
+        {
+          messageId: 'unnecessaryAssertion',
+          line: 3,
+        },
+      ],
+    },
+    {
+      code: `
 declare function nonNull(s: string | null);
 let s: string | null = null;
 nonNull(s!);