From 52f5193819eed5308516e0eeafb679a448141e44 Mon Sep 17 00:00:00 2001
From: Xin Yao <singerdmx@gmail.com>
Date: Wed, 8 Sep 2021 13:58:12 -0700
Subject: [PATCH] Address KeyboardListener class name conflict

---
 lib/src/models/rules/delete.dart       | 4 +++-
 lib/src/models/rules/format.dart       | 8 ++++++--
 lib/src/models/rules/insert.dart       | 4 +++-
 lib/src/widgets/keyboard_listener.dart | 4 ++--
 lib/src/widgets/raw_editor.dart        | 4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/src/models/rules/delete.dart b/lib/src/models/rules/delete.dart
index e6682f94..06c057eb 100644
--- a/lib/src/models/rules/delete.dart
+++ b/lib/src/models/rules/delete.dart
@@ -66,7 +66,9 @@ class PreserveLineStyleOnMergeRule extends DeleteRule {
         attributes ??= <String, dynamic>{};
         attributes.addAll(attrs!);
       }
-      delta..retain(lineBreak)..retain(1, attributes);
+      delta
+        ..retain(lineBreak)
+        ..retain(1, attributes);
       break;
     }
     return delta;
diff --git a/lib/src/models/rules/format.dart b/lib/src/models/rules/format.dart
index 38124af8..62a41317 100644
--- a/lib/src/models/rules/format.dart
+++ b/lib/src/models/rules/format.dart
@@ -114,7 +114,9 @@ class FormatLinkAtCaretPositionRule extends FormatRule {
       return null;
     }
 
-    delta..retain(beg)..retain(retain!, attribute.toJson());
+    delta
+      ..retain(beg)
+      ..retain(retain!, attribute.toJson());
     return delta;
   }
 }
@@ -143,7 +145,9 @@ class ResolveInlineFormatRule extends FormatRule {
       }
       var pos = 0;
       while (lineBreak >= 0) {
-        delta..retain(lineBreak - pos, attribute.toJson())..retain(1);
+        delta
+          ..retain(lineBreak - pos, attribute.toJson())
+          ..retain(1);
         pos = lineBreak + 1;
         lineBreak = text.indexOf('\n', pos);
       }
diff --git a/lib/src/models/rules/insert.dart b/lib/src/models/rules/insert.dart
index 892b3e8a..67522d38 100644
--- a/lib/src/models/rules/insert.dart
+++ b/lib/src/models/rules/insert.dart
@@ -192,7 +192,9 @@ class AutoExitBlockRule extends InsertRule {
         attributes.keys.firstWhere(Attribute.blockKeysExceptHeader.contains);
     attributes[k] = null;
     // retain(1) should be '\n', set it with no attribute
-    return Delta()..retain(index + (len ?? 0))..retain(1, attributes);
+    return Delta()
+      ..retain(index + (len ?? 0))
+      ..retain(1, attributes);
   }
 }
 
diff --git a/lib/src/widgets/keyboard_listener.dart b/lib/src/widgets/keyboard_listener.dart
index ceabf931..782321db 100644
--- a/lib/src/widgets/keyboard_listener.dart
+++ b/lib/src/widgets/keyboard_listener.dart
@@ -9,8 +9,8 @@ typedef CursorMoveCallback = void Function(
 typedef InputShortcutCallback = void Function(InputShortcut? shortcut);
 typedef OnDeleteCallback = void Function(bool forward);
 
-class KeyboardListener {
-  KeyboardListener(this.onCursorMove, this.onShortcut, this.onDelete);
+class CustomKeyboardListener {
+  CustomKeyboardListener(this.onCursorMove, this.onShortcut, this.onDelete);
 
   final CursorMoveCallback onCursorMove;
   final InputShortcutCallback onShortcut;
diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart
index d88a49e5..a67f6f3a 100644
--- a/lib/src/widgets/raw_editor.dart
+++ b/lib/src/widgets/raw_editor.dart
@@ -106,7 +106,7 @@ class RawEditorState extends EditorState
   final GlobalKey _editorKey = GlobalKey();
 
   // Keyboard
-  late KeyboardListener _keyboardListener;
+  late CustomKeyboardListener _keyboardListener;
   KeyboardVisibilityController? _keyboardVisibilityController;
   StreamSubscription<bool>? _keyboardVisibilitySubscription;
   bool _keyboardVisible = false;
@@ -340,7 +340,7 @@ class RawEditorState extends EditorState
       tickerProvider: this,
     );
 
-    _keyboardListener = KeyboardListener(
+    _keyboardListener = CustomKeyboardListener(
       handleCursorMovement,
       handleShortcut,
       handleDelete,