Index: pkg/analyzer/test/src/dart/analysis/driver_test.dart |
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart |
index d4f773dbaeaae3bd50678dc2230ff147a21ae77c..c2303ef6a1e69f45efa7ac0011cb50380c768247 100644 |
--- a/pkg/analyzer/test/src/dart/analysis/driver_test.dart |
+++ b/pkg/analyzer/test/src/dart/analysis/driver_test.dart |
@@ -8,6 +8,7 @@ import 'dart:async'; |
import 'dart:convert'; |
import 'package:analyzer/dart/ast/ast.dart'; |
+import 'package:analyzer/dart/ast/standard_resolution_map.dart'; |
import 'package:analyzer/dart/element/element.dart'; |
import 'package:analyzer/error/error.dart'; |
import 'package:analyzer/file_system/file_system.dart'; |
@@ -537,7 +538,8 @@ export 'dart:math'; |
AnalysisResult result = await driver.getResult(testFile); |
expect(result.path, testFile); |
// Has only exports for valid URIs. |
- List<ExportElement> imports = result.unit.element.library.exports; |
+ List<ExportElement> imports = |
+ resolutionMap.elementForCompilationUnit(result.unit).library.exports; |
expect( |
imports.map((import) => import.exportedLibrary.source.uri.toString()), |
unorderedEquals(['dart:async', 'dart:math'])); |
@@ -554,7 +556,8 @@ import 'dart:math'; |
AnalysisResult result = await driver.getResult(testFile); |
expect(result.path, testFile); |
// Has only imports for valid URIs. |
- List<ImportElement> imports = result.unit.element.library.imports; |
+ List<ImportElement> imports = |
+ resolutionMap.elementForCompilationUnit(result.unit).library.imports; |
expect( |
imports.map((import) => import.importedLibrary.source.uri.toString()), |
unorderedEquals(['dart:async', 'dart:math', 'dart:core'])); |
@@ -1201,7 +1204,11 @@ var A = B; |
String _getClassFieldType( |
CompilationUnit unit, String className, String fieldName) { |
- return _getClassField(unit, className, fieldName).element.type.toString(); |
+ return resolutionMap |
+ .elementDeclaredByVariableDeclaration( |
+ _getClassField(unit, className, fieldName)) |
+ .type |
+ .toString(); |
} |
MethodDeclaration _getClassMethod( |
@@ -1220,8 +1227,9 @@ var A = B; |
String _getClassMethodReturnType( |
CompilationUnit unit, String className, String fieldName) { |
- return _getClassMethod(unit, className, fieldName) |
- .element |
+ return resolutionMap |
+ .elementDeclaredByMethodDeclaration( |
+ _getClassMethod(unit, className, fieldName)) |
.type |
.returnType |
.toString(); |
@@ -1251,7 +1259,10 @@ var A = B; |
} |
String _getTopLevelVarType(CompilationUnit unit, String name) { |
- return _getTopLevelVar(unit, name).element.type.toString(); |
+ return resolutionMap |
+ .elementDeclaredByVariableDeclaration(_getTopLevelVar(unit, name)) |
+ .type |
+ .toString(); |
} |
/** |