From 31bc38c6a1af11a9bdcbc58ec327d9781cd5afc9 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Thu, 23 Mar 2023 11:47:49 -0700
Subject: [PATCH 1/2] prefer_void_to_null: not for variable declarations

---
 lib/src/rules/prefer_void_to_null.dart   |  5 +++++
 test/rules/prefer_void_to_null_test.dart | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/src/rules/prefer_void_to_null.dart b/lib/src/rules/prefer_void_to_null.dart
index 9a4267c92..b3f088ec8 100644
--- a/lib/src/rules/prefer_void_to_null.dart
+++ b/lib/src/rules/prefer_void_to_null.dart
@@ -140,6 +140,11 @@ class _Visitor extends SimpleAstVisitor<void> {
       return;
     }
 
+    if (parent is VariableDeclarationList && node == parent.type) {
+      // We should not recommend to use `void` for local or top-level variables.
+      return;
+    }
+
     // <Null>[] or <Null, Null>{}
     if (parent is TypeArgumentList) {
       var literal = parent.parent;
diff --git a/test/rules/prefer_void_to_null_test.dart b/test/rules/prefer_void_to_null_test.dart
index 9df96ae35..a4f5234e8 100644
--- a/test/rules/prefer_void_to_null_test.dart
+++ b/test/rules/prefer_void_to_null_test.dart
@@ -35,6 +35,20 @@ void f(int a) {
     case var _ as Null:
   }
 }
+''');
+  }
+
+  test_localVariable() async {
+    await assertNoDiagnostics(r'''
+void f() {
+  Null _;
+}
+''');
+  }
+
+  test_topLevelVariable() async {
+    await assertNoDiagnostics(r'''
+Null a;
 ''');
   }
 }

From 0fc1d28af613dba0e793662162ffa72cbc95f01d Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Thu, 23 Mar 2023 14:18:38 -0700
Subject: [PATCH 2/2] whoops fields

---
 lib/src/rules/prefer_void_to_null.dart   | 4 +++-
 test_data/rules/prefer_void_to_null.dart | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/src/rules/prefer_void_to_null.dart b/lib/src/rules/prefer_void_to_null.dart
index b3f088ec8..8712a1aec 100644
--- a/lib/src/rules/prefer_void_to_null.dart
+++ b/lib/src/rules/prefer_void_to_null.dart
@@ -140,7 +140,9 @@ class _Visitor extends SimpleAstVisitor<void> {
       return;
     }
 
-    if (parent is VariableDeclarationList && node == parent.type) {
+    if (parent is VariableDeclarationList &&
+        node == parent.type &&
+        parent.parent is! FieldDeclaration) {
       // We should not recommend to use `void` for local or top-level variables.
       return;
     }
diff --git a/test_data/rules/prefer_void_to_null.dart b/test_data/rules/prefer_void_to_null.dart
index a3cebabf9..1de5b25c5 100644
--- a/test_data/rules/prefer_void_to_null.dart
+++ b/test_data/rules/prefer_void_to_null.dart
@@ -52,8 +52,6 @@ class F implements E {
 }
 
 void void_; // OK
-Null null_; // LINT
-core.Null core_null; // LINT
 Future<void>? future_void; // OK
 Future<Null>? future_null; // LINT
 Future<core.Null>? future_core_null; // LINT
@@ -72,8 +70,6 @@ void Function(Future<Null>)? voidFunctionFutureNull; // LINT
 
 usage() {
   void void_; // OK
-  Null null_; // LINT
-  core.Null core_null; // LINT
   Future<void>? future_void; // OK
   Future<Null> future_null; // LINT
   Future<core.Null> future_core_null; // LINT
@@ -152,8 +148,6 @@ class AsMembers {
 
   void usage() {
     void void_; // OK
-    Null null_; // LINT
-    core.Null core_null; // LINT
     Future<void>? future_void; // OK
     Future<Null> future_null; // LINT
     Future<core.Null> future_core_null; // LINT