From e37de1bdb17bf30a9f3563bf6cff59b1f830465a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Sun, 13 Feb 2022 01:18:27 +0100
Subject: [PATCH] Update version and lint

---
 CHANGELOG.md                |  5 +++++
 lib/src/example_search.dart | 17 +++++++++--------
 lib/src/phrase_scrape.dart  |  2 +-
 pubspec.yaml                |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e98d93c..4268235 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.4
+
+- Fixed bug where pieces were missing in example sentences
+- Fixed bug where some scrapeForPhrase searches would crash for no apparent reason.
+
 ## 2.0.3
 
 - Bug fixes
diff --git a/lib/src/example_search.dart b/lib/src/example_search.dart
index d8c93d6..853b780 100644
--- a/lib/src/example_search.dart
+++ b/lib/src/example_search.dart
@@ -92,17 +92,18 @@ List<String> _getKanjiAndKana(Element div) {
   return [kanji, kana];
 }
 
-Element normalizeSentenceElement(Element sentenceElement) =>
-    Element.html('<ul>' +
-        sentenceElement.children.first.innerHtml.replaceAllMapped(
-          RegExp(r'(?<=^|<\/li>)\s*([^<>]+)\s*(?=<li)'),
-          (match) =>
-              '<li class="clearfix"><span class="unlinked">${match.group(0)}</span></li>',
-        ) +
+Element _normalizeSentenceElement(Element sentenceElement) =>
+    Element.html('<ul>'
+        '${sentenceElement.children.first.innerHtml.replaceAllMapped(
+      RegExp(r'(?<=^|<\/li>)\s*([^<>]+)\s*(?=<li)'),
+      (match) =>
+          '<li class="clearfix"><span class="unlinked">${match.group(0)}</span></li>',
+    )}'
         '</ul>');
 
+// ignore: public_member_api_docs
 List<ExampleSentencePiece> getPieces(Element sentenceElement) {
-  return normalizeSentenceElement(sentenceElement)
+  return _normalizeSentenceElement(sentenceElement)
       .querySelectorAll('li.clearfix')
       .map((var e) {
     final unlifted = assertNotNull(
diff --git a/lib/src/phrase_scrape.dart b/lib/src/phrase_scrape.dart
index c9f6bb0..a7144ca 100644
--- a/lib/src/phrase_scrape.dart
+++ b/lib/src/phrase_scrape.dart
@@ -159,7 +159,7 @@ PhrasePageScrapeResultData _getMeaningsOtherFormsAndNotes(
   var notes;
 
   for (var child in meaningsWrapper.children) {
-    final mostRecentWordType = mostRecentWordTypes.length >= 1 ? mostRecentWordTypes[0] : null;
+    final mostRecentWordType = mostRecentWordTypes.isNotEmpty ? mostRecentWordTypes[0] : null;
     if (child.className.contains('meaning-tags')) {
       mostRecentWordTypes = _getMostRecentWordTypes(child);
     } else if (mostRecentWordType == 'other forms') {
diff --git a/pubspec.yaml b/pubspec.yaml
index 9212469..2ba8d87 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: unofficial_jisho_api
-version: 2.0.3
+version: 2.0.4
 
 description: An unofficial api for searching and scraping the japanese dictionary Jisho.org
 homepage: https://github.com/h7x4ABk3g/unofficial_jisho_api_dart/
@@ -14,7 +14,7 @@ dependencies:
   html: ^0.15.0
 
 dev_dependencies:
-  pedantic: ^1.11.1
+  lints: ^1.0.1
   test: ^1.17.10
   path: ^1.8.0
   effective_dart: ^1.3.2