improved error handling

Author: ali-thowfeek

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [3.0.0-nullsafety.1] - Feb 1, 2021
+* Improved error handling
+
 ## [3.0.0-nullsafety.0] - Jan 27, 2021
 
 * Migrate to null safety

example/pubspec.lock

@@ -43,13 +43,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0-nullsafety.5"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2"
   fake_async:
     dependency: transitive
     description:
@@ -108,7 +101,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.0.0-nullsafety.0"
+    version: "3.0.0-nullsafety.1"
   sky_engine:
     dependency: transitive
     description: flutter

example/pubspec.yaml

@@ -1,16 +1,5 @@
 name: example
 description: A new Flutter project.
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 version: 1.0.0+1
 
 environment:
@@ -22,53 +11,9 @@ dependencies:
   simple_html_css:
     path: ../
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
+  uses-material-design: true

lib/simple_html_css.dart

@@ -17,8 +17,6 @@ library simple_html_css;
  * limitations under the License.
  */
 
-//TODO: Migrate to null safety
-
 export 'src/internals.dart';
 export 'src/utils.dart';
 export 'src/html_stylist.dart';

lib/src/html_stylist.dart

@@ -60,11 +60,6 @@ class HTML {
       {Function? linksCallback,
       Map<String, TextStyle>? overrideStyle,
       TextStyle? defaultTextStyle}) {
-    //Validating empty content
-    if (htmlContent.isEmpty) {
-      return TextSpan();
-    }
-
     //to fix a known issue with &nbsp; when appearing after an ending tag
     htmlContent =
         htmlContent.replaceAll("&nbsp;", " ").replaceAll("&nbsp", " ");
@@ -76,7 +71,16 @@ class HTML {
         linksCallback: linksCallback,
         overrideStyleMap: overrideStyle ?? Map<String, TextStyle>(),
         defaultTextStyle: defaultTextStyle);
-    return TextSpan(text: "", children: p.parse());
+
+    var list = <TextSpan>[];
+    try {
+      list = p.parse();
+    } catch (e, s) {
+      print('simple_html_css Exception: $e');
+      print('simple_html_css Stack Trace: $s');
+    }
+
+    return TextSpan(text: "", children: list);
   }
 
   /// Returns a [RichText] widget you can directly add to your widget tree.

lib/src/internals.dart

@@ -314,10 +314,13 @@ class Parser {
             text: "\n",
           ));
         }
-        var top = _stack.removeLast();
-        if (top.name != event.name) {
-          print("Malformed HTML");
-          return;
+
+        if (_stack.isNotEmpty) {
+          var top = _stack.removeLast();
+          if (top.name != event.name) {
+            print("Malformed HTML");
+            return;
+          }
         }
       }
 
@@ -330,7 +333,9 @@ class Parser {
     });
 
     //removing last textSpan to avoid extra space at the bottom
-    spans.removeLast();
+    if (spans.isNotEmpty) {
+      spans.removeLast();
+    }
     return spans;
   }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: simple_html_css
 description: This package allows you to use simple HTML and inline CSS styles to style your text in flutter. A fork of css_text package.
-version: 3.0.0-nullsafety.0
+version: 3.0.0-nullsafety.1
 homepage: https://github.com/ali-thowfeek/simple_html_css_flutter
 repository: https://github.com/ali-thowfeek/simple_html_css_flutter
 environment:
@@ -16,39 +16,4 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-
-  # To add assets to your package, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-  #
-  # For details regarding assets in packages, see
-  # https://flutter.dev/assets-and-images/#from-packages
-  #
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # To add custom fonts to your package, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts in packages, see
-  # https://flutter.dev/custom-fonts/#from-packages