Fix lint warnings

Author: daohoangson

demo_app/analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:lint/analysis_options_package.yaml
+include: package:lint/analysis_options.yaml
 
 analyzer:
   exclude:

demo_app/lib/main.dart

@@ -1,8 +1,7 @@
+import 'package:demo_app/screens/home.dart';
+import 'package:demo_app/widgets/popup_menu.dart';
 import 'package:flutter/material.dart';
 
-import 'screens/home.dart';
-import 'widgets/popup_menu.dart';
-
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {

demo_app/lib/screens/font_size.dart

@@ -49,8 +49,8 @@ class _Panel extends StatelessWidget {
               ),
               const Divider(),
               HtmlWidget(
-                '<p style="font-size: 1em">Almost every developer\'s favorite molecule is '
-                'C<sub>8</sub>H<sub>10</sub>N<sub>4</sub>O<sub>2</sub>, '
+                '<p style="font-size: 1em">Almost every developer\'s favorite '
+                'molecule is C<sub>8</sub>H<sub>10</sub>N<sub>4</sub>O<sub>2</sub>, '
                 'also known as "caffeine."</p>',
               ),
             ],

demo_app/lib/screens/golden.dart

@@ -88,7 +88,7 @@ class GoldensScreen extends StatefulWidget {
   const GoldensScreen({Key key}) : super(key: key);
 
   @override
-  _GoldensState createState() => _GoldensState();
+  State<GoldensScreen> createState() => _GoldensState();
 }
 
 class _GoldensState extends State<GoldensScreen> {

demo_app/lib/screens/hello_world_core.dart

@@ -1,9 +1,8 @@
+import 'package:demo_app/screens/hello_world.dart' as enhanced;
 import 'package:demo_app/widgets/popup_menu.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
 
-import 'hello_world.dart' as enhanced;
-
 class HelloWorldCoreScreen extends StatelessWidget {
   const HelloWorldCoreScreen({Key key}) : super(key: key);
 

demo_app/lib/screens/home.dart

@@ -1,22 +1,21 @@
+import 'package:demo_app/screens/audio.dart';
+import 'package:demo_app/screens/custom_styles_builder.dart';
+import 'package:demo_app/screens/custom_widget_builder.dart';
+import 'package:demo_app/screens/font_size.dart';
+import 'package:demo_app/screens/golden.dart';
+import 'package:demo_app/screens/hello_world.dart';
+import 'package:demo_app/screens/hello_world_core.dart';
+import 'package:demo_app/screens/huge_html.dart';
+import 'package:demo_app/screens/iframe.dart';
+import 'package:demo_app/screens/img.dart';
+import 'package:demo_app/screens/img_file.dart';
+import 'package:demo_app/screens/photo_view.dart';
+import 'package:demo_app/screens/smilie.dart';
+import 'package:demo_app/screens/video.dart';
+import 'package:demo_app/screens/wordpress.dart';
 import 'package:demo_app/widgets/popup_menu.dart';
 import 'package:flutter/material.dart';
 
-import 'audio.dart';
-import 'custom_styles_builder.dart';
-import 'custom_widget_builder.dart';
-import 'font_size.dart';
-import 'golden.dart';
-import 'hello_world.dart';
-import 'hello_world_core.dart';
-import 'huge_html.dart';
-import 'iframe.dart';
-import 'img.dart';
-import 'img_file.dart';
-import 'photo_view.dart';
-import 'smilie.dart';
-import 'video.dart';
-import 'wordpress.dart';
-
 class HomeScreen extends StatelessWidget {
   static final _screens = <String, Widget Function()>{
     'Hello World': () => const HelloWorldScreen(),

demo_app/lib/screens/img_file.dart

@@ -73,10 +73,10 @@ class _ImgFileState extends State<_ImgFileTab> {
                   Padding(
                     padding: const EdgeInsets.all(8.0),
                     child: Text(
-                      'This test will write a ${widget.fileExtension} file into '
-                      "the device's file system then try to render with an IMG tag. "
+                      'This test will write a ${widget.fileExtension} into '
+                      'the file system then try to render with an IMG tag. '
                       'The actual file path is semi-random and it should be '
-                      'unique across tests (switch tab to test again and again).',
+                      'unique across tests (switch tab to re-test).',
                     ),
                   ),
                   Center(

demo_app/lib/screens/photo_view.dart

@@ -1,9 +1,9 @@
+import 'package:demo_app/screens/custom_widget_builder.dart'
+    as custom_widget_builder;
 import 'package:flutter/material.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
 import 'package:photo_view/photo_view.dart';
 
-import 'custom_widget_builder.dart' as custom_widget_builder;
-
 class PhotoViewScreen extends StatelessWidget {
   const PhotoViewScreen({Key key}) : super(key: key);
 

demo_app/pubspec.lock

@@ -223,14 +223,14 @@ packages:
       path: "../packages/enhanced"
       relative: true
     source: path
-    version: "0.8.3"
+    version: "0.8.3+1"
   flutter_widget_from_html_core:
     dependency: "direct main"
     description:
       path: "../packages/core"
       relative: true
     source: path
-    version: "0.8.3"
+    version: "0.8.3+1"
   frontend_server_client:
     dependency: transitive
     description:
@@ -270,7 +270,7 @@ packages:
       path: "../packages/fwfh_selectable_text"
       relative: true
     source: path
-    version: "0.8.2"
+    version: "0.8.3"
   fwfh_svg:
     dependency: "direct overridden"
     description:
@@ -382,7 +382,7 @@ packages:
       name: lint
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.1"
   logging:
     dependency: transitive
     description:
@@ -466,7 +466,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
   path_provider_android:
     dependency: transitive
     description:
@@ -487,7 +487,7 @@ packages:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   path_provider_macos:
     dependency: transitive
     description:
@@ -646,7 +646,7 @@ packages:
       name: sqflite_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1+1"
+    version: "2.1.0"
   stack_trace:
     dependency: transitive
     description:
@@ -884,7 +884,7 @@ packages:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.0"
+    version: "3.0.0"
   webview_flutter_android:
     dependency: transitive
     description:
@@ -905,7 +905,7 @@ packages:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.7.0"
+    version: "2.7.1"
   win32:
     dependency: transitive
     description:
@@ -935,5 +935,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.15.0 <3.0.0"
   flutter: ">=2.5.0"

demo_app/test/golden_test.dart

@@ -51,6 +51,7 @@ void main() {
     'dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls',
     'dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls',
     'dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled',
+    // ignore: lines_longer_than_80_chars
     'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically',
     'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled',
     'dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode',

packages/core/analysis_options.yaml

@@ -11,3 +11,8 @@ linter:
   rules:
     always_put_control_body_on_new_line: true
     missing_whitespace_between_adjacent_strings: false
+
+    # relative vs. package imports
+    always_use_package_imports: false
+    avoid_relative_lib_imports: true
+    prefer_relative_imports: true

packages/core/lib/src/core_data.dart

@@ -4,7 +4,6 @@ import 'package:fwfh_text_style/fwfh_text_style.dart';
 import 'package:html/dom.dart' as dom;
 
 import 'core_helpers.dart';
-import 'core_widget_factory.dart';
 
 part 'data/build_bits.dart';
 part 'data/css.dart';
@@ -42,7 +41,7 @@ abstract class BuildMetadata {
   ///
   /// These are collected from:
   ///
-  /// - [WidgetFactory.parse] or [BuildOp.onChild] by calling `meta[key] = value`
+  /// - [WidgetFactory.parse] or [BuildOp.onChild] via `meta[key] = value`
   /// - [BuildOp.defaultStyles] returning a map
   /// - Attribute `style` of [domElement]
   List<css.Declaration> get styles;
@@ -97,7 +96,7 @@ class BuildOp {
 
   /// The callback that will be called whenver a child element is found.
   ///
-  /// Please note that all children and grandchildren etc. will trigger this method,
+  /// Please note that all children and grandchildren etc. will trigger this,
   /// it's easy to check whether an element is direct child:
   ///
   /// ```dart

packages/core/lib/src/core_helpers.dart

@@ -52,7 +52,7 @@ typedef CustomWidgetBuilder = Widget? Function(dom.Element element);
 
 /// A callback to scroll the anchor identified by [id] into the viewport.
 ///
-/// By default, an internal implementation is given to [WidgetFactory.onTapAnchor]
+/// By default, an internal impl is given to [WidgetFactory.onTapAnchor]
 /// when an anchor is tapped to handle the scrolling.
 /// A wf subclass can use this to change the [curve], the animation [duration]
 /// or even request scrolling to a different anchor.
@@ -266,9 +266,21 @@ Uint8List? bytesFromDataUri(String dataUri) {
 Iterable<T>? listOrNull<T>(T? x) => x == null ? null : [x];
 
 /// Parses [key] from [map] as an double literal and return its value.
-double? tryParseDoubleFromMap(Map<dynamic, String> map, String key) =>
-    map.containsKey(key) ? double.tryParse(map[key]!) : null;
+double? tryParseDoubleFromMap(Map<dynamic, String> map, String key) {
+  final value = map[key];
+  if (value == null) {
+    return null;
+  }
+
+  return double.tryParse(value);
+}
 
-/// Parses [key] from [map] as a, possibly signed, integer literal and return its value.
-int? tryParseIntFromMap(Map<dynamic, String> map, String key) =>
-    map.containsKey(key) ? int.tryParse(map[key]!) : null;
+/// Parses [key] from [map] as an integer literal and return its value.
+int? tryParseIntFromMap(Map<dynamic, String> map, String key) {
+  final value = map[key];
+  if (value == null) {
+    return null;
+  }
+
+  return int.tryParse(value);
+}

packages/core/lib/src/core_html_widget.dart

@@ -52,7 +52,8 @@ class HtmlWidget extends StatefulWidget {
 
   /// The callback when user taps a link.
   ///
-  /// Returns `true` if the url has been handled, the default handler will be skipped.
+  /// Returns `true` if the url has been handled,
+  /// the default handler will be skipped.
   final FutureOr<bool> Function(String)? onTapUrl;
 
   /// The values that should trigger rebuild.
@@ -81,8 +82,9 @@ class HtmlWidget extends StatefulWidget {
   /// The render mode.
   ///
   /// - [RenderMode.column] is the default mode, suitable for small / medium document.
-  /// - [RenderMode.listView] has better performance as it renders contents lazily.
-  /// - [RenderMode.sliverList] has similar performance as `ListView` and can be put inside a `CustomScrollView`.
+  /// - [RenderMode.listView] has better performance as it renders lazily.
+  /// - [RenderMode.sliverList] has similar performance as `ListView`
+  /// and can be put inside a `CustomScrollView`.
   final RenderMode renderMode;
 
   /// The default styling for text elements.

packages/core/lib/src/core_widget_factory.dart

@@ -16,7 +16,7 @@ import 'internal/platform_specific/fallback.dart'
 
 /// A factory to build widgets.
 class WidgetFactory {
-  /// Setting this property to true replaces the default loading widget with a static [Text].
+  /// Setting this property to true replaces the default with a static [Text].
   /// This property is most useful for testing purposes.
   ///
   /// Defaults to `false`, resulting in a [CircularProgressIndicator].
@@ -49,7 +49,7 @@ class WidgetFactory {
 
   /// Gets the current anchor registry.
   ///
-  /// This is an implementation detail and may be changed without a major version bump.
+  /// This is an impl detail and may be changed without a major version bump.
   @protected
   AnchorRegistry get anchorRegistry => _anchorRegistry;
 

packages/core/lib/src/data/css.dart

@@ -68,7 +68,8 @@ class CssBorder {
         radiusTopRight: other.radiusTopRight,
       );
 
-  /// Creates a copy of this border but with the given fields replaced with the new values.
+  /// Creates a copy of this border but with the given fields
+  /// replaced with the new values.
   CssBorder copyWith({
     CssBorderSide? bottom,
     CssBorderSide? inlineEnd,
@@ -399,11 +400,11 @@ enum CssLengthUnit {
 /// The whitespace behavior.
 enum CssWhitespace {
   /// Sequences of white space are collapsed.
-  /// Newline characters in the source are handled the same as other white space.
+  /// Newline characters in the source are handled the same as other whitespace.
   /// Lines are broken as necessary to fill line boxes.
   normal,
 
   /// Sequences of white space are preserved.
-  /// Lines are only broken at newline characters in the source and at <br> elements.
+  /// Lines are only broken at newline characters in the source and at `BR`s.
   pre,
 }

packages/core/lib/src/data/text_style.dart

@@ -62,7 +62,7 @@ class TextStyleHtml {
   }) {
     assert(
       style is FwfhTextStyle?,
-      'The text style should be modified by calling methods of the existing instance: '
+      'The text style should be modified by methods of the existing instance: '
       'apply(), copyWith() or merge().',
     );
 
@@ -138,6 +138,7 @@ class TextStyleBuilder<T1> {
     final l = _builders!.length;
     for (var i = 0; i < l; i++) {
       final builder = _builders![i];
+      // ignore: avoid_dynamic_calls
       _output = builder(_output, _inputs![i]) as TextStyleHtml;
       assert(_output?.parent == _parentOutput);
     }

packages/core/lib/src/external/csslib.dart

@@ -14,7 +14,7 @@ extension DomElementExtension on dom.Element {
   /// This is different from [BuildMetadata.styles] as it doesn't include
   /// runtime additions from [WidgetFactory] or [BuildOp]s.
   ///
-  /// Parsing CSS is a non-trivial task but the result is cached for each element
+  /// Parsing CSS is a non-trivial task but the result is cached
   /// so it's safe to call this again and again.
   List<css.Declaration> get styles {
     final expando = _expando ??= Expando();

packages/core/lib/src/internal/ops/tag_li.dart

@@ -32,7 +32,7 @@ class TagLi {
   late final BuildOp _itemOp;
   final _itemWidgets = <WidgetPlaceholder>[];
 
-  _ListConfig? _config;
+  _ListConfig? __config;
 
   TagLi(this.wf, this.listMeta) {
     op = _TagLiListOp(this);
@@ -49,10 +49,10 @@ class TagLi {
     );
   }
 
-  _ListConfig get config {
+  _ListConfig get _config {
     // cannot build config from constructor because
     // inline styles are not fully parsed at that time
-    return _config ??= _ListConfig.fromBuildMetadata(listMeta);
+    return __config ??= _ListConfig.fromBuildMetadata(listMeta);
   }
 
   Map<String, String> defaultStyles(dom.Element element) {
@@ -92,6 +92,7 @@ class TagLi {
   }
 
   Widget _buildItem(BuildContext context, Widget child, int i) {
+    final config = _config;
     final meta = _itemMetas[i];
     final listStyleType = _ListConfig.listStyleTypeFromBuildMetadata(meta) ??
         config.listStyleType;