| Index: tests/compiler/dart2js/source_map_validator_helper.dart
|
| diff --git a/tests/compiler/dart2js/source_map_validator_helper.dart b/tests/compiler/dart2js/source_map_validator_helper.dart
|
| index 3e24a80f3be1b1feb2e65da55c75480255623cb5..f806b6c43f282dda30f698cfb96a09ea9fa94c11 100644
|
| --- a/tests/compiler/dart2js/source_map_validator_helper.dart
|
| +++ b/tests/compiler/dart2js/source_map_validator_helper.dart
|
| @@ -110,7 +110,8 @@ checkNames(
|
| });
|
| }
|
|
|
| - compiler.libraryLoader.libraries.forEach((LibraryElement library) {
|
| + compiler.libraryLoader.libraries.forEach((_library) {
|
| + LibraryElement library = _library;
|
| mapCompilationUnits(library);
|
| if (library.patch != null) {
|
| mapCompilationUnits(library.patch);
|
| @@ -121,7 +122,6 @@ checkNames(
|
| for (TargetEntry entry in line.entries) {
|
| if (entry.sourceNameId != null) {
|
| Uri uri = mapUri.resolve(sourceMap.urls[entry.sourceUrlId]);
|
| - Position targetPosition = new Position(line.line, entry.column);
|
| Position sourcePosition =
|
| new Position(entry.sourceLine, entry.sourceColumn);
|
| String name = sourceMap.names[entry.sourceNameId];
|
| @@ -143,8 +143,8 @@ checkNames(
|
| if (!element.hasNode) return null;
|
|
|
| var begin = element.node.getBeginToken().charOffset;
|
| - var end = element.node.getEndToken();
|
| - end = end.charOffset + end.charCount;
|
| + var endToken = element.node.getEndToken();
|
| + int end = endToken.charOffset + endToken.charCount;
|
| return new Interval(
|
| positionFromOffset(begin), positionFromOffset(end));
|
| }
|
| @@ -161,7 +161,7 @@ checkNames(
|
|
|
| if (element is MemberElement) {
|
| MemberElement member = element;
|
| - member.nestedClosures.forEach((closure) {
|
| + member.nestedClosures.forEach((dynamic closure) {
|
| var localFunction = closure.expression;
|
| Interval interval = intervalFromElement(localFunction);
|
| if (interval != null &&
|
| @@ -207,7 +207,7 @@ checkNames(
|
| }
|
| }
|
|
|
| - compilationUnit.forEachLocalMember((AstElement element) {
|
| + compilationUnit.forEachLocalMember((Element element) {
|
| if (element.isClass) {
|
| ClassElement classElement = element;
|
| classElement.forEachLocalMember(match);
|
|
|