| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 domains.analysis.implemented_dart; | 5 library domains.analysis.implemented_dart; |
| 6 | 6 |
| 7 import 'package:analysis_server/src/protocol_server.dart' as protocol; | 7 import 'package:analysis_server/src/protocol_server.dart' as protocol; |
| 8 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 8 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 9 import 'package:analysis_server/src/services/search/search_engine.dart'; | 9 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 10 import 'package:analyzer/dart/element/element.dart'; | 10 import 'package:analyzer/dart/element/element.dart'; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 void _addImplementedMember(Element member) { | 50 void _addImplementedMember(Element member) { |
| 51 int offset = member.nameOffset; | 51 int offset = member.nameOffset; |
| 52 int length = member.nameLength; | 52 int length = member.nameLength; |
| 53 members.add(new protocol.ImplementedMember(offset, length)); | 53 members.add(new protocol.ImplementedMember(offset, length)); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void _addMemberIfImplemented(Element element) { | 56 void _addMemberIfImplemented(Element element) { |
| 57 if (element.isSynthetic || _isStatic(element)) { | 57 if (element.isSynthetic || _isStatic(element)) { |
| 58 return; | 58 return; |
| 59 } | 59 } |
| 60 String name = element.displayName; | 60 if (_hasOverride(element)) { |
| 61 if (name != null && _hasOverride(name)) { | |
| 62 _addImplementedMember(element); | 61 _addImplementedMember(element); |
| 63 } | 62 } |
| 64 } | 63 } |
| 65 | 64 |
| 66 bool _hasOverride(String name) { | 65 bool _hasOverride(Element element) { |
| 66 String name = element.displayName; |
| 67 LibraryElement library = element.library; |
| 67 for (ClassElement subtype in subtypes) { | 68 for (ClassElement subtype in subtypes) { |
| 68 MethodElement method = subtype.getMethod(name); | 69 ClassMemberElement subElement = subtype.getMethod(name); |
| 69 if (method != null) { | 70 if (subElement == null) { |
| 70 return !method.isStatic; | 71 subElement = subtype.getField(name); |
| 71 } | 72 } |
| 72 FieldElement field = subtype.getField(name); | 73 if (subElement != null && |
| 73 if (field != null) { | 74 !subElement.isStatic && |
| 74 return !field.isStatic; | 75 subElement.isAccessibleIn(library)) { |
| 76 return true; |
| 75 } | 77 } |
| 76 } | 78 } |
| 77 return false; | 79 return false; |
| 78 } | 80 } |
| 79 | 81 |
| 80 /** | 82 /** |
| 81 * Return `true` if the given [element] is a static element. | 83 * Return `true` if the given [element] is a static element. |
| 82 */ | 84 */ |
| 83 static bool _isStatic(Element element) { | 85 static bool _isStatic(Element element) { |
| 84 if (element is ExecutableElement) { | 86 if (element is ExecutableElement) { |
| 85 return element.isStatic; | 87 return element.isStatic; |
| 86 } else if (element is PropertyInducingElement) { | 88 } else if (element is PropertyInducingElement) { |
| 87 return element.isStatic; | 89 return element.isStatic; |
| 88 } | 90 } |
| 89 return false; | 91 return false; |
| 90 } | 92 } |
| 91 } | 93 } |
| OLD | NEW |