Followups to https://dart-review.googlesource.com/c/sdk/+/108265

stereotype441 · commit-bot@chromium.org · commit ebbfb48e159f · 2019-07-13T07:17:33.000Z
Change-Id: I38cdf22aff3bb89f2f05001f878da334793c18f9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108270 Commit-Queue: Paul Berry <paulberry@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/analyzer/lib/src/util/ast_data_extractor.dart b/pkg/analyzer/lib/src/util/ast_data_extractor.dart
@@ -107,7 +107,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<dynamic>
 }
 
 class _Failure implements Exception {
-  final message;
+  final String message;
 
   _Failure([this.message]);
 
diff --git a/pkg/analyzer/test/src/dart/resolution/flow_analysis_test.dart b/pkg/analyzer/test/src/dart/resolution/flow_analysis_test.dart
@@ -28,12 +28,12 @@ class FlowTestBase extends DriverResolutionTest {
   /// Resolve the given [code] and track nullability in the unit.
   Future<void> trackCode(String code) async {
     if (await checkTests(
-        code, _resultComputer, const _FlowAnalysisDataComputer())) {
+        code, _computeResult, const _FlowAnalysisDataComputer())) {
       fail('Failure(s)');
     }
   }
 
-  Future<ResolvedUnitResult> _resultComputer(String code) async {
+  Future<ResolvedUnitResult> _computeResult(String code) async {
     addTestFile(code);
     await resolveTestFile();
     var unit = result.unit;
diff --git a/pkg/analyzer/test/src/dart/resolution/type_promotion_test.dart b/pkg/analyzer/test/src/dart/resolution/type_promotion_test.dart
@@ -30,7 +30,7 @@ class TypePromotionTest extends DriverResolutionTest {
 
   Future<void> resolveCode(String code) async {
     if (await checkTests(
-        code, _resultComputer, const _TypePromotionDataComputer())) {
+        code, _computeResult, const _TypePromotionDataComputer())) {
       fail('Failure(s)');
     }
   }
@@ -695,7 +695,7 @@ void f(bool b, Object x) {
 ''');
   }
 
-  Future<ResolvedUnitResult> _resultComputer(String code) async {
+  Future<ResolvedUnitResult> _computeResult(String code) async {
     addTestFile(code);
     await resolveTestFile();
     return result;
@@ -725,10 +725,9 @@ class _TypePromotionDataExtractor extends AstDataExtractor<DartType> {
   DartType computeNodeValue(Id id, AstNode node) {
     if (node is SimpleIdentifier && node.inGetterContext()) {
       var element = node.staticElement;
-      if (element is VariableElement &&
-          (element is LocalVariableElement || element is ParameterElement)) {
+      if (element is LocalVariableElement || element is ParameterElement) {
         var promotedType = node.staticType;
-        if (promotedType != element.type) {
+        if (promotedType != (element as VariableElement).type) {
           return promotedType;
         }
       }
diff --git a/pkg/analyzer/test/util/id_equivalence_helper.dart b/pkg/analyzer/test/util/id_equivalence_helper.dart
@@ -259,19 +259,26 @@ void _expectFalse(bool b, String message) {
 
 class CompiledData<T> {
   final Uri mainUri;
+
+  /// For each Uri, a map associating an element id with the instrumentation
+  /// data we've collected for it.
   final Map<Uri, Map<Id, ActualData<T>>> actualMaps;
+
+  /// Collected instrumentation data that doesn't refer to any of the user
+  /// files.  (E.g. information the test has collected about files in
+  /// `dart:core`).
   final Map<Id, ActualData<T>> globalData;
 
   CompiledData(this.mainUri, this.actualMaps, this.globalData);
 
   Map<int, List<String>> computeAnnotations(Uri uri) {
-    Map<Id, ActualData<T>> thisMap = actualMaps[uri];
+    Map<Id, ActualData<T>> actualMap = actualMaps[uri];
     Map<int, List<String>> annotations = <int, List<String>>{};
-    thisMap.forEach((Id id, ActualData<T> data1) {
-      String value1 = '${data1.value}';
+    actualMap.forEach((Id id, ActualData<T> actualData) {
+      String actualValue = '${actualData.value}';
       annotations
-          .putIfAbsent(data1.offset, () => [])
-          .add(colorizeActual(value1));
+          .putIfAbsent(actualData.offset, () => [])
+          .add(colorizeActual(actualValue));
     });
     return annotations;
   }
@@ -280,27 +287,27 @@ class CompiledData<T> {
       Map<Id, ActualData<T>> thisMap, Map<Id, ActualData<T>> otherMap, Uri uri,
       {bool includeMatches: false}) {
     Map<int, List<String>> annotations = <int, List<String>>{};
-    thisMap.forEach((Id id, ActualData<T> data1) {
-      ActualData<T> data2 = otherMap[id];
-      String value1 = '${data1.value}';
-      if (data1.value != data2?.value) {
-        String value2 = '${data2?.value ?? '---'}';
+    thisMap.forEach((Id id, ActualData<T> thisData) {
+      ActualData<T> otherData = otherMap[id];
+      String thisValue = '${thisData.value}';
+      if (thisData.value != otherData?.value) {
+        String otherValue = '${otherData?.value ?? '---'}';
         annotations
-            .putIfAbsent(data1.offset, () => [])
-            .add(colorizeDiff(value1, ' | ', value2));
+            .putIfAbsent(thisData.offset, () => [])
+            .add(colorizeDiff(thisValue, ' | ', otherValue));
       } else if (includeMatches) {
         annotations
-            .putIfAbsent(data1.offset, () => [])
-            .add(colorizeMatch(value1));
+            .putIfAbsent(thisData.offset, () => [])
+            .add(colorizeMatch(thisValue));
       }
     });
-    otherMap.forEach((Id id, ActualData<T> data2) {
+    otherMap.forEach((Id id, ActualData<T> otherData) {
       if (!thisMap.containsKey(id)) {
-        String value1 = '---';
-        String value2 = '${data2.value}';
+        String thisValue = '---';
+        String otherValue = '${otherData.value}';
         annotations
-            .putIfAbsent(data2.offset, () => [])
-            .add(colorizeDiff(value1, ' | ', value2));
+            .putIfAbsent(otherData.offset, () => [])
+            .add(colorizeDiff(thisValue, ' | ', otherValue));
       }
     });
     return annotations;

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<dynamic>`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`class _Failure implements Exception {`
`110`		`- final message;`
	`110`	`+ final String message;`
`111`	`111`
`112`	`112`	`_Failure([this.message]);`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ class FlowTestBase extends DriverResolutionTest {`
`28`	`28`	`/// Resolve the given [code] and track nullability in the unit.`
`29`	`29`	`Future<void> trackCode(String code) async {`
`30`	`30`	`if (await checkTests(`
`31`		`- code, _resultComputer, const _FlowAnalysisDataComputer())) {`
	`31`	`+ code, _computeResult, const _FlowAnalysisDataComputer())) {`
`32`	`32`	`fail('Failure(s)');`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- Future<ResolvedUnitResult> _resultComputer(String code) async {`
	`36`	`+ Future<ResolvedUnitResult> _computeResult(String code) async {`
`37`	`37`	`addTestFile(code);`
`38`	`38`	`await resolveTestFile();`
`39`	`39`	`var unit = result.unit;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class TypePromotionTest extends DriverResolutionTest {`
`30`	`30`
`31`	`31`	`Future<void> resolveCode(String code) async {`
`32`	`32`	`if (await checkTests(`
`33`		`- code, _resultComputer, const _TypePromotionDataComputer())) {`
	`33`	`+ code, _computeResult, const _TypePromotionDataComputer())) {`
`34`	`34`	`fail('Failure(s)');`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -695,7 +695,7 @@ void f(bool b, Object x) {`
`695`	`695`	`''');`
`696`	`696`	`}`
`697`	`697`
`698`		`- Future<ResolvedUnitResult> _resultComputer(String code) async {`
	`698`	`+ Future<ResolvedUnitResult> _computeResult(String code) async {`
`699`	`699`	`addTestFile(code);`
`700`	`700`	`await resolveTestFile();`
`701`	`701`	`return result;`
`@@ -725,10 +725,9 @@ class _TypePromotionDataExtractor extends AstDataExtractor<DartType> {`
`725`	`725`	`DartType computeNodeValue(Id id, AstNode node) {`
`726`	`726`	`if (node is SimpleIdentifier && node.inGetterContext()) {`
`727`	`727`	`var element = node.staticElement;`
`728`		`- if (element is VariableElement &&`
`729`		`- (element is LocalVariableElement \|\| element is ParameterElement)) {`
	`728`	`+ if (element is LocalVariableElement \|\| element is ParameterElement) {`
`730`	`729`	`var promotedType = node.staticType;`
`731`		`- if (promotedType != element.type) {`
	`730`	`+ if (promotedType != (element as VariableElement).type) {`
`732`	`731`	`return promotedType;`
`733`	`732`	`}`
`734`	`733`	`}`