From 84a6027b2919252b7898e05e2c87d967fa50d408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Sat, 22 May 2021 00:36:35 +0200
Subject: [PATCH] chore(experimental-utils): remove useless union types in
 `ast-utils`

---
 .../src/ast-utils/eslint-utils/predicates.ts  | 50 +++++++++----------
 .../experimental-utils/src/ast-utils/misc.ts  |  4 +-
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/packages/experimental-utils/src/ast-utils/eslint-utils/predicates.ts b/packages/experimental-utils/src/ast-utils/eslint-utils/predicates.ts
index cbf8377127c6..55d20a3e40b0 100644
--- a/packages/experimental-utils/src/ast-utils/eslint-utils/predicates.ts
+++ b/packages/experimental-utils/src/ast-utils/eslint-utils/predicates.ts
@@ -2,82 +2,80 @@ import * as eslintUtils from 'eslint-utils';
 import { TSESTree } from '../../ts-estree';
 
 const isArrowToken = eslintUtils.isArrowToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: '=>' };
 const isNotArrowToken = eslintUtils.isNotArrowToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isClosingBraceToken = eslintUtils.isClosingBraceToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: '}' };
 const isNotClosingBraceToken = eslintUtils.isNotClosingBraceToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isClosingBracketToken = eslintUtils.isClosingBracketToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: ']' };
 const isNotClosingBracketToken = eslintUtils.isNotClosingBracketToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isClosingParenToken = eslintUtils.isClosingParenToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: ')' };
 const isNotClosingParenToken = eslintUtils.isNotClosingParenToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isColonToken = eslintUtils.isColonToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: ':' };
 const isNotColonToken = eslintUtils.isNotColonToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isCommaToken = eslintUtils.isCommaToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: ',' };
 const isNotCommaToken = eslintUtils.isNotCommaToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isCommentToken = eslintUtils.isCommentToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.Comment;
-const isNotCommentToken = eslintUtils.isNotCommentToken as <
-  T extends TSESTree.Token | TSESTree.Comment
->(
-  token: T,
-) => token is Exclude<T, TSESTree.Comment>;
+const isNotCommentToken = eslintUtils.isNotCommentToken as (
+  token: TSESTree.Token,
+) => token is Exclude<TSESTree.Token, TSESTree.Comment>;
 
 const isOpeningBraceToken = eslintUtils.isOpeningBraceToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: '{' };
 const isNotOpeningBraceToken = eslintUtils.isNotOpeningBraceToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isOpeningBracketToken = eslintUtils.isOpeningBracketToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: '[' };
 const isNotOpeningBracketToken = eslintUtils.isNotOpeningBracketToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isOpeningParenToken = eslintUtils.isOpeningParenToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: '(' };
 const isNotOpeningParenToken = eslintUtils.isNotOpeningParenToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 const isSemicolonToken = eslintUtils.isSemicolonToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => token is TSESTree.PunctuatorToken & { value: ';' };
 const isNotSemicolonToken = eslintUtils.isNotSemicolonToken as (
-  token: TSESTree.Token | TSESTree.Comment,
+  token: TSESTree.Token,
 ) => boolean;
 
 export {
diff --git a/packages/experimental-utils/src/ast-utils/misc.ts b/packages/experimental-utils/src/ast-utils/misc.ts
index cf20f99a4cc4..923424d9f928 100644
--- a/packages/experimental-utils/src/ast-utils/misc.ts
+++ b/packages/experimental-utils/src/ast-utils/misc.ts
@@ -6,8 +6,8 @@ const LINEBREAK_MATCHER = /\r\n|[\r\n\u2028\u2029]/;
  * Determines whether two adjacent tokens are on the same line
  */
 function isTokenOnSameLine(
-  left: TSESTree.Token | TSESTree.Comment,
-  right: TSESTree.Token | TSESTree.Comment,
+  left: TSESTree.Token,
+  right: TSESTree.Token,
 ): boolean {
   return left.loc.end.line === right.loc.start.line;
 }