Rework facade classes to make use of new analyzer "wrapped" classes. (#620) * Rework facade classes to make use of new analyzer "wrapped" classes.
diff --git a/angular_analyzer_plugin/lib/src/facade/exports_compilation_unit_element.dart b/angular_analyzer_plugin/lib/src/facade/exports_compilation_unit_element.dart index f721db0..752e6ff 100644 --- a/angular_analyzer_plugin/lib/src/facade/exports_compilation_unit_element.dart +++ b/angular_analyzer_plugin/lib/src/facade/exports_compilation_unit_element.dart
@@ -1,19 +1,18 @@ -import 'package:analyzer/dart/ast/ast.dart' hide Directive; import 'package:analyzer/dart/element/element.dart'; -import 'package:analyzer/src/generated/engine.dart' show AnalysisContext; -import 'package:analyzer/src/generated/java_engine.dart'; -import 'package:analyzer/src/generated/source.dart'; +import 'package:analyzer/src/dart/element/wrapped.dart'; import 'package:angular_analyzer_plugin/src/model.dart'; /// A facade for a [CompilationUnitElement] which consists only of a component's /// exports, and the component itself. -class ExportsLimitedCompilationUnitFacade implements CompilationUnitElement { +class ExportsLimitedCompilationUnitFacade + extends WrappedCompilationUnitElement { final Component _component; - final CompilationUnitElement _wrappedUnit; LibraryElement libraryFacade; - ExportsLimitedCompilationUnitFacade(this._wrappedUnit, this._component, - {this.libraryFacade}); + ExportsLimitedCompilationUnitFacade( + CompilationUnitElement wrappedUnit, this._component, + {this.libraryFacade}) + : super(wrappedUnit); @override List<PropertyAccessorElement> get accessors => @@ -23,15 +22,6 @@ .where((element) => element is PropertyAccessorElement)); @override - AnalysisContext get context => _wrappedUnit.context; - - @override - String get displayName => _wrappedUnit.displayName; - - @override - String get documentationComment => _wrappedUnit.documentationComment; - - @override LibraryElement get enclosingElement => libraryFacade; @override @@ -51,109 +41,15 @@ List<FunctionTypeAliasElement> get functionTypeAliases => []; @override - bool get hasAlwaysThrows => _wrappedUnit.hasAlwaysThrows; - - @override - bool get hasDeprecated => _wrappedUnit.hasDeprecated; - - @override - bool get hasFactory => _wrappedUnit.hasFactory; - - @override - bool get hasIsTest => _wrappedUnit.hasIsTest; - - @override - bool get hasIsTestGroup => _wrappedUnit.hasIsTestGroup; - - @override bool get hasJS => false; @override - bool get hasLoadLibraryFunction => _wrappedUnit.hasLoadLibraryFunction; - - @override - bool get hasOverride => _wrappedUnit.hasOverride; - - @override - bool get hasProtected => _wrappedUnit.hasProtected; - - @override - bool get hasRequired => _wrappedUnit.hasRequired; - - @override - bool get hasVisibleForTemplate => _wrappedUnit.hasVisibleForTemplate; - - @override - bool get hasVisibleForTesting => _wrappedUnit.hasVisibleForTesting; - - @override - int get id => _wrappedUnit.id; - - @override - bool get isAlwaysThrows => hasAlwaysThrows; - - @override - bool get isDeprecated => hasDeprecated; - - @override - bool get isFactory => hasFactory; - - @override bool get isJS => false; @override - bool get isOverride => hasOverride; - - @override - bool get isPrivate => _wrappedUnit.isPrivate; - - @override - bool get isProtected => hasProtected; - - @override - bool get isPublic => _wrappedUnit.isPublic; - - @override - bool get isRequired => hasRequired; - - @override - bool get isSynthetic => _wrappedUnit.isSynthetic; - - @override - bool get isVisibleForTesting => hasVisibleForTesting; - - @override - ElementKind get kind => _wrappedUnit.kind; - - @override LibraryElement get library => libraryFacade; @override - Source get librarySource => _wrappedUnit.librarySource; - - @override - LineInfo get lineInfo => _wrappedUnit.lineInfo; - - @override - ElementLocation get location => _wrappedUnit.location; - - @override - List<ElementAnnotation> get metadata => _wrappedUnit.metadata; - - @override - String get name => _wrappedUnit.name; - - @override - int get nameLength => - _wrappedUnit.nameLength; // ignore: deprecated_member_use - - @override - int get nameOffset => _wrappedUnit.nameOffset; - - @override - Source get source => _wrappedUnit.source; - - @override List<TopLevelVariableElement> get topLevelVariables => []; @override @@ -164,51 +60,13 @@ ..add(_component.classElement); @override - CompilationUnit get unit => _wrappedUnit.unit; - - @override - String get uri => _wrappedUnit.uri; - - @override - int get uriEnd => _wrappedUnit.uriEnd; - - @override - int get uriOffset => _wrappedUnit.uriOffset; - - @override - T accept<T>(ElementVisitor<T> visitor) => _wrappedUnit.accept(visitor); - - @override - String computeDocumentationComment() => - _wrappedUnit.computeDocumentationComment(); - - @override - CompilationUnit computeNode() => _wrappedUnit.computeNode(); - - @override - E getAncestor<E extends Element>(Predicate<Element> predicate) => - _wrappedUnit.getAncestor(predicate); // currently never exported - - @override ClassElement getEnum(String name) => enums.firstWhere((_enum) => _enum.name == name, orElse: () => null); @override - String getExtendedDisplayName(String shortName) => _wrappedUnit - .getExtendedDisplayName(shortName); // currently never exported - - @override ClassElement getType(String className) => types.firstWhere((type) => type.name == name, orElse: () => null); - @override - bool isAccessibleIn(LibraryElement library) => - _wrappedUnit.isAccessibleIn(library); - - @override - void visitChildren(ElementVisitor visitor) => - _wrappedUnit.visitChildren(visitor); - // CompilationUnitFacade's are not used for imports, which have prefixes bool _fromThisUnit(ExportedIdentifier export) => export.prefix == ''; }
diff --git a/angular_analyzer_plugin/lib/src/facade/exports_import_element.dart b/angular_analyzer_plugin/lib/src/facade/exports_import_element.dart index 4d58f3e..b75876f 100644 --- a/angular_analyzer_plugin/lib/src/facade/exports_import_element.dart +++ b/angular_analyzer_plugin/lib/src/facade/exports_import_element.dart
@@ -1,187 +1,33 @@ -import 'package:analyzer/dart/ast/ast.dart' hide Directive; import 'package:analyzer/dart/element/element.dart'; -import 'package:analyzer/src/dart/resolver/scope.dart'; -import 'package:analyzer/src/generated/engine.dart' show AnalysisContext; -import 'package:analyzer/src/generated/java_engine.dart'; -import 'package:analyzer/src/generated/source.dart'; +import 'package:analyzer/src/dart/element/wrapped.dart'; import 'package:angular_analyzer_plugin/src/facade/exports_library_element.dart'; import 'package:angular_analyzer_plugin/src/model.dart'; /// A facade for a [ImportElement] which consists only of a component's /// exports -class ExportsImportElementFacade implements ImportElement { +class ExportsImportElementFacade extends WrappedImportElement { final Component _component; - final ImportElement _wrappedImport; LibraryElement libraryFacade; - ExportsImportElementFacade(this._wrappedImport, this._component, - {this.libraryFacade}); - - @override - List<NamespaceCombinator> get combinators => _wrappedImport.combinators; - - @override - AnalysisContext get context => _wrappedImport.context; - - @override - String get displayName => _wrappedImport.displayName; - - @override - String get documentationComment => _wrappedImport.documentationComment; + ExportsImportElementFacade(ImportElement wrappedImport, this._component, + {this.libraryFacade}) + : super(wrappedImport); @override LibraryElement get enclosingElement => libraryFacade; @override - bool get hasAlwaysThrows => _wrappedImport.hasAlwaysThrows; - - @override - bool get hasDeprecated => _wrappedImport.hasDeprecated; - - @override - bool get hasFactory => _wrappedImport.hasFactory; - - @override - bool get hasIsTest => _wrappedImport.hasIsTest; - - @override - bool get hasIsTestGroup => _wrappedImport.hasIsTestGroup; - - @override bool get hasJS => false; @override - bool get hasOverride => _wrappedImport.hasOverride; - - @override - bool get hasProtected => _wrappedImport.hasProtected; - - @override - bool get hasRequired => _wrappedImport.hasRequired; - - @override - bool get hasVisibleForTemplate => _wrappedImport.hasVisibleForTemplate; - - @override - bool get hasVisibleForTesting => _wrappedImport.hasVisibleForTesting; - - @override - int get id => _wrappedImport.id; - - @override - LibraryElement get importedLibrary => _wrappedImport.importedLibrary == null + LibraryElement get importedLibrary => wrappedImport.importedLibrary == null ? null - : new ExportsLibraryFacade(_wrappedImport.importedLibrary, _component, + : new ExportsLibraryFacade(wrappedImport.importedLibrary, _component, prefix: prefix?.name); @override - bool get isAlwaysThrows => hasAlwaysThrows; - - @override - bool get isDeferred => _wrappedImport.isDeferred; - - @override - bool get isDeprecated => hasDeprecated; - - @override - bool get isFactory => hasFactory; - - @override bool get isJS => false; @override - bool get isOverride => hasOverride; - - @override - bool get isPrivate => _wrappedImport.isPrivate; - - @override - bool get isProtected => hasProtected; - - @override - bool get isPublic => _wrappedImport.isPublic; - - @override - bool get isRequired => hasRequired; - - @override - bool get isSynthetic => _wrappedImport.isSynthetic; - - @override - bool get isVisibleForTesting => hasVisibleForTesting; - - @override - ElementKind get kind => _wrappedImport.kind; - - @override LibraryElement get library => libraryFacade; - - @override - Source get librarySource => _wrappedImport.librarySource; - - @override - ElementLocation get location => _wrappedImport.location; - - @override - List<ElementAnnotation> get metadata => _wrappedImport.metadata; - - @override - String get name => _wrappedImport.name; - - @override - int get nameLength => _wrappedImport.nameLength; - - @override - int get nameOffset => _wrappedImport.nameOffset; - - @override - Namespace get namespace => _wrappedImport.namespace; - - @override - PrefixElement get prefix => - _wrappedImport.prefix; // ignore: deprecated_member_use - - @override - int get prefixOffset => _wrappedImport.prefixOffset; - - @override - Source get source => _wrappedImport.source; - - @override - CompilationUnit get unit => _wrappedImport.unit; - - @override - String get uri => _wrappedImport.uri; - - @override - int get uriEnd => _wrappedImport.uriEnd; - - @override - int get uriOffset => _wrappedImport.uriOffset; - - @override - T accept<T>(ElementVisitor<T> visitor) => _wrappedImport.accept(visitor); - - @override - String computeDocumentationComment() => - _wrappedImport.computeDocumentationComment(); - - @override - AstNode computeNode() => _wrappedImport.computeNode(); - - @override - E getAncestor<E extends Element>(Predicate<Element> predicate) => - _wrappedImport.getAncestor(predicate); - - @override - String getExtendedDisplayName(String shortName) => - _wrappedImport.getExtendedDisplayName(shortName); - - @override - bool isAccessibleIn(LibraryElement library) => - _wrappedImport.isAccessibleIn(library); - - @override - void visitChildren(ElementVisitor visitor) => - _wrappedImport.visitChildren(visitor); }
diff --git a/angular_analyzer_plugin/lib/src/facade/exports_library_element.dart b/angular_analyzer_plugin/lib/src/facade/exports_library_element.dart index 1d55317..b682329 100644 --- a/angular_analyzer_plugin/lib/src/facade/exports_library_element.dart +++ b/angular_analyzer_plugin/lib/src/facade/exports_library_element.dart
@@ -1,18 +1,13 @@ -import 'package:analyzer/dart/ast/ast.dart' hide Directive; import 'package:analyzer/dart/element/element.dart'; -import 'package:analyzer/src/dart/element/element.dart'; -import 'package:analyzer/src/generated/engine.dart' show AnalysisContext; -import 'package:analyzer/src/generated/java_engine.dart'; +import 'package:analyzer/src/dart/element/wrapped.dart'; import 'package:analyzer/src/generated/resolver.dart'; -import 'package:analyzer/src/generated/source.dart'; import 'package:angular_analyzer_plugin/src/facade/exports_compilation_unit_element.dart'; import 'package:angular_analyzer_plugin/src/facade/exports_import_element.dart'; import 'package:angular_analyzer_plugin/src/model.dart'; /// A facade for a [Library] which consists only of a components' exports, and /// the component itself. -class ExportsLibraryFacade extends ElementImpl implements LibraryElement { - final LibraryElement _wrappedLib; +class ExportsLibraryFacade extends WrappedLibraryElement { final ExportsLimitedCompilationUnitFacade _definingUnit; final Component _owningComponent; @@ -26,225 +21,74 @@ return new ExportsLibraryFacade._(wrappedLib, owningComponent); } - ExportsLibraryFacade._(this._wrappedLib, this._owningComponent) + ExportsLibraryFacade._(LibraryElement wrappedLib, this._owningComponent) : _definingUnit = new ExportsLimitedCompilationUnitFacade( - _wrappedLib.definingCompilationUnit, _owningComponent), - super(_wrappedLib.name, _wrappedLib.nameOffset) { + wrappedLib.definingCompilationUnit, _owningComponent), + super(wrappedLib) { _definingUnit.libraryFacade = this; } @override - AnalysisContext get context => _wrappedLib.context; - - @override CompilationUnitElement get definingCompilationUnit => _definingUnit; @override - String get displayName => _wrappedLib.displayName; - - @override - String get documentationComment => _wrappedLib.documentationComment; - - @override - Element get enclosingElement => _wrappedLib.enclosingElement; - - @override - FunctionElement get entryPoint => _wrappedLib.entryPoint; - - @override - List<LibraryElement> get exportedLibraries => _wrappedLib.exportedLibraries; - - @override - Namespace get exportNamespace => _wrappedLib.exportNamespace; - - @override - List<ExportElement> get exports => _wrappedLib.exports; - - @override - bool get hasAlwaysThrows => _wrappedLib.hasAlwaysThrows; - - @override - bool get hasDeprecated => _wrappedLib.hasDeprecated; - - @override - bool get hasExtUri => _wrappedLib.hasExtUri; - - @override - bool get hasFactory => _wrappedLib.hasFactory; - - @override bool get hasJS => false; @override - bool get hasLoadLibraryFunction => _wrappedLib.hasLoadLibraryFunction; - - @override - bool get hasOverride => _wrappedLib.hasOverride; - - @override - bool get hasProtected => _wrappedLib.hasProtected; - - @override - bool get hasRequired => _wrappedLib.hasRequired; - - @override - bool get hasVisibleForTesting => _wrappedLib.hasVisibleForTesting; - - @override - int get id => _wrappedLib.id; - - @override - String get identifier => _wrappedLib.identifier; - - @override - List<LibraryElement> get importedLibraries => _wrappedLib.importedLibraries; - - @override - List<ImportElement> get imports => _wrappedLib.imports + List<ImportElement> get imports => wrappedLib.imports .map((import) => new ExportsImportElementFacade(import, _owningComponent, libraryFacade: this)) .toList(); @override - bool get isAlwaysThrows => hasAlwaysThrows; - - @override - bool get isBrowserApplication => _wrappedLib.isBrowserApplication; - - @override bool get isDartAsync => false; @override bool get isDartCore => false; @override - bool get isDeprecated => hasDeprecated; - - @override - bool get isFactory => hasFactory; - - @override bool get isInSdk => false; @override bool get isJS => false; @override - bool get isOverride => hasOverride; - - @override - bool get isPrivate => _wrappedLib.isPrivate; // ignore: deprecated_member_use - - @override - bool get isProtected => hasProtected; - - @override - bool get isPublic => _wrappedLib.isPublic; - - @override - bool get isRequired => hasRequired; - - @override - bool get isSynthetic => _wrappedLib.isSynthetic; - - @override - bool get isVisibleForTesting => hasVisibleForTesting; - - @override - ElementKind get kind => _wrappedLib.kind; - - @override LibraryElement get library => this; @override - List<LibraryElement> get libraryCycle => _wrappedLib.libraryCycle + List<LibraryElement> get libraryCycle => wrappedLib.libraryCycle .map((lib) => new ExportsLibraryFacade(lib, _owningComponent)) .toList(); @override - FunctionElement get loadLibraryFunction => _wrappedLib.loadLibraryFunction; - - @override - ElementLocation get location => _wrappedLib.location; - - @override - List<ElementAnnotation> get metadata => _wrappedLib.metadata; - - @override - String get name => _wrappedLib.name; - - @override - int get nameLength => _wrappedLib.nameLength; - - @override - int get nameOffset => _wrappedLib.nameOffset; - - @override - List<CompilationUnitElement> get parts => _wrappedLib.parts + List<CompilationUnitElement> get parts => wrappedLib.parts .map((part) => new ExportsLimitedCompilationUnitFacade( part, _owningComponent, libraryFacade: this)) .toList(); @override - List<PrefixElement> get prefixes => _wrappedLib.prefixes + List<PrefixElement> get prefixes => wrappedLib.prefixes .where((prefix) => _owningComponent.exports .any((export) => export.prefix == prefix.name)) .toList(); @override - Namespace get publicNamespace => _wrappedLib.publicNamespace; - - @override - Source get source => _wrappedLib.source; - - @override - CompilationUnit get unit => _wrappedLib.unit; - - @override - List<CompilationUnitElement> get units => _wrappedLib.units + List<CompilationUnitElement> get units => wrappedLib.units .map((unit) => new ExportsLimitedCompilationUnitFacade( unit, _owningComponent, libraryFacade: this)) .toList(); @override - T accept<T>(ElementVisitor<T> visitor) => _wrappedLib.accept(visitor); - - @override - String computeDocumentationComment() => - _wrappedLib.computeDocumentationComment(); - - @override - AstNode computeNode() => _wrappedLib.computeNode(); - - @override - E getAncestor<E extends Element>(Predicate<Element> predicate) => - _wrappedLib.getAncestor(predicate); - - @override - String getExtendedDisplayName(String shortName) => - _wrappedLib.getExtendedDisplayName(shortName); - - @override - List<ImportElement> getImportsWithPrefix(PrefixElement prefix) => _wrappedLib + List<ImportElement> getImportsWithPrefix(PrefixElement prefix) => wrappedLib .getImportsWithPrefix(prefix) .map((lib) => new ExportsImportElementFacade(lib, _owningComponent, libraryFacade: this)) .toList(); @override - ClassElement getType(String className) => _wrappedLib.getType(className); - - // TODO should this be limited to the component exports with prefixes? - @override - bool isAccessibleIn(LibraryElement library) => - _wrappedLib.isAccessibleIn(library); - - // TODO Limit this to the component exports - @override - void visitChildren(ElementVisitor visitor) => - _wrappedLib.visitChildren(visitor); + ClassElement getType(String className) => wrappedLib.getType(className); } class _PrefixedExportsLibraryFacade extends ExportsLibraryFacade {