| 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 dev_compiler.src.checker.checker; | 5 library dev_compiler.src.checker.checker; |
| 6 | 6 |
| 7 import 'package:analyzer/analyzer.dart'; | 7 import 'package:analyzer/analyzer.dart'; |
| 8 import 'package:analyzer/src/generated/ast.dart'; | 8 import 'package:analyzer/src/generated/ast.dart'; |
| 9 import 'package:analyzer/src/generated/element.dart'; | 9 import 'package:analyzer/src/generated/element.dart'; |
| 10 import 'package:analyzer/src/generated/scanner.dart' show Token, TokenType; | 10 import 'package:analyzer/src/generated/scanner.dart' show Token, TokenType; |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 /// | 220 /// |
| 221 /// The [errorLocation] node indicates where errors are reported, see | 221 /// The [errorLocation] node indicates where errors are reported, see |
| 222 /// [_checkSingleOverride] for more details. | 222 /// [_checkSingleOverride] for more details. |
| 223 _checkIndividualOverridesFromClass( | 223 _checkIndividualOverridesFromClass( |
| 224 ClassDeclaration node, InterfaceType baseType, Set<String> seen) { | 224 ClassDeclaration node, InterfaceType baseType, Set<String> seen) { |
| 225 for (var member in node.members) { | 225 for (var member in node.members) { |
| 226 if (member is ConstructorDeclaration) continue; | 226 if (member is ConstructorDeclaration) continue; |
| 227 if (member is FieldDeclaration) { | 227 if (member is FieldDeclaration) { |
| 228 if (member.isStatic) continue; | 228 if (member.isStatic) continue; |
| 229 for (var variable in member.fields.variables) { | 229 for (var variable in member.fields.variables) { |
| 230 var name = variable.element.name; | 230 var element = variable.element as PropertyInducingElement; |
| 231 var name = element.name; |
| 231 if (seen.contains(name)) continue; | 232 if (seen.contains(name)) continue; |
| 232 var getter = variable.element.getter; | 233 var getter = element.getter; |
| 233 var setter = variable.element.setter; | 234 var setter = element.setter; |
| 234 bool found = _checkSingleOverride(getter, baseType, variable, member); | 235 bool found = _checkSingleOverride(getter, baseType, variable, member); |
| 235 if (!variable.isFinal && | 236 if (!variable.isFinal && |
| 236 _checkSingleOverride(setter, baseType, variable, member)) { | 237 _checkSingleOverride(setter, baseType, variable, member)) { |
| 237 found = true; | 238 found = true; |
| 238 } | 239 } |
| 239 if (found) seen.add(name); | 240 if (found) seen.add(name); |
| 240 } | 241 } |
| 241 } else { | 242 } else { |
| 242 assert(member is MethodDeclaration); | 243 if ((member as MethodDeclaration).isStatic) continue; |
| 243 if (member.isStatic) continue; | |
| 244 var method = member.element; | 244 var method = member.element; |
| 245 if (seen.contains(method.name)) continue; | 245 if (seen.contains(method.name)) continue; |
| 246 if (_checkSingleOverride(method, baseType, member, member)) { | 246 if (_checkSingleOverride(method, baseType, member, member)) { |
| 247 seen.add(method.name); | 247 seen.add(method.name); |
| 248 } | 248 } |
| 249 } | 249 } |
| 250 } | 250 } |
| 251 } | 251 } |
| 252 | 252 |
| 253 /// Checks that [element] correctly overrides its corresponding member in | 253 /// Checks that [element] correctly overrides its corresponding member in |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 840 void _recordDynamicInvoke(AstNode node) { | 840 void _recordDynamicInvoke(AstNode node) { |
| 841 _reporter.log(new DynamicInvoke(_rules, node)); | 841 _reporter.log(new DynamicInvoke(_rules, node)); |
| 842 } | 842 } |
| 843 | 843 |
| 844 void _recordMessage(StaticInfo info) { | 844 void _recordMessage(StaticInfo info) { |
| 845 if (info == null) return; | 845 if (info == null) return; |
| 846 if (info.level >= logger.Level.SEVERE) _failure = true; | 846 if (info.level >= logger.Level.SEVERE) _failure = true; |
| 847 _reporter.log(info); | 847 _reporter.log(info); |
| 848 } | 848 } |
| 849 } | 849 } |
| OLD | NEW |