clean-up code.

karaoke-dev · May 1, 2021 · 86b48cd · 86b48cd
1 parent fa5a952
commit 86b48cd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Checks/CheckInvalidPropertyNotesTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Checks/CheckInvalidPropertyNotesTest.cs
@@ -39,7 +39,7 @@ public void TestCheckParentLyric(int? lyricIndex, bool hasIssue)
             {
                 case 0:
                     note.ParentLyric = lyric;
-                break;
+                    break;
 
                 case 1:
                     note.ParentLyric = notInBeatmapLyric;

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Checks/CheckInvalidRubyRomajiLyricsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Checks/CheckInvalidRubyRomajiLyricsTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -43,7 +44,7 @@ public void TestCheckInvalidRubyTags(string text, string[] rubies, RubyTagInvali
             };
 
             var issue = run(lyric).OfType<RubyTagIssue>().FirstOrDefault();
-            var invalidRubyTagDictionaryKeys = issue?.InvalidRubyTags.Keys.ToArray() ?? new RubyTagInvalid[] { };
+            var invalidRubyTagDictionaryKeys = issue?.InvalidRubyTags.Keys.ToArray() ?? Array.Empty<RubyTagInvalid>();
             Assert.AreEqual(invalidRubyTagDictionaryKeys, invalids);
         }
 
@@ -62,7 +63,7 @@ public void TestCheckInvalidRomajiTags(string text, string[] romajies, RomajiTag
             };
 
             var issue = run(lyric).OfType<RomajiTagIssue>().FirstOrDefault();
-            var invalidRomajiTagDictionaryKeys = issue?.InvalidRomajiTags.Keys.ToArray() ?? new RomajiTagInvalid[] { };
+            var invalidRomajiTagDictionaryKeys = issue?.InvalidRomajiTags.Keys.ToArray() ?? Array.Empty<RomajiTagInvalid>();
             Assert.AreEqual(invalidRomajiTagDictionaryKeys, invalids);
         }
 

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Checks/CheckInvalidTimeLyricsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Checks/CheckInvalidTimeLyricsTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -38,7 +39,7 @@ public void TestCheckInvalidLyricTime(string lyricText, string[] timeTags, TimeI
             lyric.TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags);
 
             var issue = run(lyric).OfType<LyricTimeIssue>().FirstOrDefault();
-            var invalidTimeTagDictionaryKeys = issue?.InvalidLyricTime ?? new TimeInvalid[] { };
+            var invalidTimeTagDictionaryKeys = issue?.InvalidLyricTime ?? Array.Empty<TimeInvalid>();
             Assert.AreEqual(invalidTimeTagDictionaryKeys, invalid);
         }
 
@@ -56,7 +57,7 @@ public void TestCheckInvalidTimeTags(string text, string[] timeTags, TimeTagInva
             };
 
             var issue = run(lyric).OfType<TimeTagIssue>().FirstOrDefault();
-            var invalidTimeTagDictionaryKeys = issue?.InvalidTimeTags.Keys.ToArray() ?? new TimeTagInvalid[] { };
+            var invalidTimeTagDictionaryKeys = issue?.InvalidTimeTags.Keys.ToArray() ?? Array.Empty<TimeTagInvalid>();
             Assert.AreEqual(invalidTimeTagDictionaryKeys, invalids);
         }
 

diff --git a/osu.Game.Rulesets.Karaoke.sln.DotSettings b/osu.Game.Rulesets.Karaoke.sln.DotSettings
@@ -917,6 +917,7 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Coronavirus/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=cuttable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Demibold/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=dropdown_0027s/@EntryIndexedValue">True</s:Boolean>
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     case 0:
                         note.ParentLyric = lyric;
-                    break;
+                        break;
                     case 1:
                         note.ParentLyric = notInBeatmapLyric;
@@ Expand Down @@