Remove all references to @view, which has been removed from angular (#462)

Fix all tests using it, remove tests testing it specifically, and
remove it as a possibliity for the directives lookup strategy.

Remove from test angular code as well, to confirm our code will run
when that class is absent.

Author: MichaelRFairhurst

angular_analyzer_plugin/lib/src/model.dart

@@ -627,18 +627,17 @@ class UseConstValueStrategy implements DirectivesStrategy {
           T Function(DartObject, SourceRange) constStrategyHandler) =>
       constStrategyHandler(
           annotatedObject.metadata
-              .where((m) => _isViewOrComponent(m.element?.enclosingElement))
+              .where((m) => _isComponent(m.element?.enclosingElement))
               .map((m) => _getDirectives(m.computeConstantValue()))
               // TODO(mfairhurst): report error for double definition
               .firstWhere((directives) => !(directives?.isNull ?? true),
                   orElse: () => null),
           sourceRange);
 
-  /// Check if an element is a View or Component
-  bool _isViewOrComponent(dart.Element element) =>
+  /// Check if an element is a Component
+  bool _isComponent(dart.Element element) =>
       element is dart.ClassElement &&
-      (element.type.isSubtypeOf(standardAngular.view.type) ||
-          element.type.isSubtypeOf(standardAngular.component.type));
+      element.type.isSubtypeOf(standardAngular.component.type);
 
   /// Traverse the inheritance hierarchy in the constant value, looking for the
   /// 'directives' field at the highest level it occurs.

angular_analyzer_plugin/lib/src/standard_components.dart

@@ -26,7 +26,6 @@ class StandardAngular {
   final ClassElement elementRef;
   final ClassElement queryList;
   final ClassElement pipeTransform;
-  final ClassElement view;
   final ClassElement component;
   final SecuritySchema securitySchema;
 
@@ -35,7 +34,6 @@ class StandardAngular {
       this.elementRef,
       this.queryList,
       this.pipeTransform,
-      this.view,
       this.component,
       this.securitySchema});
 
@@ -64,7 +62,6 @@ class StandardAngular {
         elementRef: ng.get("ElementRef"),
         templateRef: ng.get("TemplateRef"),
         pipeTransform: ng.get("PipeTransform"),
-        view: ng.get("View"),
         component: ng.get("Component"),
         securitySchema: securitySchema);
   }

angular_analyzer_plugin/lib/src/view_extraction.dart

