| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library analyzer.src.dart.element.member; | 5 library analyzer.src.dart.element.member; |
| 6 | 6 |
| 7 import 'package:analyzer/dart/ast/ast.dart'; | 7 import 'package:analyzer/dart/ast/ast.dart'; |
| 8 import 'package:analyzer/dart/constant/value.dart'; | 8 import 'package:analyzer/dart/constant/value.dart'; |
| 9 import 'package:analyzer/dart/element/element.dart'; | 9 import 'package:analyzer/dart/element/element.dart'; |
| 10 import 'package:analyzer/dart/element/type.dart'; | 10 import 'package:analyzer/dart/element/type.dart'; |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 @override | 508 @override |
| 509 CompilationUnit get unit => _baseElement.unit; | 509 CompilationUnit get unit => _baseElement.unit; |
| 510 | 510 |
| 511 @override | 511 @override |
| 512 String computeDocumentationComment() => documentationComment; | 512 String computeDocumentationComment() => documentationComment; |
| 513 | 513 |
| 514 @override | 514 @override |
| 515 AstNode computeNode() => _baseElement.computeNode(); | 515 AstNode computeNode() => _baseElement.computeNode(); |
| 516 | 516 |
| 517 @override | 517 @override |
| 518 Element getAncestor(Predicate<Element> predicate) => | 518 Element/*=E*/ getAncestor/*<E extends Element >*/(Predicate<Element> predicate
) => |
| 519 baseElement.getAncestor(predicate); | 519 baseElement.getAncestor(predicate); |
| 520 | 520 |
| 521 @override | 521 @override |
| 522 String getExtendedDisplayName(String shortName) => | 522 String getExtendedDisplayName(String shortName) => |
| 523 _baseElement.getExtendedDisplayName(shortName); | 523 _baseElement.getExtendedDisplayName(shortName); |
| 524 | 524 |
| 525 @override | 525 @override |
| 526 bool isAccessibleIn(LibraryElement library) => | 526 bool isAccessibleIn(LibraryElement library) => |
| 527 _baseElement.isAccessibleIn(library); | 527 _baseElement.isAccessibleIn(library); |
| 528 | 528 |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 @override | 693 @override |
| 694 SourceRange get visibleRange => baseElement.visibleRange; | 694 SourceRange get visibleRange => baseElement.visibleRange; |
| 695 | 695 |
| 696 @override | 696 @override |
| 697 accept(ElementVisitor visitor) => visitor.visitParameterElement(this); | 697 accept(ElementVisitor visitor) => visitor.visitParameterElement(this); |
| 698 | 698 |
| 699 @override | 699 @override |
| 700 FormalParameter computeNode() => baseElement.computeNode(); | 700 FormalParameter computeNode() => baseElement.computeNode(); |
| 701 | 701 |
| 702 @override | 702 @override |
| 703 Element getAncestor(Predicate<Element> predicate) { | 703 Element/*=E*/ getAncestor/*<E extends Element>*/(Predicate<Element> predicate)
{ |
| 704 Element element = baseElement.getAncestor(predicate); | 704 Element element = baseElement.getAncestor(predicate); |
| 705 ParameterizedType definingType = this.definingType; | 705 ParameterizedType definingType = this.definingType; |
| 706 if (definingType is InterfaceType) { | 706 if (definingType is InterfaceType) { |
| 707 InterfaceType definingInterfaceType = definingType; | |
| 708 if (element is ConstructorElement) { | 707 if (element is ConstructorElement) { |
| 709 return ConstructorMember.from(element, definingInterfaceType); | 708 return ConstructorMember.from(element, definingType) as Element/*=E*/; |
| 710 } else if (element is MethodElement) { | 709 } else if (element is MethodElement) { |
| 711 return MethodMember.from(element, definingInterfaceType); | 710 return MethodMember.from(element, definingType) as Element/*=E*/; |
| 712 } else if (element is PropertyAccessorElement) { | 711 } else if (element is PropertyAccessorElement) { |
| 713 return PropertyAccessorMember.from(element, definingInterfaceType); | 712 return PropertyAccessorMember.from(element, definingType) as Element/*=E
*/; |
| 714 } | 713 } |
| 715 } | 714 } |
| 716 return element; | 715 return element as Element/*=E*/; |
| 717 } | 716 } |
| 718 | 717 |
| 719 @override | 718 @override |
| 720 String toString() { | 719 String toString() { |
| 721 ParameterElement baseElement = this.baseElement; | 720 ParameterElement baseElement = this.baseElement; |
| 722 String left = ""; | 721 String left = ""; |
| 723 String right = ""; | 722 String right = ""; |
| 724 while (true) { | 723 while (true) { |
| 725 if (baseElement.parameterKind == ParameterKind.NAMED) { | 724 if (baseElement.parameterKind == ParameterKind.NAMED) { |
| 726 left = "{"; | 725 left = "{"; |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1039 DartObject computeConstantValue() => baseElement.computeConstantValue(); | 1038 DartObject computeConstantValue() => baseElement.computeConstantValue(); |
| 1040 | 1039 |
| 1041 @override | 1040 @override |
| 1042 void visitChildren(ElementVisitor visitor) { | 1041 void visitChildren(ElementVisitor visitor) { |
| 1043 // TODO(brianwilkerson) We need to finish implementing the accessors used | 1042 // TODO(brianwilkerson) We need to finish implementing the accessors used |
| 1044 // below so that we can safely invoke them. | 1043 // below so that we can safely invoke them. |
| 1045 super.visitChildren(visitor); | 1044 super.visitChildren(visitor); |
| 1046 baseElement.initializer?.accept(visitor); | 1045 baseElement.initializer?.accept(visitor); |
| 1047 } | 1046 } |
| 1048 } | 1047 } |
| OLD | NEW |