From c96b3280d7ba682ff13b1c5e7ba20530a541375f Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 18 Nov 2020 14:57:13 -0800
Subject: [PATCH] Fix minor issues

---
 src/compiler/transformers/declarations.ts | 1 +
 src/compiler/utilitiesPublic.ts           | 4 ++++
 src/compiler/visitorPublic.ts             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index 05191159537..e6f03511fec 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -633,6 +633,7 @@ namespace ts {
                 || isTypeAliasDeclaration(node)
                 || isModuleDeclaration(node)
                 || isClassDeclaration(node)
+                || isClassExpression(node)
                 || isInterfaceDeclaration(node)
                 || isFunctionLike(node)
                 || isIndexSignatureDeclaration(node)
diff --git a/src/compiler/utilitiesPublic.ts b/src/compiler/utilitiesPublic.ts
index 0f702eba480..8682d0b43de 100644
--- a/src/compiler/utilitiesPublic.ts
+++ b/src/compiler/utilitiesPublic.ts
@@ -1176,6 +1176,10 @@ namespace ts {
             || kind === SyntaxKind.Identifier;
     }
 
+    export function isEntityNameOrClassExpression(node: Node): node is EntityName {
+        return isEntityName(node) || node.kind === SyntaxKind.ClassExpression;
+    }
+
     export function isPropertyName(node: Node): node is PropertyName {
         const kind = node.kind;
         return kind === SyntaxKind.Identifier
diff --git a/src/compiler/visitorPublic.ts b/src/compiler/visitorPublic.ts
index 8a06e110552..09bb51639dc 100644
--- a/src/compiler/visitorPublic.ts
+++ b/src/compiler/visitorPublic.ts
@@ -491,7 +491,7 @@ namespace ts {
 
             case SyntaxKind.TypeQuery:
                 return factory.updateTypeQueryNode((<TypeQueryNode>node),
-                    nodeVisitor((<TypeQueryNode>node).exprName, visitor, isEntityName));
+                    nodeVisitor((<TypeQueryNode>node).exprName, visitor, isEntityNameOrClassExpression));
 
             case SyntaxKind.TypeLiteral:
                 return factory.updateTypeLiteralNode((<TypeLiteralNode>node),