From e0d450955c9792f2ba312a082d41dedd858862b6 Mon Sep 17 00:00:00 2001
From: Ryan Delaney <rdel@google.com>
Date: Fri, 28 Feb 2020 17:48:06 +0000
Subject: [PATCH] fixup! Upgrade to TypeScript 3.8

---
 src/language/utils.ts                   | 6 ++++++
 src/rules/importBlacklistRule.ts        | 3 ++-
 src/rules/noUnnecessaryQualifierRule.ts | 2 +-
 src/rules/whitespaceRule.ts             | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/language/utils.ts b/src/language/utils.ts
index 9160d82b508..affebde00ba 100644
--- a/src/language/utils.ts
+++ b/src/language/utils.ts
@@ -582,3 +582,9 @@ export function isWhiteSpace(ch: number): boolean {
     // tslint:disable-next-line
     return (ts.isWhiteSpaceLike || (ts as any).isWhiteSpace)(ch);
 }
+
+/** Wrapper for compatability with typescript@<3.8.2 */
+export function isPrivateIdentifier(node: ts.Node): node is ts.PrivateIdentifier {
+    // tslint:disable-next-line
+    return ts.isPrivateIdentifier ? ts.isPrivateIdentifier(node) : false;
+}
diff --git a/src/rules/importBlacklistRule.ts b/src/rules/importBlacklistRule.ts
index f8ad34fcad7..ecec1b135d9 100644
--- a/src/rules/importBlacklistRule.ts
+++ b/src/rules/importBlacklistRule.ts
@@ -20,6 +20,7 @@ import {
     ImportKind,
     isExportDeclaration,
     isImportDeclaration,
+    isNamedExports,
     isNamedImports,
 } from "tsutils";
 import * as ts from "typescript";
@@ -237,7 +238,7 @@ function walk(ctx: Lint.WalkContext<Options>) {
                               toExportName,
                           )
                         : []),
-                    ...(exportClause && ts.isNamedExports(exportClause)
+                    ...(exportClause !== undefined && isNamedExports(exportClause)
                         ? exportClause.elements.map(toExportName)
                         : []),
                 ];
diff --git a/src/rules/noUnnecessaryQualifierRule.ts b/src/rules/noUnnecessaryQualifierRule.ts
index 963a9db32a8..6928c4d1656 100644
--- a/src/rules/noUnnecessaryQualifierRule.ts
+++ b/src/rules/noUnnecessaryQualifierRule.ts
@@ -64,7 +64,7 @@ function walk(ctx: Lint.WalkContext, checker: ts.TypeChecker): void {
 
             case ts.SyntaxKind.PropertyAccessExpression:
                 const { expression, name } = node as ts.PropertyAccessExpression;
-                if (utils.isEntityNameExpression(expression) && !ts.isPrivateIdentifier(name)) {
+                if (utils.isEntityNameExpression(expression) && !Lint.isPrivateIdentifier(name)) {
                     visitNamespaceAccess(node, expression, name);
                     break;
                 }
diff --git a/src/rules/whitespaceRule.ts b/src/rules/whitespaceRule.ts
index 07bb60ce33a..608fa2a7179 100644
--- a/src/rules/whitespaceRule.ts
+++ b/src/rules/whitespaceRule.ts
@@ -175,7 +175,7 @@ function walk(ctx: Lint.WalkContext<Options>) {
                 if (
                     options.module &&
                     exportClause !== undefined &&
-                    ts.isNamedExports(exportClause)
+                    utils.isNamedExports(exportClause)
                 ) {
                     exportClause.elements.forEach((element, idx, arr) => {
                         if (idx === arr.length - 1) {