Upgrade to nnbd

marcojakob · Oct 29, 2020 · dd622c8 · dd622c8
1 parent 0f64cd8
commit dd622c8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1,4 @@
+analyzer:
+  enable-experiment:
+    - non-nullable
+
diff --git a/example/example.dart b/example/example.dart
@@ -20,29 +20,29 @@ void main() {
       .listen((event) => _log.finest('event fired:  ${event.runtimeType}'));
 
   // Initialize the listener boxes.
-  Listener(querySelector('#listener-1'));
-  Listener(querySelector('#listener-2'));
+  Listener(querySelector('#listener-1')!);
+  Listener(querySelector('#listener-2')!);
 
   // Init Event fields.
-  LabelElement fireLabelA = querySelector('#fire-label-a');
-  LabelElement fireLabelB = querySelector('#fire-label-b');
-  ButtonElement fireButtonA = querySelector("#fire-button-a");
-  ButtonElement fireButtonB = querySelector("#fire-button-b");
+  LabelElement? fireLabelA = querySelector('#fire-label-a') as LabelElement?;
+  LabelElement? fireLabelB = querySelector('#fire-label-b') as LabelElement?;
+  ButtonElement fireButtonA = querySelector("#fire-button-a") as ButtonElement;
+  ButtonElement fireButtonB = querySelector("#fire-button-b") as ButtonElement;
 
   fireButtonA.onClick.listen((_) {
     // -------------------------------------------------
     // Fire Event A
     // -------------------------------------------------
     eventBus.fire(MyEventA('Received Event A [$counterA]'));
-    fireLabelA.text = '--> fired [$counterA]';
+    fireLabelA!.text = '--> fired [$counterA]';
     counterA++;
   });
   fireButtonB.onClick.listen((_) {
     // -------------------------------------------------
     // Fire Event B
     // -------------------------------------------------
     eventBus.fire(MyEventB('Received Event B [$counterB]'));
-    fireLabelB.text = '--> fired [$counterB]';
+    fireLabelB!.text = '--> fired [$counterB]';
     counterB++;
   });
 }
@@ -60,18 +60,18 @@ initLogging() {
 class Listener {
   Element element;
 
-  TextAreaElement output;
+  late final TextAreaElement output;
 
-  StreamSubscription subscription;
+  StreamSubscription? subscription;
 
   Listener(this.element) {
-    output = element.querySelector('textarea');
+    output = element.querySelector('textarea') as TextAreaElement;
     // Init buttons.
-    element.querySelector('.listen-a').onClick.listen((_) => listenForEventA());
-    element.querySelector('.listen-b').onClick.listen((_) => listenForEventB());
-    element.querySelector('.pause').onClick.listen((_) => pause());
-    element.querySelector('.resume').onClick.listen((_) => resume());
-    element.querySelector('.cancel').onClick.listen((_) => cancel());
+    element.querySelector('.listen-a')!.onClick.listen((_) => listenForEventA());
+    element.querySelector('.listen-b')!.onClick.listen((_) => listenForEventB());
+    element.querySelector('.pause')!.onClick.listen((_) => pause());
+    element.querySelector('.resume')!.onClick.listen((_) => resume());
+    element.querySelector('.cancel')!.onClick.listen((_) => cancel());
   }
 
   void listenForEventA() {
@@ -108,7 +108,7 @@ class Listener {
 
   void pause() {
     if (subscription != null) {
-      subscription.pause();
+      subscription!.pause();
       appendOuput('Subscription paused.');
     } else {
       appendOuput('No subscription, cannot pause!');
@@ -117,7 +117,7 @@ class Listener {
 
   void resume() {
     if (subscription != null) {
-      subscription.resume();
+      subscription!.resume();
       appendOuput('Subscription resumed.');
     } else {
       appendOuput('No subscription, cannot resume!');
@@ -126,7 +126,7 @@ class Listener {
 
   void cancel() {
     if (subscription != null) {
-      subscription.cancel();
+      subscription!.cancel();
       subscription = null;
       appendOuput('Subscription canceled.');
     } else {
@@ -135,7 +135,7 @@ class Listener {
   }
 
   void appendOuput(String text) {
-    output.value += '$text\n';
+    output.value = output.value! + '$text\n';
     output.scrollTop = output.scrollHeight;
   }
 }
diff --git a/lib/event_bus.dart b/lib/event_bus.dart
@@ -49,7 +49,7 @@ class EventBus {
   ///
   Stream<T> on<T>() {
     if (T == dynamic) {
-      return streamController.stream;
+      return streamController.stream as Stream<T>;
     } else {
       return streamController.stream.where((event) => event is T).cast<T>();
     }