data: matchCommentaryEntries -> matchContentEntries

2 files changed, 4 insertions, 9 deletions

diff --git a/src/common-util/wiki-data.js b/src/common-util/wiki-data.js
index 8ad51d6a..a4c6b3bd 100644
--- a/src/common-util/wiki-data.js
+++ b/src/common-util/wiki-data.js
@@ -107,14 +107,14 @@ export const commentaryRegexCaseSensitiveOneShot =
 export const multipleLyricsDetectionRegex =
   /^<i>.*:<\/i>/m;
 
-export function matchContentEntries(sourceText, caseSensitiveRegex) {
+export function matchContentEntries(sourceText) {
   const matchEntries = [];
 
   let previousMatchEntry = null;
   let previousEndIndex = null;
 
   for (const {0: matchText, index: startIndex, groups: matchEntry}
-          of sourceText.matchAll(caseSensitiveRegex)) {
+          of sourceText.matchAll(commentaryRegexCaseSensitive)) {
     if (previousMatchEntry) {
       previousMatchEntry.body = sourceText.slice(previousEndIndex, startIndex);
     }
@@ -132,10 +132,6 @@ export function matchContentEntries(sourceText, caseSensitiveRegex) {
   return matchEntries;
 }
 
-export function matchCommentaryEntries(sourceText) {
-  return matchContentEntries(sourceText, commentaryRegexCaseSensitive)
-}
-
 export function filterAlbumsByCommentary(albums) {
   return albums
     .filter((album) => [album, ...album.tracks].some((x) => x.commentary));
diff --git a/src/data/yaml.js b/src/data/yaml.js
index 847489f0..a2c76b45 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -11,8 +11,7 @@ import {colors, ENABLE_COLOR, logInfo, logWarn} from '#cli';
 import {sortByName} from '#sort';
 import Thing from '#thing';
 import thingConstructors from '#things';
-import {matchCommentaryEntries, multipleLyricsDetectionRegex}
-  from '#wiki-data';
+import {matchContentEntries, multipleLyricsDetectionRegex} from '#wiki-data';
 
 import {
   aggregateThrows,
@@ -859,7 +858,7 @@ export function parseContentEntries(thingClass, sourceText, {subdoc}) {
   });
 
   const documents =
-    matchCommentaryEntries(sourceText)
+    matchContentEntries(sourceText)
       .map(matchEntry =>
         withEntries(
           map(matchEntry),