refactor(Goldens): Remove a partially failing test case (from #908).

After further investigation, there is some regression in resolving types from
the angular_forms library from within the _goldens library, but only internally
for the golden file generator ... woo, a mouth-full.

It makes sense to just trim this specific case out, since we have coverage of
the type inference feature in other test cases, and not worry about trying to
resolve another package from within the golden files.

[After speaking to multiple members of the analyzer team, it seems like both order, types (summaries versus source files), and other very subtle things could cause this, and since we are on the deprecated AnalysisContext for builders anyway, it doesn't make sense to focus on this specific case.]

... also refactor that golden file, while we are at it!

PiperOrigin-RevId: 186656275

Author: matanlurey

_goldens/test/_files/directives/directive_wrapper.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:html';
 import 'package:angular/angular.dart';
-import 'package:angular_forms/angular_forms.dart';
 
 @Directive(
   selector: '[some-child-directive]',
@@ -14,8 +13,6 @@ import 'package:angular_forms/angular_forms.dart';
     '[attr.aria-disabled]': 'disabledStr',
     '[class.is-disabled]': 'disabled',
   },
-  // TODO(b/71710685): Change to `Visibility.local` to reduce code size.
-  visibility: Visibility.all,
 )
 class ChildDirective {
   Element element;
@@ -51,8 +48,6 @@ class ChildDirective {
 
 @Directive(
   selector: '[directive-with-output]',
-  // TODO(b/71710685): Change to `Visibility.local` to reduce code size.
-  visibility: Visibility.all,
 )
 class DirectiveWithOutput {
   String msg;
@@ -68,12 +63,13 @@ class DirectiveWithOutput {
 
 @Component(
   selector: 'test-foo',
-  template:
-      '<div some-child-directive directive-with-output [row]="rowIndex" (trigger)="onTrigger">Foo</div>',
+  template: r'''
+    <div some-child-directive directive-with-output [row]="rowIndex" (trigger)="onTrigger">
+      Foo
+    </div>
+  ''',
   directives: const [ChildDirective, DirectiveWithOutput],
   styles: const ['div { font-size: 10px; }'],
-  // TODO(b/71710685): Change to `Visibility.local` to reduce code size.
-  visibility: Visibility.all,
 )
 class TestFooComponent {
   int get rowIndex => 5;
@@ -85,20 +81,6 @@ class MyInjectableClass {
   String get title => 'hello';
 }
 
-@Component(
-  selector: 'input-form-test',
-  directives: const [formDirectives],
-  template: '''
-<div [ngFormModel]="form">
-  <input type="text" ngControl="login">
-</div>''',
-  // TODO(b/71710685): Change to `Visibility.local` to reduce code size.
-  visibility: Visibility.all,
-)
-class InputFormTest {
-  ControlGroup form;
-}
-
 @Directive(
   host: const {'[attr.data-msg]': 'msg'},
   selector: '[fastDirective]',
@@ -120,8 +102,10 @@ class FastDirective extends ComponentState {
 
 @Component(
   selector: 'directive-container',
-  template: r'<div class="target1" fastDirective [name]="finalName"></div>'
-      '<div class="target2" fastDirective [name]="nonFinal"></div>',
+  template: r'''
+    <div class="target1" fastDirective [name]="finalName"></div>
+    <div class="target2" fastDirective [name]="nonFinal"></div>
+  ''',
   directives: const [FastDirective],
 )
 class DirectiveContainerTest {

_goldens/test/_files/directives/directive_wrapper.template_debug.golden

@@ -8,10 +8,8 @@ export 'directive_wrapper.dart';
 import 'dart:async';
 import 'dart:html';
 import 'package:angular/angular.dart';
-import 'package:angular_forms/angular_forms.dart';
 import 'package:angular/src/di/reflector.dart' as _ngRef;
 import 'package:angular/angular.template.dart' as _ref0;
-import 'package:angular_forms/angular_forms.template.dart' as _ref1;
 import 'package:angular/src/debug/debug_context.dart';
 import 'directive_wrapper.dart' as import1;
 import 'package:angular/src/debug/debug_app_view.dart';
@@ -23,14 +21,7 @@ import 'package:angular/src/core/change_detection/change_detection.dart';
 import 'package:angular/src/core/linker/app_view_utils.dart' as import8;
 import 'package:angular/angular.dart';
 import 'package:angular/src/core/linker/element_ref.dart';
-import 'package:angular_forms/src/directives/ng_form_model.dart' as import11;
-import 'package:angular_forms/src/directives/control_container.dart' as import12;
-import 'package:angular_forms/src/directives/default_value_accessor.dart' as import13;
-import 'package:angular/src/core/di/opaque_token.dart' as import14;
-import 'package:angular_forms/src/directives/control_value_accessor.dart' as import15;
-import 'package:angular_forms/src/directives/ng_control_name.dart' as import16;
-import 'package:angular_forms/src/directives/ng_control.dart' as import17;
-import 'package:angular/src/core/change_detection/directive_change_detector.dart' as import18;
+import 'package:angular/src/core/change_detection/directive_change_detector.dart' as import11;
 
 const List<dynamic> styles$TestFooComponent = const ['div._ngcontent-%COMP% { font-size:10px; }'];
 List<StaticNodeDebugInfo> nodeDebugInfos_TestFooComponent0 = [
@@ -53,7 +44,7 @@ class ViewTestFooComponent0 extends DebugAppView<import1.TestFooComponent> {
   ComponentRef<import1.TestFooComponent> build() {
     final import3.HtmlElement parentRenderNode = initViewRoot(rootEl);
     var doc = import3.document;
-    _el_0 = createDivAndAppendDbg(this, doc, parentRenderNode, 0, 0, 0);
+    _el_0 = createDivAndAppendDbg(this, doc, parentRenderNode, 0, 0, 4);
     createAttr(_el_0, 'directive-with-output', '');
     createAttr(_el_0, 'role', 'button');
     createAttr(_el_0, 'some-child-directive', '');
@@ -62,7 +53,7 @@ class ViewTestFooComponent0 extends DebugAppView<import1.TestFooComponent> {
     _DirectiveWithOutput_0_5 = new import1.DirectiveWithOutput();
     import3.Text _text_1 = new import3.Text('Foo');
     _el_0.append(_text_1);
-    dbgElm(this, _text_1, 1, 0, 87);
+    dbgElm(this, _text_1, 1, 0, 91);
     _el_0.addEventListener('click', eventHandler1(_ChildDirective_0_4.instance.handleClick));
     _el_0.addEventListener('keypress', eventHandler1(_ChildDirective_0_4.instance.handleKeyPress));
     final subscription_0 = _ChildDirective_0_4.instance.trigger.listen(eventHandler1(_handle_trigger_0_0));
@@ -71,21 +62,10 @@ class ViewTestFooComponent0 extends DebugAppView<import1.TestFooComponent> {
     return null;
   }
 
-  @override
-  dynamic injectorGetInternal(dynamic token, int nodeIndex, dynamic notFoundResult) {
-    if ((identical(token, import1.ChildDirective) && ((0 <= nodeIndex) && (nodeIndex <= 1)))) {
-      return _ChildDirective_0_4.instance;
-    }
-    if ((identical(token, import1.DirectiveWithOutput) && ((0 <= nodeIndex) && (nodeIndex <= 1)))) {
-      return _DirectiveWithOutput_0_5;
-    }
-    return notFoundResult;
-  }
-
   @override
   void detectChangesInternal() {
     final import1.TestFooComponent _ctx = ctx;
-    dbg(0, 0, 48);
+    dbg(0, 0, 52);
     final currVal_0 = _ctx.rowIndex;
     if (import8.checkBinding(_expr_0, currVal_0)) {
       _ChildDirective_0_4.instance.gridRow = currVal_0;
@@ -95,7 +75,7 @@ class ViewTestFooComponent0 extends DebugAppView<import1.TestFooComponent> {
   }
 
   void _handle_trigger_0_0($event) {
-    dbg(0, 0, 65);
+    dbg(0, 0, 69);
     ctx.onTrigger;
   }
 }
@@ -124,14 +104,6 @@ class _ViewTestFooComponentHost0 extends DebugAppView<dynamic> {
     return new ComponentRef<import1.TestFooComponent>(0, this, rootEl, _TestFooComponent_0_4);
   }
 
-  @override
-  dynamic injectorGetInternal(dynamic token, int nodeIndex, dynamic notFoundResult) {
-    if ((identical(token, import1.TestFooComponent) && (0 == nodeIndex))) {
-      return _TestFooComponent_0_4;
-    }
-    return notFoundResult;
-  }
-
   @override
   void detectChangesInternal() {
     _compView_0.detectChanges();
@@ -148,153 +120,6 @@ AppView viewFactory_TestFooComponentHost0(AppView<dynamic> parentView, num paren
 }
 
 const ComponentFactory<import1.TestFooComponent> TestFooComponentNgFactory = const ComponentFactory<import1.TestFooComponent>('test-foo', viewFactory_TestFooComponentHost0, _TestFooComponentMetadata);
-const List<dynamic> styles$InputFormTest = const [];
-List<StaticNodeDebugInfo> nodeDebugInfos_InputFormTest0 = [
-  new StaticNodeDebugInfo([import11.NgFormModel, import12.ControlContainer], null, <String, dynamic>{}),
-  new StaticNodeDebugInfo([import13.DefaultValueAccessor, const import14.MultiToken<import15.ControlValueAccessor<dynamic>>('NgValueAccessor'), import16.NgControlName, import17.NgControl], null, <String, dynamic>{})
-];
-
-class ViewInputFormTest0 extends DebugAppView<import1.InputFormTest> {
-  import3.DivElement _el_0;
-  import11.NgFormModel _NgFormModel_0_4;
-  dynamic _ControlContainer_0_5;
-  import3.InputElement _el_1;
-  import13.DefaultValueAccessor _DefaultValueAccessor_1_4;
-  List<import15.ControlValueAccessor> _NgValueAccessor_1_5;
-  import16.NgControlName _NgControlName_1_6;
-  var _expr_0;
-  static RenderComponentType _renderType;
-  ViewInputFormTest0(AppView<dynamic> parentView, num parentIndex) : super(import6.ViewType.COMPONENT, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_InputFormTest0) {
-    rootEl = import3.document.createElement('input-form-test');
-    _renderType ??= import8.appViewUtils.createRenderType('asset:_goldens/test/_files/directives/directive_wrapper.dart class InputFormTest - inline template', ViewEncapsulation.None, styles$InputFormTest);
-    setupComponentType(_renderType);
-  }
-  @override
-  ComponentRef<import1.InputFormTest> build() {
-    final import3.HtmlElement parentRenderNode = initViewRoot(rootEl);
-    var doc = import3.document;
-    _el_0 = createDivAndAppendDbg(this, doc, parentRenderNode, 0, 0, 0);
-    _NgFormModel_0_4 = new import11.NgFormModel(null);
-    _ControlContainer_0_5 = _NgFormModel_0_4;
-    _el_1 = createAndAppendDbg(this, doc, 'input', _el_0, 1, 1, 2);
-    createAttr(_el_1, 'ngControl', 'login');
-    createAttr(_el_1, 'type', 'text');
-    _DefaultValueAccessor_1_4 = new import13.DefaultValueAccessor(_el_1);
-    _NgValueAccessor_1_5 = [_DefaultValueAccessor_1_4];
-    _NgControlName_1_6 = new import16.NgControlName(_ControlContainer_0_5, null, _NgValueAccessor_1_5);
-    import8.appViewUtils.eventManager.addEventListener(_el_0, 'submit', eventHandler1(_NgFormModel_0_4.onSubmit));
-    _el_1.addEventListener('input', eventHandler1(_handle_input_1_0));
-    _el_1.addEventListener('blur', eventHandler0(_DefaultValueAccessor_1_4.touchHandler));
-    init(const [], null, [_el_0, _el_1]);
-    return null;
-  }
-
-  @override
-  dynamic injectorGetInternal(dynamic token, int nodeIndex, dynamic notFoundResult) {
-    if ((identical(token, import13.DefaultValueAccessor) && (1 == nodeIndex))) {
-      return _DefaultValueAccessor_1_4;
-    }
-    if ((identical(token, const import14.MultiToken<import15.ControlValueAccessor<dynamic>>('NgValueAccessor')) && (1 == nodeIndex))) {
-      return _NgValueAccessor_1_5;
-    }
-    if (((identical(token, import16.NgControlName) || identical(token, import17.NgControl)) && (1 == nodeIndex))) {
-      return _NgControlName_1_6;
-    }
-    if ((identical(token, import11.NgFormModel) && ((0 <= nodeIndex) && (nodeIndex <= 1)))) {
-      return _NgFormModel_0_4;
-    }
-    if ((identical(token, import12.ControlContainer) && ((0 <= nodeIndex) && (nodeIndex <= 1)))) {
-      return _ControlContainer_0_5;
-    }
-    return notFoundResult;
-  }
-
-  @override
-  void detectChangesInternal() {
-    final import1.InputFormTest _ctx = ctx;
-    bool changed = false;
-    bool firstCheck = (this.cdState == 0);
-    changed = false;
-    dbg(0, 0, 5);
-    final currVal_0 = _ctx.form;
-    if (import8.checkBinding(_expr_0, currVal_0)) {
-      _NgFormModel_0_4.form = currVal_0;
-      changed = true;
-      _expr_0 = currVal_0;
-    }
-    if (changed) {
-      _NgFormModel_0_4.ngAfterChanges();
-    }
-    changed = false;
-    if (firstCheck) {
-      _NgControlName_1_6.name = 'login';
-      changed = true;
-    }
-    if (changed) {
-      _NgControlName_1_6.ngAfterChanges();
-    }
-  }
-
-  @override
-  void destroyInternal() {
-    dbg(1, 1, 2);
-    _NgControlName_1_6.ngOnDestroy();
-  }
-
-  void _handle_input_1_0($event) {
-    dbg(1, 1, 2);
-    _DefaultValueAccessor_1_4.onChange($event.target.value);
-  }
-}
-
-AppView<import1.InputFormTest> viewFactory_InputFormTest0(AppView<dynamic> parentView, num parentIndex) {
-  return new ViewInputFormTest0(parentView, parentIndex);
-}
-
-const List<dynamic> styles$InputFormTestHost = const [];
-List<StaticNodeDebugInfo> nodeDebugInfos_InputFormTestHost0 = [
-  new StaticNodeDebugInfo([import1.InputFormTest], import1.InputFormTest, <String, dynamic>{})
-];
-
-class _ViewInputFormTestHost0 extends DebugAppView<dynamic> {
-  ViewInputFormTest0 _compView_0;
-  import1.InputFormTest _InputFormTest_0_4;
-  _ViewInputFormTestHost0(AppView<dynamic> parentView, num parentIndex) : super(import6.ViewType.HOST, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_InputFormTestHost0);
-  @override
-  ComponentRef build() {
-    _compView_0 = new ViewInputFormTest0(this, 0);
-    rootEl = _compView_0.rootEl;
-    dbgIdx(rootEl, 0);
-    _InputFormTest_0_4 = new import1.InputFormTest();
-    _compView_0.create(_InputFormTest_0_4, projectableNodes);
-    init0Dbg(rootEl, [rootEl]);
-    return new ComponentRef<import1.InputFormTest>(0, this, rootEl, _InputFormTest_0_4);
-  }
-
-  @override
-  dynamic injectorGetInternal(dynamic token, int nodeIndex, dynamic notFoundResult) {
-    if ((identical(token, import1.InputFormTest) && (0 == nodeIndex))) {
-      return _InputFormTest_0_4;
-    }
-    return notFoundResult;
-  }
-
-  @override
-  void detectChangesInternal() {
-    _compView_0.detectChanges();
-  }
-
-  @override
-  void destroyInternal() {
-    _compView_0?.destroy();
-  }
-}
-
-AppView viewFactory_InputFormTestHost0(AppView<dynamic> parentView, num parentIndex) {
-  return new _ViewInputFormTestHost0(parentView, parentIndex);
-}
-
-const ComponentFactory<import1.InputFormTest> InputFormTestNgFactory = const ComponentFactory<import1.InputFormTest>('input-form-test', viewFactory_InputFormTestHost0, _InputFormTestMetadata);
 const List<dynamic> styles$DirectiveContainerTest = const [];
 List<StaticNodeDebugInfo> nodeDebugInfos_DirectiveContainerTest0 = [
   new StaticNodeDebugInfo([import1.FastDirective], null, <String, dynamic>{}),
@@ -316,11 +141,11 @@ class ViewDirectiveContainerTest0 extends DebugAppView<import1.DirectiveContaine
   ComponentRef<import1.DirectiveContainerTest> build() {
     final import3.HtmlElement parentRenderNode = initViewRoot(rootEl);
     var doc = import3.document;
-    _el_0 = createDivAndAppendDbg(this, doc, parentRenderNode, 0, 0, 0);
+    _el_0 = createDivAndAppendDbg(this, doc, parentRenderNode, 0, 0, 4);
     _el_0.className = 'target1';
     createAttr(_el_0, 'fastDirective', '');
     _FastDirective_0_4 = new FastDirectiveNgCd(new import1.FastDirective(_el_0), this, _el_0);
-    _el_1 = createDivAndAppendDbg(this, doc, parentRenderNode, 1, 0, 60);
+    _el_1 = createDivAndAppendDbg(this, doc, parentRenderNode, 1, 1, 4);
     _el_1.className = 'target2';
     createAttr(_el_1, 'fastDirective', '');
     _FastDirective_1_4 = new FastDirectiveNgCd(new import1.FastDirective(_el_1), this, _el_1);
@@ -335,7 +160,7 @@ class ViewDirectiveContainerTest0 extends DebugAppView<import1.DirectiveContaine
     if (firstCheck) {
       (_FastDirective_0_4.instance.name = _ctx.finalName);
     }
-    dbg(1, 0, 95);
+    dbg(1, 1, 39);
     _FastDirective_1_4.instance.name = _ctx.nonFinal;
   }
 }
@@ -381,7 +206,7 @@ AppView viewFactory_DirectiveContainerTestHost0(AppView<dynamic> parentView, num
 
 const ComponentFactory<import1.DirectiveContainerTest> DirectiveContainerTestNgFactory = const ComponentFactory<import1.DirectiveContainerTest>('directive-container', viewFactory_DirectiveContainerTestHost0, _DirectiveContainerTestMetadata);
 
-class ChildDirectiveNgCd extends import18.DirectiveChangeDetector {
+class ChildDirectiveNgCd extends import11.DirectiveChangeDetector {
   final import1.ChildDirective instance;
   var _expr_0;
   var _expr_1;
@@ -406,7 +231,7 @@ class ChildDirectiveNgCd extends import18.DirectiveChangeDetector {
   }
 }
 
-class FastDirectiveNgCd extends import18.DirectiveChangeDetector {
+class FastDirectiveNgCd extends import11.DirectiveChangeDetector {
   final import1.FastDirective instance;
   var _expr_0;
   FastDirectiveNgCd(this.instance, AppView v, import3.Element e) {
@@ -425,7 +250,6 @@ class FastDirectiveNgCd extends import18.DirectiveChangeDetector {
 }
 
 const _TestFooComponentMetadata = const [];
-const _InputFormTestMetadata = const [];
 const _DirectiveContainerTestMetadata = const [];
 var _visited = false;
 void initReflector() {
@@ -436,8 +260,6 @@ void initReflector() {
 
   _ngRef.registerComponent(TestFooComponent, TestFooComponentNgFactory);
   _ngRef.registerFactory(MyInjectableClass, () => new MyInjectableClass());
-  _ngRef.registerComponent(InputFormTest, InputFormTestNgFactory);
   _ngRef.registerComponent(DirectiveContainerTest, DirectiveContainerTestNgFactory);
   _ref0.initReflector();
-  _ref1.initReflector();
 }