@@ -33,24 +33,19 @@ class ViewExtractor extends AnnotationProcessorMixin {
     for (final unitMember in unit.declarations) {
       if (unitMember is ast.ClassDeclaration) {
         final classElement = unitMember.element;
-        ast.Annotation viewAnnotation;
         ast.Annotation componentAnnotation;
 
         for (final annotation in unitMember.metadata) {
-          if (isAngularAnnotation(annotation, 'View')) {
-            viewAnnotation = annotation;
-          } else if (isAngularAnnotation(annotation, 'Component')) {
+          if (isAngularAnnotation(annotation, 'Component')) {
             componentAnnotation = annotation;
           }
         }
 
-        if (viewAnnotation == null && componentAnnotation == null) {
+        if (componentAnnotation == null) {
           continue;
         }
 
-        //@TODO when there's both a @View and @Component, handle edge cases
-        final view =
-            _createView(classElement, viewAnnotation ?? componentAnnotation);
+        final view = _createView(classElement, componentAnnotation);
 
         if (view != null) {
           views.add(view);

angular_analyzer_plugin/test/abstract_angular.dart

@@ -243,19 +243,6 @@ class Pipe {
   const Pipe(this.name, {bool pure});
 }
 
-class View {
-  final List<Object> directives;
-  const View(
-      {String templateUrl,
-      String template,
-      this.directives,
-      dynamic pipes,
-      ViewEncapsulation encapsulation,
-      List<String> exports,
-      List<String> styles,
-      List<String> styleUrls});
-}
-
 class Input {
   final String bindingPropertyName;
   const Input([this.bindingPropertyName]);

angular_analyzer_plugin/test/angular_driver_test.dart

@@ -286,7 +286,6 @@ class BuildStandardAngularTest extends AbstractAngularTest {
     expect(ng.elementRef, isNotNull);
     expect(ng.queryList, isNotNull);
     expect(ng.pipeTransform, isNotNull);
-    expect(ng.view, isNotNull);
     expect(ng.component, isNotNull);
   }
 
@@ -2000,42 +1999,13 @@ class MyComponent {}
     errorListener.assertNoErrors();
   }
 
-  // ignore: non_constant_identifier_names
-  Future test_directives_not_list_syntax_view() async {
-    final code = r'''
-import 'package:angular2/angular2.dart';
-
-@Directive(selector: '[aaa]')
-class DirectiveA {}
-
-@Directive(selector: '[bbb]')
-class DirectiveB {}
-
-const VARIABLE = const [DirectiveA, DirectiveB];
-
-@Component(selector: 'my-component')
-@View(template: 'My template', directives: VARIABLE)
-class MyComponent {}
-''';
-    final source = newSource('/test.dart', code);
-    await getViews(source);
-    final view = getViewByClassName(views, 'MyComponent');
-    expect(
-        view.directivesStrategy, const isInstanceOf<UseConstValueStrategy>());
-    final directiveClassNames =
-        view.directives.map((directive) => directive.name).toList();
-    expect(directiveClassNames, unorderedEquals(['DirectiveA', 'DirectiveB']));
-    // no errors
-    errorListener.assertNoErrors();
-  }
-
   // ignore: non_constant_identifier_names
   Future test_directives_not_list_syntax_errorWithinVariable() async {
     final code = r'''
 import 'package:angular2/angular2.dart';
 
-@Component(selector: 'my-component')
-@View(template: 'My template', directives: VARIABLE)
+@Component(selector: 'my-component', template: 'My template',
+    directives: VARIABLE)
 class MyComponent {}
 
 // A non-array is a type error in the analyzer; a non-component in an array is
@@ -2213,20 +2183,6 @@ class MyComponent {}
         <ErrorCode>[AngularWarningCode.TYPE_IS_NOT_A_DIRECTIVE]);
   }
 
-  // ignore: non_constant_identifier_names
-  Future test_hasError_ComponentAnnotationMissing() async {
-    final source = newSource('/test.dart', r'''
-import 'package:angular2/angular2.dart';
-
-@View(template: 'AAA')
-class ComponentA {
-}
-''');
-    await getViews(source);
-    errorListener.assertErrorsWithCodes(
-        <ErrorCode>[AngularWarningCode.COMPONENT_ANNOTATION_MISSING]);
-  }
-
   // ignore: non_constant_identifier_names
   Future test_hasError_StringValueExpected() async {
     final source = newSource('/test.dart', r'''
@@ -2357,33 +2313,6 @@ class MyComponent {}
     }
   }
 
-  // ignore: non_constant_identifier_names
-  Future test_templateExternalUsingViewAnnotation() async {
-    final code = r'''
-import 'package:angular2/angular2.dart';
-
-@Component(selector: 'my-component')
-@View(templateUrl: 'my-template.html')
-class MyComponent {}
-''';
-    final dartSource = newSource('/test.dart', code);
-    final htmlSource = newSource('/my-template.html', '');
-    await getViews(dartSource);
-    expect(views, hasLength(1));
-    // MyComponent
-    final view = getViewByClassName(views, 'MyComponent');
-    expect(view.component, getComponentByName(directives, 'MyComponent'));
-    expect(view.templateText, isNull);
-    expect(view.templateUriSource, isNotNull);
-    expect(view.templateUriSource, htmlSource);
-    expect(view.templateSource, htmlSource);
-    {
-      final url = "'my-template.html'";
-      expect(view.templateUrlRange,
-          new SourceRange(code.indexOf(url), url.length));
-    }
-  }
-
   // ignore: non_constant_identifier_names
   Future test_templateInline() async {
     final code = r'''
@@ -2419,42 +2348,6 @@ class MyComponent {}
     }
   }
 
-  // ignore: non_constant_identifier_names
-  Future test_templateInlineUsingViewAnnotation() async {
-    final code = r'''
-import 'package:angular2/angular2.dart';
-
-@Directive(selector: 'my-directive')
-class MyDirective {}
-
-@Component(selector: 'other-component')
-@View(template: 'Other template')
-class OtherComponent {}
-
-@Component(selector: 'my-component')
-@View(template: 'My template', directives: const [MyDirective, OtherComponent])
-class MyComponent {}
-''';
-    final source = newSource('/test.dart', code);
-    await getViews(source);
-    expect(views, hasLength(2));
-    {
-      final view = getViewByClassName(views, 'MyComponent');
-      expect(view.component, getComponentByName(directives, 'MyComponent'));
-      expect(view.templateText, ' My template '); // spaces preserve offsets
-      expect(view.templateOffset, code.indexOf('My template') - 1);
-      expect(view.templateUriSource, isNull);
-      expect(view.templateSource, source);
-      {
-        expect(view.directives, hasLength(2));
-        final directiveClassNames =
-            view.directives.map((directive) => directive.name).toList();
-        expect(directiveClassNames,
-            unorderedEquals(['OtherComponent', 'MyDirective']));
-      }
-    }
-  }
-
   // ignore: non_constant_identifier_names
   Future test_useFunctionalDirective() async {
     final code = r'''

angular_analyzer_plugin/test/navigation_test.dart

@@ -72,15 +72,14 @@ class AngularNavigationTest extends AbstractAngularTest {
     code = r'''
 import '/angular/src/core/metadata.dart';
 
-@Component(selector: 'text-panel', inputs: const ['text: my-text'])
-@View(template: r"<div>some text</div>")
+@Component(selector: 'text-panel', inputs: const ['text: my-text'],
+    template: r"<div>some text</div>")
 class TextPanel {
   String text; // 1
   @Input() longform; // 4
 }
 
-@Component(selector: 'UserPanel')
-@View(template: r"""
+@Component(selector: 'UserPanel', template: r"""
 <div>
   <text-panel [my-text]='user.name' [longform]='""'></text-panel> // close
 </div>
@@ -126,7 +125,7 @@ class User {
       _findRegionString('my-text', ']=');
       expect(region.targetKind, protocol.ElementKind.UNKNOWN);
       expect(targetLocation.file, '/test.dart');
-      expect(targetLocation.offset, code.indexOf("my-text'])"));
+      expect(targetLocation.offset, code.indexOf("my-text'],"));
     }
     // template references field
     {
@@ -156,8 +155,7 @@ class User {
     code = r'''
 import 'package:angular/src/core/metadata.dart';
 
-@Component(selector: 'text-panel')
-@View(templateUrl: 'text_panel.html')
+@Component(selector: 'text-panel', templateUrl: 'text_panel.html')
 class TextPanel {}
 ''';
     final dartSource = newSource('/test.dart', code);
@@ -180,8 +178,7 @@ class TextPanel {}
     final dartCode = r'''
 import 'package:angular/src/core/metadata.dart';
 
-@Component(selector: 'text-panel')
-@View(templateUrl: 'text_panel.html')
+@Component(selector: 'text-panel', templateUrl: 'text_panel.html')
 class TextPanel {
   String text; // 1
 }