From 836d7dc2165fa58f46ec6174abee6cd00ac36f49 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Tue, 25 May 2021 09:31:24 +0200
Subject: [PATCH] EditorHeuristics: Null safety

---
 lib/editors/heuristics.dart      | 14 ++++++--------
 test/editor_heuristics_test.dart | 20 +++++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/lib/editors/heuristics.dart b/lib/editors/heuristics.dart
index c7066be4..00a51518 100644
--- a/lib/editors/heuristics.dart
+++ b/lib/editors/heuristics.dart
@@ -1,8 +1,6 @@
-// @dart=2.9
-
 import 'package:gitjournal/editors/common.dart';
 
-TextEditorState autoAddBulletList(
+TextEditorState? autoAddBulletList(
     String oldText, String curText, final int cursorPos) {
   // We only want to do this on inserts
   if (curText.length <= oldText.length) {
@@ -39,9 +37,9 @@ TextEditorState autoAddBulletList(
   }
 
   var indent = match.group(1) ?? "";
-  var bulletType = match.group(2);
-  var spacesBeforeContent = match.group(3);
-  var contents = match.group(4);
+  var bulletType = match.group(2)!;
+  var spacesBeforeContent = match.group(3)!;
+  var contents = match.group(4)!;
   var remainingText =
       curText.length > cursorPos ? curText.substring(cursorPos) : "";
 
@@ -77,9 +75,9 @@ class EditorHeuristics {
     _lastState = TextEditorState(text, 0);
   }
 
-  TextEditorState _lastState;
+  late TextEditorState _lastState;
 
-  TextEditorState textChanged(TextEditorState es) {
+  TextEditorState? textChanged(TextEditorState es) {
     var lastState = _lastState;
     _lastState = es;
 
diff --git a/test/editor_heuristics_test.dart b/test/editor_heuristics_test.dart
index db497e76..707e264b 100644
--- a/test/editor_heuristics_test.dart
+++ b/test/editor_heuristics_test.dart
@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'package:test/test.dart';
 
 import 'package:gitjournal/editors/heuristics.dart';
@@ -18,7 +16,7 @@ void main() {
       var origText = "Hello\n* One";
       var newText = origText + '\n';
 
-      var result = autoAddBulletList(origText, newText, newText.length);
+      var result = autoAddBulletList(origText, newText, newText.length)!;
       expect(result.text, "Hello\n* One\n* ");
       expect(result.cursorPos, result.text.length);
     });
@@ -27,7 +25,7 @@ void main() {
       var origText = "Hello\n* One\n* Three";
       var newText = "Hello\n* One\n\n* Three";
 
-      var result = autoAddBulletList(origText, newText, 12);
+      var result = autoAddBulletList(origText, newText, 12)!;
       expect(result.text, "Hello\n* One\n* \n* Three");
       expect(result.cursorPos, 14);
     });
@@ -36,7 +34,7 @@ void main() {
       var origText = "Hello\n1. One";
       var newText = origText + '\n';
 
-      var result = autoAddBulletList(origText, newText, newText.length);
+      var result = autoAddBulletList(origText, newText, newText.length)!;
       expect(result.text, "Hello\n1. One\n1. ");
       expect(result.cursorPos, result.text.length);
     });
@@ -45,7 +43,7 @@ void main() {
       var origText = "Hello\n* One\n* ";
       var newText = origText + '\n';
 
-      var result = autoAddBulletList(origText, newText, newText.length);
+      var result = autoAddBulletList(origText, newText, newText.length)!;
       expect(result.text, "Hello\n* One\n");
       expect(result.cursorPos, result.text.length);
     });
@@ -54,7 +52,7 @@ void main() {
       var origText = "Hello\n* One\n* Fire";
       var newText = "Hello\n* One\n* \nFire";
 
-      var result = autoAddBulletList(origText, newText, 15);
+      var result = autoAddBulletList(origText, newText, 15)!;
       expect(result.text, "Hello\n* One\nFire");
       expect(result.cursorPos, 12);
     });
@@ -71,7 +69,7 @@ void main() {
       var origText = "*   One";
       var newText = origText + '\n';
 
-      var result = autoAddBulletList(origText, newText, newText.length);
+      var result = autoAddBulletList(origText, newText, newText.length)!;
       expect(result.text, "*   One\n*   ");
       expect(result.cursorPos, result.text.length);
     });
@@ -80,7 +78,7 @@ void main() {
       var origText = "1. Hello";
       var newText = origText + '\n';
 
-      var result = autoAddBulletList(origText, newText, newText.length);
+      var result = autoAddBulletList(origText, newText, newText.length)!;
       expect(result.text, "1. Hello\n1. ");
       expect(result.cursorPos, result.text.length);
     });
@@ -89,7 +87,7 @@ void main() {
       var origText = "*   One\nFire";
       var newText = "*   One\n\nFire";
 
-      var result = autoAddBulletList(origText, newText, 8);
+      var result = autoAddBulletList(origText, newText, 8)!;
       expect(result.text, "*   One\n*   \nFire");
       expect(result.cursorPos, 12);
     });
@@ -98,7 +96,7 @@ void main() {
       var origText = "* Hi There";
       var newText = origText + '\n';
 
-      var result = autoAddBulletList(origText, newText, newText.length);
+      var result = autoAddBulletList(origText, newText, newText.length)!;
       expect(result.text, "* Hi There\n* ");
       expect(result.cursorPos, result.text.length);
     });