Revert TextIndex End behavior change

Author: Maxr1998

LrcParser.Tests/Parser/Lrc/Lines/LrcLyricParserTest.cs

@@ -39,7 +39,7 @@ public void TestDecode(string lyric, LrcLyric expected)
             {
                 Text = "帰り道は",
                 StartTimes = [17000],
-                TimeTags = TestCaseTagHelper.ParseTimeTags(["[0,start]:0", "[1,start]:1000", "[2,start]:2000", "[3,start]:3000", "[4,end]:4000"]),
+                TimeTags = TestCaseTagHelper.ParseTimeTags(["[0,start]:0", "[1,start]:1000", "[2,start]:2000", "[3,start]:3000", "[3,end]:4000"]),
             },
         ],
         [
@@ -48,7 +48,7 @@ public void TestDecode(string lyric, LrcLyric expected)
             {
                 Text = "帰り道は",
                 StartTimes = [17000],
-                TimeTags = TestCaseTagHelper.ParseTimeTags(["[0,start]:17000", "[1,start]:1000", "[2,start]:2000", "[3,start]:3000", "[4,end]:4000"]),
+                TimeTags = TestCaseTagHelper.ParseTimeTags(["[0,start]:17000", "[1,start]:1000", "[2,start]:2000", "[3,start]:3000", "[3,end]:4000"]),
             },
         ],
         [

LrcParser.Tests/Parser/Lrc/LrcParserTest.cs

@@ -31,7 +31,7 @@ public void TestDecode()
                         { new TextIndex(1), 18000 },
                         { new TextIndex(2), 19000 },
                         { new TextIndex(3), 20000 },
-                        { new TextIndex(4, IndexState.End), 21000 },
+                        { new TextIndex(3, IndexState.End), 21000 },
                     },
                 },
             ],

LrcParser.Tests/Parser/Lrc/Utils/LrcTimedTextUtilsTest.cs

@@ -12,10 +12,10 @@ public class LrcTimedTextUtilsTest
 {
     #region Decode
 
-    [TestCase("<00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22>", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[4,end]:19220" })]
-    [TestCase(" <00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22>", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[4,end]:19220" })]
-    [TestCase("<00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22> ", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[4,end]:19220" })]
-    [TestCase("帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22>", 0, "帰り道は", new[] { "[0,start]:0", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[4,end]:19220" })]
+    [TestCase("<00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22>", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[3,end]:19220" })]
+    [TestCase(" <00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22>", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[3,end]:19220" })]
+    [TestCase("<00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22> ", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[3,end]:19220" })]
+    [TestCase("帰<00:18.37>り<00:18.55>道<00:18.94>は<00:19.22>", 0, "帰り道は", new[] { "[0,start]:0", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940", "[3,end]:19220" })]
     [TestCase("<00:17.97>帰<00:18.37>り<00:18.55>道<00:18.94>は", 0, "帰り道は", new[] { "[0,start]:17970", "[1,start]:18370", "[2,start]:18550", "[3,start]:18940" })]
     [TestCase("帰り道は", 0, "帰り道は", new string[] { })]
     [TestCase("", 0, "", new string[] { })]
@@ -25,7 +25,7 @@ public class LrcTimedTextUtilsTest
     [TestCase(
         "<00:06.84> Every <00:07.20>   <00:07.56> night <00:07.87>   <00:08.19> that <00:08.46>   <00:08.79> goes <00:09.19>   <00:09.59> between", 6840,
         "Every night that goes between",
-        new[] { "[0,start]:6840", "[5,end]:7200", "[6,start]:7560", "[11,end]:7870", "[12,start]:8190", "[16,end]:8460", "[17,start]:8790", "[21,end]:9190", "[22,start]:9590" }
+        new[] { "[0,start]:6840", "[4,end]:7200", "[6,start]:7560", "[10,end]:7870", "[12,start]:8190", "[15,end]:8460", "[17,start]:8790", "[20,end]:9190", "[22,start]:9590" }
     )]
     // Alternating time tags, spaced on both sides
     [TestCase(

LrcParser/Parser/Lrc/Utils/LrcTimedTextUtils.cs

@@ -55,7 +55,7 @@ internal static Tuple<string, SortedDictionary<TextIndex, int>> TimedTextToObjec
                 // The last segment was a start tag, and the next segment is empty, insert end tag
                 if (lastTagWasStartTag)
                 {
-                    timeTags.TryAdd(new TextIndex(lyricText.Length, IndexState.End), lastTimeTag);
+                    timeTags.TryAdd(new TextIndex(lyricText.Length - 1, IndexState.End), lastTimeTag);
                     lastTagWasStartTag = false;
                 }
 
@@ -106,7 +106,7 @@ internal static Tuple<string, SortedDictionary<TextIndex, int>> TimedTextToObjec
         else
         {
             // No remaining text, last time tag was end tag
-            timeTags.TryAdd(new TextIndex(lyricText.Length, IndexState.End), lastTimeTag);
+            timeTags.TryAdd(new TextIndex(lyricText.Length - 1, IndexState.End), lastTimeTag);
         }
 
         return new Tuple<string, SortedDictionary<TextIndex, int>>(lyricText.ToString(), timeTags);