From a65742a884223451324fcab5cfaeb6ebdfe32ec1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 6 Mar 2021 15:49:07 -0500
Subject: [PATCH] Fix furigana distribution when reading starts with
 expression, but has remainder characters (#1496)

---
 ext/js/language/japanese-util.js | 2 +-
 test/test-japanese.js            | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ext/js/language/japanese-util.js b/ext/js/language/japanese-util.js
index 4d317396..861d66e8 100644
--- a/ext/js/language/japanese-util.js
+++ b/ext/js/language/japanese-util.js
@@ -531,7 +531,7 @@ const JapaneseUtil = (() => {
         _segmentizeFurigana(reading, readingNormalized, groups, groupsStart) {
             const groupCount = groups.length - groupsStart;
             if (groupCount <= 0) {
-                return [];
+                return reading.length === 0 ? [] : null;
             }
 
             const group = groups[groupsStart];
diff --git a/test/test-japanese.js b/test/test-japanese.js
index 1a4fc494..e9fb9c90 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -707,6 +707,13 @@ function testDistributeFurigana() {
                 {text: 'サボ', furigana: ''},
                 {text: 'る', furigana: 'ル'}
             ]
+        ],
+        // Reading starts with expression, but has remainder characters
+        [
+            ['シック', 'シック・ビルしょうこうぐん'],
+            [
+                {text: 'シック', furigana: 'シック・ビルしょうこうぐん'}
+            ]
         ]
     ];