From 70d5fe020857bc0cefcc3ed67481cdd659d7d30c Mon Sep 17 00:00:00 2001 From: Ellet Date: Thu, 7 Dec 2023 20:37:24 +0300 Subject: [PATCH] Fix analysis issues --- lib/flutter_quill.dart | 4 ++-- .../models/config/editor/editor_configurations.dart | 4 ++-- .../config/raw_editor/raw_editor_configurations.dart | 2 +- .../config/toolbar/simple_toolbar_configurations.dart | 2 +- .../quill_markdown/custom_quill_attributes.dart | 2 +- lib/src/packages/quill_markdown/delta_to_markdown.dart | 2 +- .../quill_markdown/embeddable_table_syntax.dart | 3 ++- lib/src/packages/quill_markdown/markdown_to_delta.dart | 2 +- lib/src/packages/quill_markdown/utils.dart | 2 +- lib/src/widgets/editor/editor.dart | 2 +- lib/src/widgets/quill/text_block.dart | 10 +++++----- lib/src/widgets/quill/text_line.dart | 4 ++-- lib/src/widgets/raw_editor/raw_editor_state.dart | 4 ++-- .../widgets/toolbar/buttons/link_style2_button.dart | 2 +- lib/src/widgets/toolbar/buttons/link_style_button.dart | 2 +- 15 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/flutter_quill.dart b/lib/flutter_quill.dart index 15e58183..0e14a5a9 100644 --- a/lib/flutter_quill.dart +++ b/lib/flutter_quill.dart @@ -23,12 +23,12 @@ export 'src/models/themes/quill_dialog_theme.dart'; export 'src/models/themes/quill_icon_theme.dart'; export 'src/utils/embeds.dart'; export 'src/widgets/editor/editor.dart'; -export 'src/widgets/quill/quill_controller.dart'; export 'src/widgets/others/cursor.dart'; export 'src/widgets/others/default_styles.dart'; -export 'src/widgets/quill/embeds.dart'; export 'src/widgets/others/link.dart' show LinkActionPickerDelegate, LinkMenuAction; +export 'src/widgets/quill/embeds.dart'; +export 'src/widgets/quill/quill_controller.dart'; export 'src/widgets/raw_editor/raw_editor.dart'; export 'src/widgets/raw_editor/raw_editor_state.dart'; export 'src/widgets/style_widgets/style_widgets.dart'; diff --git a/lib/src/models/config/editor/editor_configurations.dart b/lib/src/models/config/editor/editor_configurations.dart index 029f5a48..d6a4ecb1 100644 --- a/lib/src/models/config/editor/editor_configurations.dart +++ b/lib/src/models/config/editor/editor_configurations.dart @@ -7,11 +7,11 @@ import 'package:flutter/widgets.dart'; import 'package:meta/meta.dart' show experimental; import '../../../widgets/editor/editor_builder.dart'; -import '../../../widgets/quill/quill_controller.dart'; import '../../../widgets/others/default_styles.dart'; import '../../../widgets/others/delegate.dart'; -import '../../../widgets/quill/embeds.dart'; import '../../../widgets/others/link.dart'; +import '../../../widgets/quill/embeds.dart'; +import '../../../widgets/quill/quill_controller.dart'; import '../../../widgets/raw_editor/raw_editor.dart'; import '../../themes/quill_dialog_theme.dart'; import '../quill_shared_configurations.dart'; diff --git a/lib/src/models/config/raw_editor/raw_editor_configurations.dart b/lib/src/models/config/raw_editor/raw_editor_configurations.dart index 03744e9e..abe92a04 100644 --- a/lib/src/models/config/raw_editor/raw_editor_configurations.dart +++ b/lib/src/models/config/raw_editor/raw_editor_configurations.dart @@ -25,11 +25,11 @@ import 'package:flutter/widgets.dart' Widget; import 'package:meta/meta.dart' show immutable; -import '../../../widgets/quill/quill_controller.dart'; import '../../../widgets/others/cursor.dart'; import '../../../widgets/others/default_styles.dart'; import '../../../widgets/others/delegate.dart'; import '../../../widgets/others/link.dart'; +import '../../../widgets/quill/quill_controller.dart'; import '../../../widgets/raw_editor/raw_editor.dart'; import '../../../widgets/raw_editor/raw_editor_state.dart'; import '../../themes/quill_dialog_theme.dart'; diff --git a/lib/src/models/config/toolbar/simple_toolbar_configurations.dart b/lib/src/models/config/toolbar/simple_toolbar_configurations.dart index 30054736..c9f0ffeb 100644 --- a/lib/src/models/config/toolbar/simple_toolbar_configurations.dart +++ b/lib/src/models/config/toolbar/simple_toolbar_configurations.dart @@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart' show immutable; import 'package:flutter/widgets.dart' show Axis, Widget, WrapAlignment, WrapCrossAlignment; -import '../../../widgets/quill/quill_controller.dart'; import '../../../widgets/quill/embeds.dart'; +import '../../../widgets/quill/quill_controller.dart'; import '../../themes/quill_dialog_theme.dart'; import '../../themes/quill_icon_theme.dart'; import 'buttons/base_configurations.dart'; diff --git a/lib/src/packages/quill_markdown/custom_quill_attributes.dart b/lib/src/packages/quill_markdown/custom_quill_attributes.dart index bb62ddbd..fef8a953 100644 --- a/lib/src/packages/quill_markdown/custom_quill_attributes.dart +++ b/lib/src/packages/quill_markdown/custom_quill_attributes.dart @@ -1,4 +1,4 @@ -import 'package:flutter_quill/flutter_quill.dart'; +import '../../../flutter_quill.dart'; /// Custom attribute to save the language of codeblock class CodeBlockLanguageAttribute extends Attribute { diff --git a/lib/src/packages/quill_markdown/delta_to_markdown.dart b/lib/src/packages/quill_markdown/delta_to_markdown.dart index cfeb97f6..ba1518b7 100644 --- a/lib/src/packages/quill_markdown/delta_to_markdown.dart +++ b/lib/src/packages/quill_markdown/delta_to_markdown.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:ui'; import 'package:collection/collection.dart'; -import 'package:flutter_quill/flutter_quill.dart'; +import '../../../flutter_quill.dart'; import './custom_quill_attributes.dart'; import './utils.dart'; diff --git a/lib/src/packages/quill_markdown/embeddable_table_syntax.dart b/lib/src/packages/quill_markdown/embeddable_table_syntax.dart index d33e703c..d6375cd4 100644 --- a/lib/src/packages/quill_markdown/embeddable_table_syntax.dart +++ b/lib/src/packages/quill_markdown/embeddable_table_syntax.dart @@ -1,7 +1,8 @@ import 'package:charcode/charcode.dart'; -import 'package:flutter_quill/flutter_quill.dart' hide Node; import 'package:markdown/markdown.dart'; +import '../../../flutter_quill.dart' hide Node; + /// Parses markdown table and saves the table markdown content into the element attributes. class EmbeddableTableSyntax extends BlockSyntax { /// @nodoc diff --git a/lib/src/packages/quill_markdown/markdown_to_delta.dart b/lib/src/packages/quill_markdown/markdown_to_delta.dart index d4bca2e7..76f5b4ba 100644 --- a/lib/src/packages/quill_markdown/markdown_to_delta.dart +++ b/lib/src/packages/quill_markdown/markdown_to_delta.dart @@ -2,9 +2,9 @@ import 'dart:collection'; import 'dart:convert'; import 'package:collection/collection.dart'; -import 'package:flutter_quill/flutter_quill.dart'; import 'package:markdown/markdown.dart' as md; +import '../../../flutter_quill.dart'; import './custom_quill_attributes.dart'; import './embeddable_table_syntax.dart'; import './utils.dart'; diff --git a/lib/src/packages/quill_markdown/utils.dart b/lib/src/packages/quill_markdown/utils.dart index c5843ec5..ba4c6b85 100644 --- a/lib/src/packages/quill_markdown/utils.dart +++ b/lib/src/packages/quill_markdown/utils.dart @@ -1,5 +1,5 @@ //ignore_for_file: cast_nullable_to_non_nullable -import 'package:flutter_quill/flutter_quill.dart'; +import '../../../flutter_quill.dart'; import './embeddable_table_syntax.dart'; diff --git a/lib/src/widgets/editor/editor.dart b/lib/src/widgets/editor/editor.dart index 0017b68c..df8040e1 100644 --- a/lib/src/widgets/editor/editor.dart +++ b/lib/src/widgets/editor/editor.dart @@ -18,9 +18,9 @@ import '../../utils/platform.dart'; import '../others/box.dart'; import '../others/cursor.dart'; import '../others/delegate.dart'; -import '../quill/embeds.dart'; import '../others/float_cursor.dart'; import '../others/text_selection.dart'; +import '../quill/embeds.dart'; import '../raw_editor/raw_editor.dart'; import '../utils/provider.dart'; import 'editor_builder.dart'; diff --git a/lib/src/widgets/quill/text_block.dart b/lib/src/widgets/quill/text_block.dart index c13c5eeb..6510357d 100644 --- a/lib/src/widgets/quill/text_block.dart +++ b/lib/src/widgets/quill/text_block.dart @@ -8,17 +8,17 @@ import '../../models/documents/nodes/line.dart'; import '../../models/structs/vertical_spacing.dart'; import '../../utils/delta.dart'; import '../editor/editor.dart'; -import '../style_widgets/bullet_point.dart'; -import '../style_widgets/checkbox_point.dart'; -import '../style_widgets/number_point.dart'; import '../others/box.dart'; -import 'quill_controller.dart'; import '../others/cursor.dart'; import '../others/default_styles.dart'; import '../others/delegate.dart'; import '../others/link.dart'; -import 'text_line.dart'; import '../others/text_selection.dart'; +import '../style_widgets/bullet_point.dart'; +import '../style_widgets/checkbox_point.dart'; +import '../style_widgets/number_point.dart'; +import 'quill_controller.dart'; +import 'text_line.dart'; const List arabianRomanNumbers = [ 1000, diff --git a/lib/src/widgets/quill/text_line.dart b/lib/src/widgets/quill/text_line.dart index 7ec68bd4..c1b68f42 100644 --- a/lib/src/widgets/quill/text_line.dart +++ b/lib/src/widgets/quill/text_line.dart @@ -11,8 +11,8 @@ import 'package:url_launcher/url_launcher.dart'; import '../../models/documents/attribute.dart'; import '../../models/documents/nodes/container.dart' as container_node; import '../../models/documents/nodes/embeddable.dart'; -import '../../models/documents/nodes/leaf.dart'; import '../../models/documents/nodes/leaf.dart' as leaf; +import '../../models/documents/nodes/leaf.dart'; import '../../models/documents/nodes/line.dart'; import '../../models/documents/nodes/node.dart'; import '../../models/documents/style.dart'; @@ -21,7 +21,6 @@ import '../../utils/color.dart'; import '../../utils/font.dart'; import '../../utils/platform.dart'; import '../others/box.dart'; -import 'quill_controller.dart'; import '../others/cursor.dart'; import '../others/default_styles.dart'; import '../others/delegate.dart'; @@ -29,6 +28,7 @@ import '../others/keyboard_listener.dart'; import '../others/link.dart'; import '../others/proxy.dart'; import '../others/text_selection.dart'; +import 'quill_controller.dart'; class TextLine extends StatefulWidget { const TextLine({ diff --git a/lib/src/widgets/raw_editor/raw_editor_state.dart b/lib/src/widgets/raw_editor/raw_editor_state.dart index 64d1e28c..3a9dfd60 100644 --- a/lib/src/widgets/raw_editor/raw_editor_state.dart +++ b/lib/src/widgets/raw_editor/raw_editor_state.dart @@ -36,15 +36,15 @@ import '../../utils/delta.dart'; import '../../utils/embeds.dart'; import '../../utils/platform.dart'; import '../editor/editor.dart'; -import '../quill/quill_controller.dart'; import '../others/cursor.dart'; import '../others/default_styles.dart'; import '../others/keyboard_listener.dart'; import '../others/link.dart'; import '../others/proxy.dart'; +import '../others/text_selection.dart'; +import '../quill/quill_controller.dart'; import '../quill/text_block.dart'; import '../quill/text_line.dart'; -import '../others/text_selection.dart'; import 'quill_single_child_scroll_view.dart'; import 'raw_editor.dart'; import 'raw_editor_actions.dart'; diff --git a/lib/src/widgets/toolbar/buttons/link_style2_button.dart b/lib/src/widgets/toolbar/buttons/link_style2_button.dart index 63372fba..8fec6c3a 100644 --- a/lib/src/widgets/toolbar/buttons/link_style2_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style2_button.dart @@ -10,8 +10,8 @@ import '../../../l10n/widgets/localizations.dart'; import '../../../models/documents/attribute.dart'; import '../../../models/themes/quill_dialog_theme.dart'; import '../../../models/themes/quill_icon_theme.dart'; -import '../../quill/quill_controller.dart'; import '../../others/link.dart'; +import '../../quill/quill_controller.dart'; import '../base_toolbar.dart'; /// Alternative version of [QuillToolbarLinkStyleButton]. This widget has more diff --git a/lib/src/widgets/toolbar/buttons/link_style_button.dart b/lib/src/widgets/toolbar/buttons/link_style_button.dart index 21d87dff..33ae60e9 100644 --- a/lib/src/widgets/toolbar/buttons/link_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style_button.dart @@ -8,8 +8,8 @@ import '../../../models/rules/insert.dart'; import '../../../models/structs/link_dialog_action.dart'; import '../../../models/themes/quill_dialog_theme.dart'; import '../../../models/themes/quill_icon_theme.dart'; -import '../../quill/quill_controller.dart'; import '../../others/link.dart'; +import '../../quill/quill_controller.dart'; import '../base_toolbar.dart'; class QuillToolbarLinkStyleButton extends StatefulWidget {