flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-28 18:03:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

EditorHeuristics: Null safety

Browse Source
This commit is contained in:
Vishesh Handa
2021-05-25 09:31:24 +02:00
parent be9fcecb1f
commit 836d7dc216
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/editors/heuristics.dart
View File

@ -1,8 +1,6 @@
// @dart=2.9
import 'package:gitjournal/editors/common.dart'; import 'package:gitjournal/editors/common.dart';
TextEditorState autoAddBulletList( TextEditorState? autoAddBulletList(
String oldText, String curText, final int cursorPos) { String oldText, String curText, final int cursorPos) {
// We only want to do this on inserts // We only want to do this on inserts
if (curText.length <= oldText.length) { if (curText.length <= oldText.length) {
@ -39,9 +37,9 @@ TextEditorState autoAddBulletList(
} }
var indent = match.group(1) ?? ""; var indent = match.group(1) ?? "";
var bulletType = match.group(2); var bulletType = match.group(2)!;
var spacesBeforeContent = match.group(3); var spacesBeforeContent = match.group(3)!;
var contents = match.group(4); var contents = match.group(4)!;
var remainingText = var remainingText =
curText.length > cursorPos ? curText.substring(cursorPos) : ""; curText.length > cursorPos ? curText.substring(cursorPos) : "";
@ -77,9 +75,9 @@ class EditorHeuristics {
_lastState = TextEditorState(text, 0); _lastState = TextEditorState(text, 0);
} }
TextEditorState _lastState; late TextEditorState _lastState;
TextEditorState textChanged(TextEditorState es) { TextEditorState? textChanged(TextEditorState es) {
var lastState = _lastState; var lastState = _lastState;
_lastState = es; _lastState = es;

20
test/editor_heuristics_test.dart
View File

@ -1,5 +1,3 @@
// @dart=2.9
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:gitjournal/editors/heuristics.dart'; import 'package:gitjournal/editors/heuristics.dart';
@ -18,7 +16,7 @@ void main() {
var origText = "Hello\n* One"; var origText = "Hello\n* One";
var newText = origText + '\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.text, "Hello\n* One\n* ");
expect(result.cursorPos, result.text.length); expect(result.cursorPos, result.text.length);
}); });
@ -27,7 +25,7 @@ void main() {
var origText = "Hello\n* One\n* Three"; var origText = "Hello\n* One\n* Three";
var newText = "Hello\n* One\n\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.text, "Hello\n* One\n* \n* Three");
expect(result.cursorPos, 14); expect(result.cursorPos, 14);
}); });
@ -36,7 +34,7 @@ void main() {
var origText = "Hello\n1. One"; var origText = "Hello\n1. One";
var newText = origText + '\n'; 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.text, "Hello\n1. One\n1. ");
expect(result.cursorPos, result.text.length); expect(result.cursorPos, result.text.length);
}); });
@ -45,7 +43,7 @@ void main() {
var origText = "Hello\n* One\n* "; var origText = "Hello\n* One\n* ";
var newText = origText + '\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.text, "Hello\n* One\n");
expect(result.cursorPos, result.text.length); expect(result.cursorPos, result.text.length);
}); });
@ -54,7 +52,7 @@ void main() {
var origText = "Hello\n* One\n* Fire"; var origText = "Hello\n* One\n* Fire";
var newText = "Hello\n* One\n* \nFire"; 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.text, "Hello\n* One\nFire");
expect(result.cursorPos, 12); expect(result.cursorPos, 12);
}); });
@ -71,7 +69,7 @@ void main() {
var origText = "* One"; var origText = "* One";
var newText = origText + '\n'; 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.text, "* One\n* ");
expect(result.cursorPos, result.text.length); expect(result.cursorPos, result.text.length);
}); });
@ -80,7 +78,7 @@ void main() {
var origText = "1. Hello"; var origText = "1. Hello";
var newText = origText + '\n'; 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.text, "1. Hello\n1. ");
expect(result.cursorPos, result.text.length); expect(result.cursorPos, result.text.length);
}); });
@ -89,7 +87,7 @@ void main() {
var origText = "* One\nFire"; var origText = "* One\nFire";
var newText = "* One\n\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.text, "* One\n* \nFire");
expect(result.cursorPos, 12); expect(result.cursorPos, 12);
}); });
@ -98,7 +96,7 @@ void main() {
var origText = "* Hi There"; var origText = "* Hi There";
var newText = origText + '\n'; 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.text, "* Hi There\n* ");
expect(result.cursorPos, result.text.length); expect(result.cursorPos, result.text.length);
}); });