| 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 engine.incremental_resolver; | 5 library engine.incremental_resolver; |
| 6 | 6 |
| 7 import 'dart:collection'; | 7 import 'dart:collection'; |
| 8 import 'dart:math' as math; | 8 import 'dart:math' as math; |
| 9 | 9 |
| 10 import 'package:analyzer/src/context/cache.dart' | 10 import 'package:analyzer/src/context/cache.dart' |
| (...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1226 oldEntry.setValueInLibrary(descriptor, _librarySource, errors); | 1226 oldEntry.setValueInLibrary(descriptor, _librarySource, errors); |
| 1227 } | 1227 } |
| 1228 | 1228 |
| 1229 void _verify(AstNode node) { | 1229 void _verify(AstNode node) { |
| 1230 LoggingTimer timer = logger.startTimer(); | 1230 LoggingTimer timer = logger.startTimer(); |
| 1231 try { | 1231 try { |
| 1232 RecordingErrorListener errorListener = new RecordingErrorListener(); | 1232 RecordingErrorListener errorListener = new RecordingErrorListener(); |
| 1233 ErrorReporter errorReporter = new ErrorReporter(errorListener, _source); | 1233 ErrorReporter errorReporter = new ErrorReporter(errorListener, _source); |
| 1234 ErrorVerifier errorVerifier = new ErrorVerifier(errorReporter, | 1234 ErrorVerifier errorVerifier = new ErrorVerifier(errorReporter, |
| 1235 _definingLibrary, _typeProvider, | 1235 _definingLibrary, _typeProvider, |
| 1236 new InheritanceManager(_definingLibrary)); | 1236 new InheritanceManager(_definingLibrary), |
| 1237 _context.analysisOptions.enableSuperMixins); |
| 1237 if (_resolutionContext.enclosingClassDeclaration != null) { | 1238 if (_resolutionContext.enclosingClassDeclaration != null) { |
| 1238 errorVerifier.visitClassDeclarationIncrementally( | 1239 errorVerifier.visitClassDeclarationIncrementally( |
| 1239 _resolutionContext.enclosingClassDeclaration); | 1240 _resolutionContext.enclosingClassDeclaration); |
| 1240 } | 1241 } |
| 1241 node.accept(errorVerifier); | 1242 node.accept(errorVerifier); |
| 1242 _verifyErrors = errorListener.getErrorsForSource(_source); | 1243 _verifyErrors = errorListener.getErrorsForSource(_source); |
| 1243 } finally { | 1244 } finally { |
| 1244 timer.stop('verify'); | 1245 timer.stop('verify'); |
| 1245 } | 1246 } |
| 1246 } | 1247 } |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1979 @override | 1980 @override |
| 1980 String toString() => name; | 1981 String toString() => name; |
| 1981 } | 1982 } |
| 1982 | 1983 |
| 1983 class _TokenPair { | 1984 class _TokenPair { |
| 1984 final _TokenDifferenceKind kind; | 1985 final _TokenDifferenceKind kind; |
| 1985 final Token oldToken; | 1986 final Token oldToken; |
| 1986 final Token newToken; | 1987 final Token newToken; |
| 1987 _TokenPair(this.kind, this.oldToken, this.newToken); | 1988 _TokenPair(this.kind, this.oldToken, this.newToken); |
| 1988 } | 1989 } |
| OLD | NEW |