Don't report NULLABLE_TYPE_IN_CATCH_CLAUSE in opt-out libraries.

scheglov · commit-bot@chromium.org · commit 78b1e156377e · 2020-02-12T20:22:37.000Z
R=brianwilkerson@google.com, paulberry@google.com Change-Id: Iabd6a4b23c81e25bc7045db6d562c38567c81921 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135522 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -426,7 +426,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
     try {
       _isInCatchClause = true;
       _checkForTypeAnnotationDeferredClass(node.exceptionType);
-      _checkForPotentiallyNullableType(node.exceptionType);
+      _checkForNullableTypeInCatchClause(node.exceptionType);
       super.visitCatchClause(node);
     } finally {
       _isInCatchClause = previousIsInCatchClause;
@@ -3941,6 +3941,23 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
+  void _checkForNullableTypeInCatchClause(TypeAnnotation type) {
+    if (!_isNonNullableByDefault) {
+      return;
+    }
+
+    if (type == null) {
+      return;
+    }
+
+    if (_typeSystem.isPotentiallyNullable(type.type)) {
+      _errorReporter.reportErrorForNode(
+        CompileTimeErrorCode.NULLABLE_TYPE_IN_CATCH_CLAUSE,
+        type,
+      );
+    }
+  }
+
   /**
    * Verify that all classes of the given [onClause] are valid.
    *
@@ -4045,18 +4062,6 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  /**
-   * Verify that the [type] is not potentially nullable.
-   */
-  void _checkForPotentiallyNullableType(TypeAnnotation type) {
-    if (_options.experimentStatus.non_nullable &&
-        type?.type != null &&
-        _typeSystem.isPotentiallyNullable(type.type)) {
-      _errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.NULLABLE_TYPE_IN_CATCH_CLAUSE, type);
-    }
-  }
-
   /**
    * Check that the given named optional [parameter] does not begin with '_'.
    *
diff --git a/pkg/analyzer/test/src/diagnostics/nullable_type_in_catch_clause_test.dart b/pkg/analyzer/test/src/diagnostics/nullable_type_in_catch_clause_test.dart
@@ -83,6 +83,18 @@ class A<B extends Object> {
     }
   }
 }
+''');
+  }
+
+  test_optOut() async {
+    await assertNoErrorsInCode('''
+// @dart = 2.7
+
+void f() {
+  try {
+  } on dynamic {
+  }
+}
 ''');
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,18 @@ class A<B extends Object> {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
	`86`	`+''');`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ test_optOut() async {`
	`90`	`+ await assertNoErrorsInCode('''`
	`91`	`+// @dart = 2.7`
	`92`	`+`
	`93`	`+void f() {`
	`94`	`+ try {`
	`95`	`+ } on dynamic {`
	`96`	`+ }`
	`97`	`+}`
`86`	`98`	`''');`
`87`	`99`	`}`
`88`	`100`	`}`