From f2df1c79d2b44c103c36a4132d93e4491cc825aa Mon Sep 17 00:00:00 2001
From: Mike Casebolt <mikebolt@gmail.com>
Date: Mon, 13 Jan 2020 12:17:23 -0800
Subject: [PATCH] refactor(core): remove underscore suffix from locally scoped
 class expression names (#34757)

remove unnecessary underscore suffix and the corresponding TODO comments,
because the rollup bug was fixed: github.com/rollup/rollup/issues/2047

PR Close #34757
---
 packages/core/src/render3/view_engine_compatibility.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/render3/view_engine_compatibility.ts b/packages/core/src/render3/view_engine_compatibility.ts
index 2baf497f20..a82ad0c66d 100644
--- a/packages/core/src/render3/view_engine_compatibility.ts
+++ b/packages/core/src/render3/view_engine_compatibility.ts
@@ -60,8 +60,7 @@ export function createElementRef(
     ElementRefToken: typeof ViewEngine_ElementRef, tNode: TNode,
     view: LView): ViewEngine_ElementRef {
   if (!R3ElementRef) {
-    // TODO: Fix class name, should be ElementRef, but there appears to be a rollup bug
-    R3ElementRef = class ElementRef_ extends ElementRefToken {};
+    R3ElementRef = class ElementRef extends ElementRefToken {};
   }
   return new R3ElementRef(getNativeByTNode(tNode, view) as RElement);
 }
@@ -96,8 +95,7 @@ export function createTemplateRef<T>(
     TemplateRefToken: typeof ViewEngine_TemplateRef, ElementRefToken: typeof ViewEngine_ElementRef,
     hostTNode: TNode, hostView: LView): ViewEngine_TemplateRef<T>|null {
   if (!R3TemplateRef) {
-    // TODO: Fix class name, should be TemplateRef, but there appears to be a rollup bug
-    R3TemplateRef = class TemplateRef_<T> extends TemplateRefToken<T> {
+    R3TemplateRef = class TemplateRef<T> extends TemplateRefToken<T> {
       constructor(
           private _declarationView: LView, private _declarationTContainer: TContainerNode,
           readonly elementRef: ViewEngine_ElementRef) {
@@ -173,8 +171,7 @@ export function createContainerRef(
     hostTNode: TElementNode|TContainerNode|TElementContainerNode,
     hostView: LView): ViewEngine_ViewContainerRef {
   if (!R3ViewContainerRef) {
-    // TODO: Fix class name, should be ViewContainerRef, but there appears to be a rollup bug
-    R3ViewContainerRef = class ViewContainerRef_ extends ViewContainerRefToken {
+    R3ViewContainerRef = class ViewContainerRef extends ViewContainerRefToken {
       constructor(
           private _lContainer: LContainer,
           private _hostTNode: TElementNode|TContainerNode|TElementContainerNode,