fix: flutter analyze and dart lint

AppFlowy-IO · May 22, 2023 · 82593b3 · 82593b3
1 parent 6851f04
commit 82593b3
Show file tree

Hide file tree

Showing 28 changed files with 37 additions and 210 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -10,5 +10,11 @@ linter:
     - use_decorated_box
 
 analyzer:
+  errors:
+    deprecated_member_use_from_same_package: ignore
   exclude:
     - lib/src/l10n/**
+    # Remove the below directory until migration is complete.
+    - example/**
+    - test/**
+    - lib/src/service/**
diff --git a/...c/editor/block_component/bulleted_list_block_component/bulleted_list_block_component.dart b/...c/editor/block_component/bulleted_list_block_component/bulleted_list_block_component.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/widget/nested_list_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

diff --git a/...ditor/block_component/bulleted_list_block_component/bulleted_list_character_shortcut.dart b/...ditor/block_component/bulleted_list_block_component/bulleted_list_character_shortcut.dart
@@ -1,6 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/insert_newline_in_type_command.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/markdown_format_helper.dart';
 
 /// Convert '* ' to bulleted list
 ///

diff --git a/lib/src/editor/block_component/heading_block_component/heading_character_shortcut.dart b/lib/src/editor/block_component/heading_block_component/heading_character_shortcut.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/markdown_format_helper.dart';
 
 /// Convert '# ' to bulleted list
 ///

diff --git a/lib/src/editor/block_component/image_block_component/image_upload_widget.dart b/lib/src/editor/block_component/image_block_component/image_upload_widget.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/image_block_component/image_block_component.dart';
 import 'package:flutter/material.dart';
 
 void showImageMenu(

diff --git a/...c/editor/block_component/numbered_list_block_component/numbered_list_block_component.dart b/...c/editor/block_component/numbered_list_block_component/numbered_list_block_component.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/widget/nested_list_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

diff --git a/...ditor/block_component/numbered_list_block_component/numbered_list_character_shortcut.dart b/...ditor/block_component/numbered_list_block_component/numbered_list_character_shortcut.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/markdown_format_helper.dart';
 
 final _numberRegex = RegExp(r'^(\d+)\.');
 

diff --git a/lib/src/editor/block_component/quote_block_component/quote_character_shortcut.dart b/lib/src/editor/block_component/quote_block_component/quote_character_shortcut.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/markdown_format_helper.dart';
 
 const _doubleQuote = '"';
 

diff --git a/lib/src/editor/block_component/todo_list_block_component/todo_list_block_component.dart b/lib/src/editor/block_component/todo_list_block_component/todo_list_block_component.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/widget/nested_list_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

diff --git a/lib/src/editor/block_component/todo_list_block_component/todo_list_character_shortcut.dart b/lib/src/editor/block_component/todo_list_block_component/todo_list_character_shortcut.dart
@@ -1,5 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/block_component/base_component/markdown_format_helper.dart';
 
 /// Convert '[] ' to unchecked todo list
 ///

diff --git a/lib/src/editor/editor_component/service/ime/delta_input_service.dart b/lib/src/editor/editor_component/service/ime/delta_input_service.dart
@@ -19,7 +19,7 @@ abstract class TextInputService {
       onNonTextUpdate;
   Future<void> Function(TextInputAction action) onPerformAction;
 
-  TextRange? composingTextRange;
+  TextRange? get composingTextRange;
   bool get attached;
 
   void updateCaretPosition(Size size, Matrix4 transform, Rect rect);

diff --git a/lib/src/editor/editor_component/service/scroll/desktop_scroll_service.dart b/lib/src/editor/editor_component/service/scroll/desktop_scroll_service.dart
@@ -21,8 +21,6 @@ class DesktopScrollService extends StatefulWidget {
 
 class _DesktopScrollServiceState extends State<DesktopScrollService>
     implements AppFlowyScrollService {
-  bool _scrollEnabled = true;
-
   @override
   double get dy => widget.scrollController.position.pixels;
 
@@ -76,13 +74,11 @@ class _DesktopScrollServiceState extends State<DesktopScrollService>
 
   @override
   void disable() {
-    _scrollEnabled = false;
     Log.scroll.debug('disable scroll service');
   }
 
   @override
   void enable() {
-    _scrollEnabled = true;
     Log.scroll.debug('enable scroll service');
   }
 

diff --git a/lib/src/editor/editor_component/service/selection/mobile_selection_service.dart b/lib/src/editor/editor_component/service/selection/mobile_selection_service.dart
@@ -44,10 +44,6 @@ class _MobileSelectionServiceWidgetState
   @override
   List<Node> currentSelectedNodes = [];
 
-  /// Pan
-  Offset? _panStartOffset;
-  double? _panStartScrollDy;
-
   late EditorState editorState = Provider.of<EditorState>(
     context,
     listen: false,
@@ -230,9 +226,6 @@ class _MobileSelectionServiceWidgetState
 
     editorState.service.scrollService?.stopAutoScroll();
 
-    // clear old state.
-    _panStartOffset = null;
-
     final position = getPositionInOffset(details.globalPosition);
     if (position == null) {
       return;
@@ -289,44 +282,6 @@ class _MobileSelectionServiceWidgetState
     _showContextMenu(details);
   }
 
-  void _onPanStart(DragStartDetails details) {
-    clearSelection();
-
-    _panStartOffset = details.globalPosition.translate(-3.0, 0);
-    _panStartScrollDy = editorState.service.scrollService?.dy;
-  }
-
-  void _onPanUpdate(DragUpdateDetails details) {
-    if (_panStartOffset == null || _panStartScrollDy == null) {
-      return;
-    }
-
-    final panEndOffset = details.globalPosition;
-    final dy = editorState.service.scrollService?.dy;
-    final panStartOffset = dy == null
-        ? _panStartOffset!
-        : _panStartOffset!.translate(0, _panStartScrollDy! - dy);
-
-    final first = getNodeInOffset(panStartOffset)?.selectable;
-    final last = getNodeInOffset(panEndOffset)?.selectable;
-
-    // compute the selection in range.
-    if (first != null && last != null) {
-      Log.selection.debug('first = $first, last = $last');
-      final start =
-          first.getSelectionInRange(panStartOffset, panEndOffset).start;
-      final end = last.getSelectionInRange(panStartOffset, panEndOffset).end;
-      final selection = Selection(start: start, end: end);
-      updateSelection(selection);
-    }
-
-    _showDebugLayerIfNeeded(offset: panEndOffset);
-  }
-
-  void _onPanEnd(DragEndDetails details) {
-    // do nothing
-  }
-
   void _updateSelectionAreas(Selection selection) {
     final nodes = getNodesInSelection(selection);
 

diff --git a/...ervice/shortcuts/character_shortcut_events/markdown_syntax_character_shortcut_events.dart b/...ervice/shortcuts/character_shortcut_events/markdown_syntax_character_shortcut_events.dart
@@ -1,9 +1,4 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/editor/editor_component/service/shortcuts/character_shortcut_events/format_by_wrapping_with_double_character/format_bold.dart';
-import 'package:appflowy_editor/src/editor/editor_component/service/shortcuts/character_shortcut_events/format_by_wrapping_with_double_character/format_strikethrough.dart';
-import 'package:appflowy_editor/src/editor/editor_component/service/shortcuts/character_shortcut_events/format_by_wrapping_with_single_character/format_code.dart';
-import 'package:appflowy_editor/src/editor/editor_component/service/shortcuts/character_shortcut_events/format_by_wrapping_with_single_character/format_italic.dart';
-import 'package:appflowy_editor/src/editor/editor_component/service/shortcuts/character_shortcut_events/format_by_wrapping_with_single_character/format_strikethrough.dart';
 
 // Include all the shortcut(formatting) events triggered by wrapping text with  double characters.
 // 1. double asterisk to bold -> **abc**

diff --git a/...rc/editor/editor_component/service/shortcuts/character_shortcut_events/slash_command.dart b/...rc/editor/editor_component/service/shortcuts/character_shortcut_events/slash_command.dart
@@ -63,7 +63,7 @@ Future<bool> _showSlashMenu(
   }
 
   // show the slash menu
-  {
+  () {
     // this code is copied from the the old editor.
     // TODO: refactor this code
     final context = editorState.getNodeAtPath(selection.start.path)?.context;
@@ -76,7 +76,7 @@ Future<bool> _showSlashMenu(
       );
       _selectionMenuService?.show();
     }
-  }
+  }();
 
   return true;
 }
diff --git a/lib/src/editor/util/color_util.dart b/lib/src/editor/util/color_util.dart
@@ -12,6 +12,6 @@ extension ColorExtension on String {
 
 extension HexExtension on Color {
   String toHex() {
-    return '${value.toRadixString(16)}';
+    return value.toRadixString(16);
   }
 }
diff --git a/lib/src/editor/util/property_notifier.dart b/lib/src/editor/util/property_notifier.dart
@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+/// [PropertyValueNotifier] is a subclass of [ValueNotifier].
+///
+/// The difference is that [PropertyValueNotifier] will notify listeners even
+/// when the value is the same as the previous value.
+class PropertyValueNotifier<T> extends ValueNotifier<T> {
+  PropertyValueNotifier(T value) : super(value);
+
+  @override
+  // ignore: unnecessary_overrides
+  void notifyListeners() {
+    super.notifyListeners();
+  }
+}
diff --git a/lib/src/editor/util/util.dart b/lib/src/editor/util/util.dart
@@ -3,3 +3,4 @@ export 'raw_keyboard_extension.dart';
 export 'platform_extension.dart';
 export 'delta_util.dart';
 export 'color_util.dart';
+export 'property_notifier.dart';
diff --git a/lib/src/editor_state.dart b/lib/src/editor_state.dart
@@ -72,8 +72,8 @@ class EditorState {
   late EditorStyle editorStyle;
 
   /// The selection notifier of the editor.
-  final ValueNotifier<Selection?> selectionNotifier =
-      ValueNotifier<Selection?>(null);
+  final PropertyValueNotifier<Selection?> selectionNotifier =
+      PropertyValueNotifier<Selection?>(null);
 
   /// The selection of the editor.
   Selection? get selection => selectionNotifier.value;
@@ -216,8 +216,6 @@ class EditorState {
       _selectionUpdateReason = SelectionUpdateReason.transaction;
       selection = transaction.afterSelection;
       _selectionUpdateReason = SelectionUpdateReason.uiEvent;
-      // if the selection is not changed, we still need to notify the listeners.
-      selectionNotifier.notifyListeners();
     }
 
     // TODO: execute this line after the UI has been updated.
@@ -357,28 +355,4 @@ class EditorState {
       document.updateText(op.path, op.delta);
     }
   }
-
-  void _applyRules(int maximumRuleApplyLoop) {
-    // Set a maximum count to prevent a dead loop.
-    if (maximumRuleApplyLoop >= 5 || disableRules) {
-      return;
-    }
-
-    // Rules
-    _insureLastNodeEditable(transaction);
-
-    if (transaction.operations.isNotEmpty) {
-      apply(
-        transaction,
-        withUpdateSelection: false,
-      );
-    }
-  }
-
-  void _insureLastNodeEditable(Transaction tr) {
-    if (document.root.children.isEmpty ||
-        document.root.children.last.id != 'text') {
-      tr.insertNode([document.root.children.length], TextNode.empty());
-    }
-  }
 }
diff --git a/lib/src/render/rich_text/checkbox_text.dart b/lib/src/render/rich_text/checkbox_text.dart
@@ -64,7 +64,6 @@ class _CheckboxNodeWidgetState extends State<CheckboxNodeWidget>
 
   @override
   Widget buildWithSingle(BuildContext context) {
-    final check = widget.textNode.attributes.check;
     return Padding(
       padding: padding,
       child: Row(

diff --git a/lib/src/service/internal_key_event_handlers/backspace_handler.dart b/lib/src/service/internal_key_event_handlers/backspace_handler.dart
@@ -36,7 +36,7 @@ ShortcutEventHandler backspaceEventHandler = (editorState, event) {
         transaction
           ..updateNode(textNode, {
             BuiltInAttributeKey.subtype: null,
-            textNode.subtype!: null,
+            textNode.subtype: null,
           })
           ..afterSelection = Selection.collapsed(
             Position(

diff --git a/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dart b/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dart
@@ -76,7 +76,7 @@ ShortcutEventHandler enterWithoutShiftInTextNodesHandler =
   // If selection is collapsed and position.start.offset == 0,
   //  insert a empty text node before.
   if (selection.isCollapsed && selection.start.offset == 0) {
-    if (textNode.toPlainText().isEmpty && textNode.subtype != null) {
+    if (textNode.toPlainText().isEmpty) {
       final path =
           textNode.path.length > 1 ? [++textNode.path.first] : textNode.path;
 
@@ -94,7 +94,7 @@ ShortcutEventHandler enterWithoutShiftInTextNodesHandler =
         transaction
           ..updateNode(textNode, {
             BuiltInAttributeKey.subtype: null,
-            textNode.subtype!: null,
+            textNode.subtype: null,
           })
           ..afterSelection = afterSelection;
       }
@@ -202,8 +202,7 @@ ShortcutEventHandler enterWithoutShiftInTextNodesHandler =
 Attributes _attributesFromPreviousLine(TextNode textNode) {
   final prevAttributes = textNode.attributes;
   final subType = textNode.subtype;
-  if (subType == null ||
-      subType == BuiltInAttributeKey.heading ||
+  if (subType == BuiltInAttributeKey.heading ||
       subType == BuiltInAttributeKey.quote) {
     return {};
   }

diff --git a/lib/src/service/render_plugin_service.dart b/lib/src/service/render_plugin_service.dart
@@ -98,7 +98,7 @@ class AppFlowyRenderPlugin extends AppFlowyRenderPluginService {
   Widget buildPluginWidget(NodeWidgetContext context) {
     final node = context.node;
     final name =
-        node.subtype == null ? node.type : '${node.type}/${node.subtype!}';
+        node.subtype == null ? node.type : '${node.type}/${node.subtype}';
     final builder = _builders[name];
     if (builder != null && builder.nodeValidator(node)) {
       return _autoUpdateNodeWidget(builder, context);