diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index cf8d26889..e5a4babc1 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -4,3 +4,5 @@ c3d76bde9f3d78b420ab6a18b8191c00a503b2be 3546a366f24d23dee1188758df0f8c6744dd1001 # Make main project to the file-scope namespace 5597711949c30a9699c4ab3957c0d98e6ff2212c +# Apply the trailing comma in the whole solution. +70fa847a40aa6a6c8ea3f1b277e4c2a23c8484a4 \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapDecoderTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapDecoderTest.cs index d00c9dc90..f183f6e78 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapDecoderTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapDecoderTest.cs @@ -145,7 +145,7 @@ public void TestSliceNoteTime(double startPercentage, double durationPercentage, { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }; if (expected != null) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapEncoderTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapEncoderTest.cs index e7541ce5a..165af7782 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapEncoderTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/KaraokeLegacyBeatmapEncoderTest.cs @@ -45,14 +45,14 @@ public void TestEncodeBeatmapLyric() { StartIndex = 0, EndIndex = 0, - Text = "か" + Text = "か", }, new RubyTag { StartIndex = 2, EndIndex = 2, - Text = "お" - } + Text = "お", + }, }, RomajiTags = new[] { @@ -60,17 +60,17 @@ public void TestEncodeBeatmapLyric() { StartIndex = 1, EndIndex = 1, - Text = "ra" + Text = "ra", }, new RomajiTag { StartIndex = 3, EndIndex = 3, - Text = "ke" - } + Text = "ke", + }, }, - } - } + }, + }, }; using var ms = new MemoryStream(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LyricTextEncoderTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LyricTextEncoderTest.cs index 2e1637475..ca4e29b00 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LyricTextEncoderTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Formats/LyricTextEncoderTest.cs @@ -20,7 +20,7 @@ public void TestEncodeBeatmapToPureText(string[] lyrics, string expected) var encoder = new LyricTextEncoder(); var beatmap = new KaraokeBeatmap { - HitObjects = TestCaseTagHelper.ParseLyrics(lyrics).OfType().ToList() + HitObjects = TestCaseTagHelper.ParseLyrics(lyrics).OfType().ToList(), }; string actual = encoder.Encode(beatmap); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/KaraokeBeatmapConversionTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/KaraokeBeatmapConversionTest.cs index 28192d938..a6505a871 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/KaraokeBeatmapConversionTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/KaraokeBeatmapConversionTest.cs @@ -41,7 +41,7 @@ protected override IEnumerable CreateConvertValue(HitObject hitObj { StartTime = obj.StartTime, EndTime = obj.EndTime, - Lyric = obj.Text + Lyric = obj.Text, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Stages/Preview/PreviewStageTimingCalculatorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Stages/Preview/PreviewStageTimingCalculatorTest.cs index 947bbc360..57e6d7ea2 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Stages/Preview/PreviewStageTimingCalculatorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/Stages/Preview/PreviewStageTimingCalculatorTest.cs @@ -102,7 +102,7 @@ private IBeatmap createBeatmap() createLyric(lyric_2_id, 2100, 3000), createLyric(lyric_3_id, 3100, 4000), createLyric(lyric_4_id, 4100, 5000), - createLyric(lyric_5_id, 5100, 6000) + createLyric(lyric_5_id, 5100, 6000), }; lyrics.Reverse(); @@ -119,7 +119,7 @@ private static Lyric createLyric(int id, double startTime, double endTime) TimeTags = new List { new(new TextIndex(), startTime), - new(new TextIndex(), endTime) + new(new TextIndex(), endTime), }, }.ChangeId(id); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/TestSceneBeatmapInfoWedge.cs b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/TestSceneBeatmapInfoWedge.cs index 69c3c1a39..c386d961d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/TestSceneBeatmapInfoWedge.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Beatmaps/TestSceneBeatmapInfoWedge.cs @@ -26,7 +26,7 @@ protected override void LoadComplete() { Size = new Vector2(0.5f, 245), RelativeSizeAxes = Axes.X, - Margin = new MarginPadding { Top = 20 } + Margin = new MarginPadding { Top = 20 }, }); AddStep("show", () => diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/BaseChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/BaseChangeHandlerTest.cs index e4b9b59ed..b2cdb470f 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/BaseChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/BaseChangeHandlerTest.cs @@ -52,7 +52,7 @@ private void load() Children = new Drawable[] { editorBeatmap, - changeHandler = CreateChangeHandler() + changeHandler = CreateChangeHandler(), }; } @@ -240,7 +240,7 @@ protected void AssertWorkingPropertyInHitObjectValid() { Lyric lyric => lyric.GetAllInvalidWorkingProperties().Length == 0, Note note => note.GetAllInvalidWorkingProperties().Length == 0, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }); }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapClassicStageChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapClassicStageChangeHandlerTest.cs index 25199e398..f2f59d1e8 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapClassicStageChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapClassicStageChangeHandlerTest.cs @@ -259,7 +259,7 @@ protected override void SetUpKaraokeBeatmap(Action action) var stageInfo = new ClassicStageInfo(); karaokeBeatmap.StageInfos = new List { - stageInfo + stageInfo, }; karaokeBeatmap.CurrentStageInfo = stageInfo; diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapLanguagesChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapLanguagesChangeHandlerTest.cs index 3cd227f64..44cdb094d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapLanguagesChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapLanguagesChangeHandlerTest.cs @@ -20,7 +20,7 @@ public void TestAdd() { karaokeBeatmap.AvailableTranslates = new List { - new("zh-TW") + new("zh-TW"), }; }); @@ -45,7 +45,7 @@ public void TestRemove() karaokeBeatmap.AvailableTranslates = new List { new("zh-TW"), - new("Ja-jp") + new("Ja-jp"), }; }); @@ -69,7 +69,7 @@ public void TestIsLanguageContainsTranslate() karaokeBeatmap.AvailableTranslates = new List { new("zh-TW"), - new("Ja-jp") + new("Ja-jp"), }; }); @@ -79,8 +79,8 @@ public void TestIsLanguageContainsTranslate() { { new("zh-TW"), "卡拉 OK" - } - } + }, + }, }); TriggerHandlerChanged(c => diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapSingersChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapSingersChangeHandlerTest.cs index 65ad7d0df..97f2695bd 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapSingersChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapSingersChangeHandlerTest.cs @@ -90,8 +90,8 @@ public void TestRemove() { new Lyric { - SingerIds = { firstSinger.ID } - } + SingerIds = { firstSinger.ID }, + }, }; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStageElementCategoryChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStageElementCategoryChangeHandlerTest.cs index 3111e6fa6..deca91f93 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStageElementCategoryChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStageElementCategoryChangeHandlerTest.cs @@ -223,7 +223,7 @@ protected override void SetUpKaraokeBeatmap(Action action) var stageInfo = new TestStageInfo(); karaokeBeatmap.StageInfos = new List { - stageInfo + stageInfo, }; karaokeBeatmap.CurrentStageInfo = stageInfo; diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStagesChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStagesChangeHandlerTest.cs index 3d20eadfe..3141f8de7 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStagesChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStagesChangeHandlerTest.cs @@ -48,7 +48,7 @@ public void TestRemove() var stageInfo = new ClassicStageInfo(); karaokeBeatmap.StageInfos = new List { - stageInfo + stageInfo, }; karaokeBeatmap.CurrentStageInfo = stageInfo; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/ImportBeatmapChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/ImportBeatmapChangeHandlerTest.cs index 5fdbd99dd..f380d4366 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/ImportBeatmapChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/ImportBeatmapChangeHandlerTest.cs @@ -28,7 +28,7 @@ public void TestImport() new Lyric(), new Lyric(), new Note(), - } + }, }; c.Import(beatmap); }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/LockChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/LockChangeHandlerTest.cs index cecb94f18..e0310cc6c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/LockChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/LockChangeHandlerTest.cs @@ -25,7 +25,7 @@ public void TestLock() PrepareHitObject(() => new Note { Text = "カラオケ", - ReferenceLyricId = referencedLyric.ID + ReferenceLyricId = referencedLyric.ID, }); TriggerHandlerChanged(c => c.Lock(LockState.Full)); @@ -51,7 +51,7 @@ public void TestUnlock() PrepareHitObject(() => new Note { Text = "カラオケ", - ReferenceLyricId = referencedLyric.ID + ReferenceLyricId = referencedLyric.ID, }); TriggerHandlerChanged(c => c.Unlock()); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricLanguageChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricLanguageChangeHandlerTest.cs index d39d95958..68ee0c529 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricLanguageChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricLanguageChangeHandlerTest.cs @@ -19,7 +19,7 @@ public void TestDetectLanguage() { PrepareHitObject(() => new Lyric { - Text = "カラオケ" + Text = "カラオケ", }); TriggerHandlerChanged(c => c.AutoGenerate()); @@ -35,7 +35,7 @@ public void TestDetectLanguageWithNonSupportedLyric() { PrepareHitObject(() => new Lyric { - Text = "???" + Text = "???", }); TriggerHandlerChanged(c => c.AutoGenerate()); @@ -67,7 +67,7 @@ public void TestSetLanguageToNull() { PrepareHitObject(() => new Lyric { - Text = "???" + Text = "???", }); TriggerHandlerChanged(c => c.SetLanguage(null)); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricNotesChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricNotesChangeHandlerTest.cs index 11fcb41de..1f66520d6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricNotesChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricNotesChangeHandlerTest.cs @@ -32,7 +32,7 @@ public void TestAutoGenerateNotes() new TimeTag(new TextIndex(2), 2000), new TimeTag(new TextIndex(3), 3000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 4000), - } + }, }); TriggerHandlerChanged(c => c.AutoGenerate()); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs index 8f0321543..2b5f69afe 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyAutoGenerateChangeHandlerTest.cs @@ -38,7 +38,7 @@ public void TestCanGenerateWithReferenceLyric() { PrepareHitObject(() => new Lyric { - Text = "karaoke" + Text = "karaoke", }, false); } @@ -53,7 +53,7 @@ public void TestCanGenerateWithReferenceLyric() new TimeTag(new TextIndex(2), 2000), new TimeTag(new TextIndex(3), 3000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 4000), - } + }, }); TriggerHandlerChanged(c => @@ -71,7 +71,7 @@ public void TestGeneratorNotSupportedLyricsWithReferenceLyric() { PrepareHitObject(() => new Lyric { - Text = "karaoke" + Text = "karaoke", }, false); } @@ -86,7 +86,7 @@ public void TestGeneratorNotSupportedLyricsWithReferenceLyric() new TimeTag(new TextIndex(2), 2000), new TimeTag(new TextIndex(3), 3000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 4000), - } + }, }); TriggerHandlerChanged(c => @@ -105,7 +105,7 @@ public void TestAutoGenerate() { PrepareHitObject(() => new Lyric { - Text = "karaoke" + Text = "karaoke", }, false); } @@ -120,7 +120,7 @@ public void TestAutoGenerate() new TimeTag(new TextIndex(2), 2000), new TimeTag(new TextIndex(3), 3000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 4000), - } + }, }); if (lyricReferenceChangeHandler) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyChangeHandlerTest.cs index e6358c468..a65e539c7 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricPropertyChangeHandlerTest.cs @@ -16,7 +16,7 @@ protected Lyric PrepareLyricWithSyncConfig(Lyric referencedLyric, IReferenceLyri { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceLyricConfig = config ?? new SyncLyricConfig() + ReferenceLyricConfig = config ?? new SyncLyricConfig(), }; PrepareHitObjects(() => new[] { lyric }, selected); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricReferenceChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricReferenceChangeHandlerTest.cs index bbfe93bf2..86c4bf9a0 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricReferenceChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricReferenceChangeHandlerTest.cs @@ -20,12 +20,12 @@ public void TestDetectReferenceLyric() { PrepareHitObject(() => new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, false); PrepareHitObject(() => new Lyric { - Text = "カラオケ" + Text = "カラオケ", }); TriggerHandlerChanged(c => c.AutoGenerate()); @@ -42,12 +42,12 @@ public void TestDetectReferenceLyricWithNonSupportedLyric() { PrepareHitObject(() => new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, false); PrepareHitObject(() => new Lyric { - Text = "???" + Text = "???", }); TriggerHandlerChangedWithException(c => c.AutoGenerate()); @@ -60,14 +60,14 @@ public void TestUpdateReferenceLyric() { var referencedLyric = new Lyric { - Text = "Referenced lyric" + Text = "Referenced lyric", }; PrepareHitObject(() => referencedLyric, false); PrepareHitObject(() => new Lyric { - Text = "I need the reference lyric." + Text = "I need the reference lyric.", }); TriggerHandlerChanged(c => c.UpdateReferenceLyric(referencedLyric)); @@ -84,14 +84,14 @@ public void TestSwitchToReferenceLyricConfig() { var referencedLyric = new Lyric { - Text = "Referenced lyric" + Text = "Referenced lyric", }; PrepareHitObject(() => new Lyric { Text = "Lyric", ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }); TriggerHandlerChanged(c => c.SwitchToReferenceLyricConfig()); @@ -108,14 +108,14 @@ public void TestSwitchToSyncLyricConfig() { var referencedLyric = new Lyric { - Text = "Referenced lyric" + Text = "Referenced lyric", }; PrepareHitObject(() => new Lyric { Text = "Lyric", ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }); TriggerHandlerChanged(c => c.SwitchToSyncLyricConfig()); @@ -132,7 +132,7 @@ public void TestAdjustLyricConfig() { var referencedLyric = new Lyric { - Text = "Referenced lyric" + Text = "Referenced lyric", }; PrepareHitObject(() => new Lyric @@ -162,7 +162,7 @@ public void TestWithReferenceLyric() { var lyric = new Lyric { - Text = "Referenced lyric" + Text = "Referenced lyric", }; PrepareHitObject(() => lyric, false); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRomajiTagsChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRomajiTagsChangeHandlerTest.cs index b8de42b62..0c0817c53 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRomajiTagsChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRomajiTagsChangeHandlerTest.cs @@ -22,7 +22,7 @@ public void TestAutoGenerateRomajiTags() PrepareHitObject(() => new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.AutoGenerate()); @@ -51,7 +51,7 @@ public void TestAutoGenerateRomajiTagsWithNonSupportedLyric() new Lyric { Text = string.Empty, - Language = new CultureInfo(17) + Language = new CultureInfo(17), }, }); @@ -66,7 +66,7 @@ public void TestAdd() PrepareHitObject(() => new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.Add(new RomajiTag @@ -90,7 +90,7 @@ public void TestAddRange() PrepareHitObject(() => new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.AddRange(new[] @@ -100,7 +100,7 @@ public void TestAddRange() StartIndex = 0, EndIndex = 0, Text = "kaze", - } + }, })); AssertSelectedHitObject(h => @@ -127,8 +127,8 @@ public void TestRemove() Language = new CultureInfo(17), RomajiTags = new List { - removedTag - } + removedTag, + }, }); TriggerHandlerChanged(c => c.Remove(removedTag)); @@ -161,8 +161,8 @@ public void TestRemoveRange() StartIndex = 1, EndIndex = 1, Text = "ra", - } - } + }, + }, }); TriggerHandlerChanged(c => c.RemoveRange(new[] { removedTag })); @@ -189,8 +189,8 @@ public void TestSetIndex() Language = new CultureInfo(17), RomajiTags = new List { - targetTag - } + targetTag, + }, }); TriggerHandlerChanged(c => c.SetIndex(targetTag, 1, 2)); @@ -218,8 +218,8 @@ public void TestShiftingIndex() Language = new CultureInfo(17), RomajiTags = new List { - targetTag - } + targetTag, + }, }); TriggerHandlerChanged(c => c.ShiftingIndex(new[] { targetTag }, 1)); @@ -247,8 +247,8 @@ public void TestSetText() Language = new CultureInfo(17), RomajiTags = new List { - targetTag - } + targetTag, + }, }); TriggerHandlerChanged(c => c.SetText(targetTag, "karaoke")); @@ -265,7 +265,7 @@ public void TestWithReferenceLyric() PrepareLyricWithSyncConfig(new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChangedWithChangeForbiddenException(c => c.Add(new RomajiTag diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRubyTagsChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRubyTagsChangeHandlerTest.cs index ca0c85159..1a8ae9e86 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRubyTagsChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricRubyTagsChangeHandlerTest.cs @@ -22,7 +22,7 @@ public void TestAutoGenerateRubyTags() PrepareHitObject(() => new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.AutoGenerate()); @@ -51,7 +51,7 @@ public void TestAutoGenerateRubyTagsWithNonSupportedLyric() new Lyric { Text = string.Empty, - Language = new CultureInfo(17) + Language = new CultureInfo(17), }, }); @@ -66,7 +66,7 @@ public void TestAdd() PrepareHitObject(() => new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.Add(new RubyTag @@ -90,7 +90,7 @@ public void TestAddRange() PrepareHitObject(() => new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.AddRange(new[] @@ -100,7 +100,7 @@ public void TestAddRange() StartIndex = 0, EndIndex = 0, Text = "かぜ", - } + }, })); AssertSelectedHitObject(h => @@ -127,8 +127,8 @@ public void TestRemove() Language = new CultureInfo(17), RubyTags = new List { - removedTag - } + removedTag, + }, }); TriggerHandlerChanged(c => c.Remove(removedTag)); @@ -161,8 +161,8 @@ public void TestRemoveRange() StartIndex = 1, EndIndex = 1, Text = "ら", - } - } + }, + }, }); TriggerHandlerChanged(c => c.RemoveRange(new[] { removedTag })); @@ -189,8 +189,8 @@ public void TestSetIndex() Language = new CultureInfo(17), RubyTags = new List { - targetTag - } + targetTag, + }, }); TriggerHandlerChanged(c => c.SetIndex(targetTag, 1, 2)); @@ -218,8 +218,8 @@ public void TestShiftingIndex() Language = new CultureInfo(17), RubyTags = new List { - targetTag - } + targetTag, + }, }); TriggerHandlerChanged(c => c.ShiftingIndex(new[] { targetTag }, 1)); @@ -247,8 +247,8 @@ public void TestSetText() Language = new CultureInfo(17), RubyTags = new List { - targetTag - } + targetTag, + }, }); TriggerHandlerChanged(c => c.SetText(targetTag, "からおけ")); @@ -265,7 +265,7 @@ public void TestWithReferenceLyric() PrepareLyricWithSyncConfig(new Lyric { Text = "風", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChangedWithChangeForbiddenException(c => c.Add(new RubyTag diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricSingerChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricSingerChangeHandlerTest.cs index 50f135e39..0a2d55e62 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricSingerChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricSingerChangeHandlerTest.cs @@ -81,7 +81,7 @@ public void TestRemove() { singer.ID, anotherSinger.ID, - } + }, }); TriggerHandlerChanged(c => c.Remove(singer)); @@ -122,7 +122,7 @@ public void TestRemoveRange() { singer.ID, anotherSinger.ID, - } + }, }); TriggerHandlerChanged(c => c.RemoveRange(new[] { singer })); @@ -156,7 +156,7 @@ public void TestClear() SingerIds = new[] { singer.ID, - } + }, }); TriggerHandlerChanged(c => c.Clear()); @@ -181,7 +181,7 @@ public void TestWithReferenceLyric(bool syncSinger) }); PrepareLyricWithSyncConfig(new Lyric(), new SyncLyricConfig { - SyncSingerProperty = syncSinger + SyncSingerProperty = syncSinger, }); if (syncSinger) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTextChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTextChangeHandlerTest.cs index e296cb62e..d13ab0d1b 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTextChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTextChangeHandlerTest.cs @@ -14,7 +14,7 @@ public void TestInsertText() { PrepareHitObject(() => new Lyric { - Text = "カラ" + Text = "カラ", }); TriggerHandlerChanged(c => c.InsertText(2, "オケ")); @@ -30,7 +30,7 @@ public void TestDeleteLyricText() { PrepareHitObject(() => new Lyric { - Text = "カラオケ" + Text = "カラオケ", }); TriggerHandlerChanged(c => c.DeleteLyricText(4)); @@ -46,7 +46,7 @@ public void TestDeleteAllLyricText() { PrepareHitObject(() => new Lyric { - Text = "カ" + Text = "カ", }); TriggerHandlerChanged(c => c.DeleteLyricText(1)); @@ -59,7 +59,7 @@ public void TestWithReferenceLyric() { PrepareLyricWithSyncConfig(new Lyric { - Text = "カラ" + Text = "カラ", }); TriggerHandlerChangedWithChangeForbiddenException(c => c.InsertText(2, "オケ")); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandlerTest.cs index d7578ca47..6851ad90f 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandlerTest.cs @@ -27,7 +27,7 @@ public void TestAutoGenerateTimeTags() PrepareHitObject(() => new Lyric { Text = "カラオケ", - Language = new CultureInfo(17) + Language = new CultureInfo(17), }); TriggerHandlerChanged(c => c.AutoGenerate()); @@ -54,7 +54,7 @@ public void TestAutoGenerateTimeTagsWithNonSupportedLyric() new Lyric { Text = string.Empty, - Language = new CultureInfo(17) + Language = new CultureInfo(17), }, }); @@ -72,8 +72,8 @@ public void TestSetTimeTagTime() Text = "カラオケ", TimeTags = new[] { - timeTag - } + timeTag, + }, }); TriggerHandlerChanged(c => c.SetTimeTagTime(timeTag, 2000)); @@ -95,8 +95,8 @@ public void TestShiftingTimeTagTime() TimeTags = new[] { timeTag, - timeTagWithTime - } + timeTagWithTime, + }, }); TriggerHandlerChanged(c => c.ShiftingTimeTagTime(new[] { timeTag, timeTagWithTime }, 2000)); @@ -127,8 +127,8 @@ public void TestClearTimeTagTime() Text = "カラオケ", TimeTags = new[] { - timeTag - } + timeTag, + }, }); TriggerHandlerChanged(c => c.ClearTimeTagTime(timeTag)); @@ -150,7 +150,7 @@ public void TestClearAllTimeTagTime() new TimeTag(new TextIndex()), // without time. new TimeTag(new TextIndex(), 1000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 3000), - } + }, }); TriggerHandlerChanged(c => c.ClearAllTimeTagTime()); @@ -206,7 +206,7 @@ public void TestRemove() TimeTags = new[] { removedTag, - } + }, }); TriggerHandlerChanged(c => c.Remove(removedTag)); @@ -228,7 +228,7 @@ public void TestRemoveRange() TimeTags = new[] { removedTag, - } + }, }); TriggerHandlerChanged(c => c.RemoveRange(new[] { removedTag })); @@ -270,7 +270,7 @@ public void TestRemoveByPosition() new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 4000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End)), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 5000), - } + }, }); TriggerHandlerChanged(c => c.RemoveByPosition(new TextIndex(3, TextIndex.IndexState.End))); @@ -296,7 +296,7 @@ public void TestRemoveByPositionCase2() { new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 5000), new TimeTag(new TextIndex(3, TextIndex.IndexState.End), 4000), - } + }, }); TriggerHandlerChanged(c => c.RemoveByPosition(new TextIndex(3, TextIndex.IndexState.End))); @@ -328,7 +328,7 @@ public void TestShifting(ShiftingDirection direction, ShiftingType type, int exp new TimeTag(new TextIndex(2), 4000), // target. new TimeTag(new TextIndex(2, TextIndex.IndexState.End)), new TimeTag(new TextIndex(3)), - } + }, }); TriggerHandlerChanged(c => @@ -357,7 +357,7 @@ public void TestShiftingToFirst(ShiftingDirection direction, ShiftingType type, { new TimeTag(new TextIndex(1)), // target. new TimeTag(new TextIndex(3)), - } + }, }); TriggerHandlerChanged(c => @@ -386,7 +386,7 @@ public void TestShiftingToLast(ShiftingDirection direction, ShiftingType type, i { new TimeTag(new TextIndex(0)), new TimeTag(new TextIndex(2)), // target. - } + }, }); TriggerHandlerChanged(c => @@ -416,7 +416,7 @@ public void TestShiftingWithNoDuplicatedTimeTag(ShiftingDirection direction, Shi new TimeTag(new TextIndex(0)), new TimeTag(new TextIndex(2), 4000), // target. new TimeTag(new TextIndex(3, TextIndex.IndexState.End)), - } + }, }); TriggerHandlerChanged(c => @@ -444,7 +444,7 @@ public void TestShiftingWithOneTimeTag(ShiftingDirection direction, ShiftingType TimeTags = new[] { new TimeTag(new TextIndex(2), 4000), // target. - } + }, }); TriggerHandlerChanged(c => @@ -475,7 +475,7 @@ public void TestShiftingWithSameTextTag(ShiftingDirection direction, ShiftingTyp new TimeTag(new TextIndex(2), 3000), new TimeTag(new TextIndex(2), 4000), // target. new TimeTag(new TextIndex(2), 5000), - } + }, }); TriggerHandlerChanged(c => @@ -505,7 +505,7 @@ public void TestShiftingException(TextIndex.IndexState state, ShiftingDirection TimeTags = new[] { new TimeTag(new TextIndex(0, state), 5000), // target. - } + }, }); // will have exception because the time-tag cannot move right. @@ -529,11 +529,11 @@ public void TestWithReferenceLyric(bool syncTimeTag) Text = "カラオケ", TimeTags = new[] { - new TimeTag(new TextIndex(), 1000) - } + new TimeTag(new TextIndex(), 1000), + }, }, new SyncLyricConfig { - SyncTimeTagProperty = syncTimeTag + SyncTimeTagProperty = syncTimeTag, }); // should add the time-tag by hand because it does not sync from thr referenced lyric. @@ -541,7 +541,7 @@ public void TestWithReferenceLyric(bool syncTimeTag) { lyric.TimeTags = new[] { - new TimeTag(new TextIndex(), 2000) + new TimeTag(new TextIndex(), 2000), }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTranslateChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTranslateChangeHandlerTest.cs index 7e684cb2a..44d8529e1 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTranslateChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricTranslateChangeHandlerTest.cs @@ -36,8 +36,8 @@ public void TestUpdateTranslateWithExistLanguage() Text = "カラオケ", Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } - } + { new CultureInfo(17), "からおけ" }, + }, }); TriggerHandlerChanged(c => c.UpdateTranslate(new CultureInfo(17), "karaoke")); @@ -57,8 +57,8 @@ public void TestUpdateTranslateWithEmptyText() Text = "カラオケ", Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } - } + { new CultureInfo(17), "からおけ" }, + }, }); TriggerHandlerChanged(c => c.UpdateTranslate(new CultureInfo(17), string.Empty)); @@ -77,8 +77,8 @@ public void TestUpdateTranslateWithNullText() Text = "カラオケ", Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } - } + { new CultureInfo(17), "からおけ" }, + }, }); TriggerHandlerChanged(c => c.UpdateTranslate(new CultureInfo(17), string.Empty)); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricsChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricsChangeHandlerTest.cs index a6806c817..699482db5 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricsChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Lyrics/LyricsChangeHandlerTest.cs @@ -15,7 +15,7 @@ public void TestSplit() { PrepareHitObject(() => new Lyric { - Text = "カラオケ" + Text = "カラオケ", }); TriggerHandlerChanged(c => c.Split(2)); @@ -170,7 +170,7 @@ public void TestAddBelowToSelection() TriggerHandlerChanged(c => c.AddBelowToSelection(new Lyric { - Text = "New lyric" + Text = "New lyric", })); AssertHitObjects(hitObjects => @@ -202,8 +202,8 @@ public void TestAddRangeBelowToSelection() { new Lyric { - Text = "New lyric" - } + Text = "New lyric", + }, })); AssertHitObjects(hitObjects => diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotePropertyChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotePropertyChangeHandlerTest.cs index ac4b4fe3b..509a3a8c3 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotePropertyChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotePropertyChangeHandlerTest.cs @@ -74,7 +74,7 @@ public void TestChangeDisplayStateToNonVisible() { ReferenceLyricId = referenced_lyric_id, Display = true, - Tone = new Tone(3) + Tone = new Tone(3), }); TriggerHandlerChanged(c => c.ChangeDisplayState(false)); @@ -96,8 +96,8 @@ public void TestWithReferenceLyric() ReferenceLyric = new Lyric { ReferenceLyric = new Lyric(), - ReferenceLyricConfig = new ReferenceLyricConfig() - } + ReferenceLyricConfig = new ReferenceLyricConfig(), + }, }); TriggerHandlerChangedWithChangeForbiddenException(c => c.ChangeText("からおけ")); @@ -110,7 +110,7 @@ public void TestOffsetTone() { ReferenceLyricId = referenced_lyric_id, Display = true, - Tone = new Tone(3) + Tone = new Tone(3), }); TriggerHandlerChanged(c => c.OffsetTone(new Tone(-3))); @@ -129,7 +129,7 @@ public void TestOffsetToneWithZeroValue() { ReferenceLyricId = referenced_lyric_id, Display = true, - Tone = new Tone(3) + Tone = new Tone(3), }); // offset value should not be zero. @@ -144,7 +144,7 @@ protected override void SetUpEditorBeatmap(Action action) editorBeatmap.Add(new Lyric { - Text = "Referenced lyric" + Text = "Referenced lyric", }.ChangeId(referenced_lyric_id)); }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotesChangeHandlerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotesChangeHandlerTest.cs index eb15e55f9..d769c58b6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotesChangeHandlerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/ChangeHandlers/Notes/NotesChangeHandlerTest.cs @@ -20,7 +20,7 @@ public void TestSplit() { Text = "カラオケ", ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }); TriggerHandlerChanged(c => c.Split()); @@ -60,7 +60,7 @@ public void TestCombine() RubyText = "から", ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }, new Note { @@ -68,8 +68,8 @@ public void TestCombine() RubyText = "おけ", ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 - } + ReferenceTimeTagIndex = 0, + }, }); TriggerHandlerChanged(c => c.Combine()); @@ -109,7 +109,7 @@ public void TestClear() RubyText = "おけ", ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - } + }, }, false); TriggerHandlerChanged(c => c.Clear()); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapAvailableTranslatesTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapAvailableTranslatesTest.cs index e2e066443..3f1126d51 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapAvailableTranslatesTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapAvailableTranslatesTest.cs @@ -119,7 +119,7 @@ private static IBeatmap createTestingBeatmap(List? translateLanguag Ruleset = new KaraokeRuleset().RulesetInfo, }, AvailableTranslates = translateLanguage ?? new List(), - HitObjects = lyrics?.OfType().ToList() ?? new List() + HitObjects = lyrics?.OfType().ToList() ?? new List(), }; return new EditorBeatmap(karaokeBeatmap); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapClassicStageInfoTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapClassicStageInfoTest.cs index f7824bac0..e0367f9a0 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapClassicStageInfoTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapClassicStageInfoTest.cs @@ -233,9 +233,9 @@ private static IBeatmap createTestingBeatmap(IEnumerable? lyrics, Action< }, StageInfos = new List { - stageInfo + stageInfo, }, - HitObjects = lyrics?.OfType().ToList() ?? new List() + HitObjects = lyrics?.OfType().ToList() ?? new List(), }; return new EditorBeatmap(karaokeBeatmap); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapNoteInfoTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapNoteInfoTest.cs index fe8357801..f7166731d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapNoteInfoTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapNoteInfoTest.cs @@ -41,8 +41,8 @@ public void TestCheckNoteToneTooLow() { new Note { - Tone = new Tone(-MIN_COLUMNS) - } + Tone = new Tone(-MIN_COLUMNS), + }, }); AssertNotOk(getContext(beatmap)); } @@ -54,8 +54,8 @@ public void TestCheckNoteToneTooHigh() { new Note { - Tone = new Tone(MIN_COLUMNS) - } + Tone = new Tone(MIN_COLUMNS), + }, }); AssertNotOk(getContext(beatmap)); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapPageInfoTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapPageInfoTest.cs index a7d3a6fde..e93e29359 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapPageInfoTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapPageInfoTest.cs @@ -72,8 +72,8 @@ public void TestCheckPageIntervalTooShort() { TimeTags = new List { - new(new TextIndex(), 500) - } + new(new TextIndex(), 500), + }, }, }; @@ -103,8 +103,8 @@ public void TestCheckPageIntervalTooLong() { TimeTags = new List { - new(new TextIndex(), 1000) - } + new(new TextIndex(), 1000), + }, }, }; @@ -155,16 +155,16 @@ public void TestCheckLyricNotWrapIntoTime() { TimeTags = new List { - new(new TextIndex(), MIN_INTERVAL - 1) - } + new(new TextIndex(), MIN_INTERVAL - 1), + }, }, // another lyric's time is adjustable. new() { TimeTags = new List { - timeTag - } + timeTag, + }, }, }; @@ -191,7 +191,7 @@ private static IBeatmap createTestingBeatmap(IEnumerable? pages, IEnumerab { Ruleset = new KaraokeRuleset().RulesetInfo, }, - HitObjects = lyrics?.OfType().ToList() ?? new List() + HitObjects = lyrics?.OfType().ToList() ?? new List(), }; karaokeBeatmap.PageInfo.Pages.AddRange(pages ?? new List()); return new EditorBeatmap(karaokeBeatmap); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapStageInfoTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapStageInfoTest.cs index 65859d6d3..30e49175e 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapStageInfoTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckBeatmapStageInfoTest.cs @@ -100,9 +100,9 @@ private static IBeatmap createTestingBeatmap(IEnumerable? lyrics, Action< }, StageInfos = new List { - stageInfo + stageInfo, }, - HitObjects = lyrics?.OfType().ToList() ?? new List() + HitObjects = lyrics?.OfType().ToList() ?? new List(), }; return new EditorBeatmap(karaokeBeatmap); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRomajiTagTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRomajiTagTest.cs index f2b5a457e..d07b0189e 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRomajiTagTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRomajiTagTest.cs @@ -19,7 +19,7 @@ public void TestCheck(string text, string[] romajies) var lyric = new Lyric { Text = text, - RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies), }; AssertOk(lyric); @@ -32,7 +32,7 @@ public void TestCheckRomajiOutOfRange(string text, string[] romajies) var lyric = new Lyric { Text = text, - RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies), }; AssertNotOk(lyric); @@ -45,7 +45,7 @@ public void TestCheckRomajiOverlapping(string text, string[] romajies) var lyric = new Lyric { Text = text, - RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies), }; AssertNotOk(lyric); @@ -59,7 +59,7 @@ public void TestCheckRomajiEmptyText(string text, string[] romajies) var lyric = new Lyric { Text = text, - RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajies), }; AssertNotOk(lyric); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRubyTagTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRubyTagTest.cs index 8c6e4c7a1..0edddb867 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRubyTagTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricRubyTagTest.cs @@ -19,7 +19,7 @@ public void TestCheck(string text, string[] rubies) var lyric = new Lyric { Text = text, - RubyTags = TestCaseTagHelper.ParseRubyTags(rubies) + RubyTags = TestCaseTagHelper.ParseRubyTags(rubies), }; AssertOk(lyric); @@ -32,7 +32,7 @@ public void TestCheckRubyOutOfRange(string text, string[] rubies) var lyric = new Lyric { Text = text, - RubyTags = TestCaseTagHelper.ParseRubyTags(rubies) + RubyTags = TestCaseTagHelper.ParseRubyTags(rubies), }; AssertNotOk(lyric); @@ -45,7 +45,7 @@ public void TestCheckRubyOverlapping(string text, string[] rubies) var lyric = new Lyric { Text = text, - RubyTags = TestCaseTagHelper.ParseRubyTags(rubies) + RubyTags = TestCaseTagHelper.ParseRubyTags(rubies), }; AssertNotOk(lyric); @@ -59,7 +59,7 @@ public void TestCheckRubyEmptyText(string text, string[] rubies) var lyric = new Lyric { Text = text, - RubyTags = TestCaseTagHelper.ParseRubyTags(rubies) + RubyTags = TestCaseTagHelper.ParseRubyTags(rubies), }; AssertNotOk(lyric); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricSingerTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricSingerTest.cs index b37c05d69..57775de22 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricSingerTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricSingerTest.cs @@ -20,7 +20,7 @@ public void TestCheck(int[] singers) { var lyric = new Lyric { - SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(singers) + SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(singers), }; AssertOk(lyric); @@ -31,7 +31,7 @@ public void TestCheckNoSinger(int[] singers) { var lyric = new Lyric { - SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(singers) + SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(singers), }; AssertNotOk(lyric); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTextTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTextTest.cs index 17b3f03f6..be2aca43f 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTextTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTextTest.cs @@ -19,7 +19,7 @@ public void TestCheck(string text) { var lyric = new Lyric { - Text = text + Text = text, }; AssertOk(lyric); @@ -33,7 +33,7 @@ public void TestCheckNoText(string text) { var lyric = new Lyric { - Text = text + Text = text, }; AssertNotOk(lyric); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTimeTagTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTimeTagTest.cs index 2784dbd0c..af8298bf3 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTimeTagTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTimeTagTest.cs @@ -20,7 +20,7 @@ public void TestCheck(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertOk(lyric); @@ -32,7 +32,7 @@ public void TestCheckMissingNoTimeTag(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertNotOk(lyric); @@ -44,7 +44,7 @@ public void TestCheckMissingFirstTimeTag(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertNotOk(lyric); @@ -56,7 +56,7 @@ public void TestCheckMissingLastTimeTag(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertNotOk(lyric); @@ -69,7 +69,7 @@ public void TestCheckOutOfRange(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertNotOk(lyric); @@ -81,7 +81,7 @@ public void TestCheckOverlapping(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertNotOk(lyric); @@ -95,7 +95,7 @@ public void TestCheckEmptyTime(string text, string[] timeTags) var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; AssertNotOk(lyric); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTranslateTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTranslateTest.cs index ce7f44f9a..9f86278c7 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTranslateTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckLyricTranslateTest.cs @@ -22,8 +22,8 @@ public void TestCheck(string text) { Translates = new Dictionary { - { new CultureInfo("Ja-jp"), text } - } + { new CultureInfo("Ja-jp"), text }, + }, }; AssertOk(lyric); @@ -39,8 +39,8 @@ public void TestCheckTranslationNoText(string text) { Translates = new Dictionary { - { new CultureInfo("Ja-jp"), text } - } + { new CultureInfo("Ja-jp"), text }, + }, }; AssertNotOk(lyric); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteReferenceLyricTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteReferenceLyricTest.cs index babcc8c9e..4621bdede 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteReferenceLyricTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteReferenceLyricTest.cs @@ -24,13 +24,13 @@ public void TestCheck(int referenceTimeTagIndex, string[] timeTags) var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; AssertOk(new HitObject[] { referencedLyric, note }); @@ -42,7 +42,7 @@ public void TestCheckNullReferenceLyric() var note = new Note { ReferenceLyricId = null, - ReferenceLyric = null // reference should not be null. + ReferenceLyric = null, // reference should not be null. }; AssertNotOk(note); @@ -54,7 +54,7 @@ public void TestCheckInvalidReferenceLyric() var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { "[0,start]:1000", "[3,end]:5000" }) + TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { "[0,start]:1000", "[3,end]:5000" }), }; var note = new Note { @@ -76,7 +76,7 @@ public void TestCheckMissingReferenceTimeTag(int referenceTimeTagIndex, string[] var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { @@ -95,13 +95,13 @@ public void TestCheckMissingStartReferenceTimeTag(int referenceTimeTagIndex, str var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; AssertNotOk(new HitObject[] { referencedLyric, note }); @@ -115,13 +115,13 @@ public void TestCheckStartReferenceTimeTagMissingTime(int referenceTimeTagIndex, var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; AssertNotOk(new HitObject[] { referencedLyric, note }); @@ -134,13 +134,13 @@ public void TestCheckMissingEndReferenceTimeTag(int referenceTimeTagIndex, strin var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; AssertNotOk(new HitObject[] { referencedLyric, note }); @@ -154,13 +154,13 @@ public void TestCheckEndReferenceTimeTagMissingTime(int referenceTimeTagIndex, s var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; AssertNotOk(new HitObject[] { referencedLyric, note }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTextTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTextTest.cs index aaf712653..b8a9bc342 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTextTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTextTest.cs @@ -32,7 +32,7 @@ public void TestCheckNoText(string text) { var note = new Note { - Text = text + Text = text, }; AssertNotOk(note); @@ -46,7 +46,7 @@ public void TestCheckNoRubyText(string? rubyText) var note = new Note { Text = "karaoke", - RubyText = rubyText + RubyText = rubyText, }; AssertNotOk(note); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTimeTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTimeTest.cs index 5e824a9ee..9e90824b9 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTimeTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Checks/CheckNoteTimeTest.cs @@ -20,13 +20,13 @@ public void TestCheck(int referenceTimeTagIndex, string[] timeTags) var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; AssertOk(new HitObject[] { referencedLyric, note }); @@ -53,13 +53,13 @@ public void TestCheckMissingStartOrEndTimeTag(int referenceTimeTagIndex, string[ var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = referenceTimeTagIndex + ReferenceTimeTagIndex = referenceTimeTagIndex, }; // should not have error because this check will be handled in other check. @@ -76,13 +76,13 @@ public void TestCheckInvalidReferenceTimeTagTime(string startTimeTag, string end var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { startTimeTag, endTimeTag }) + TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { startTimeTag, endTimeTag }), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }; AssertNotOk(new HitObject[] { referencedLyric, note }); @@ -98,13 +98,13 @@ public void TestCheckDurationTooShort(string startTimeTag, string endTimeTag) var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { $"{startTimeTag}0", $"{endTimeTag}{MIN_DURATION - 1}" }) + TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { $"{startTimeTag}0", $"{endTimeTag}{MIN_DURATION - 1}" }), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }; AssertNotOk(new HitObject[] { referencedLyric, note }); @@ -120,13 +120,13 @@ public void TestCheckDurationTooLong(string startTimeTag, string endTimeTag) var referencedLyric = new Lyric { Text = "カラオケ", - TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { $"{startTimeTag}0", $"{endTimeTag}{MAX_DURATION + 1}" }) + TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { $"{startTimeTag}0", $"{endTimeTag}{MAX_DURATION + 1}" }), }; var note = new Note { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }; AssertNotOk(new HitObject[] { referencedLyric, note }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Pages/PageGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Pages/PageGeneratorTest.cs index 9bad86521..90b926b7c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Pages/PageGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Pages/PageGeneratorTest.cs @@ -44,13 +44,13 @@ public void TestGenerateWithSingleLyric(string lyric, double[] expectedTimes) { HitObjects = new List { - TestCaseTagHelper.ParseLyric(lyric) - } + TestCaseTagHelper.ParseLyric(lyric), + }, }; var expectedPages = expectedTimes.Select(x => new Page { - Time = x + Time = x, }).ToArray(); CheckGenerateResult(beatmap, expectedPages, config); @@ -69,13 +69,13 @@ public void TestGenerateWithTwoLyrics(string firstLyric, string secondLyric, dou HitObjects = new List { TestCaseTagHelper.ParseLyric(firstLyric), - TestCaseTagHelper.ParseLyric(secondLyric) - } + TestCaseTagHelper.ParseLyric(secondLyric), + }, }; var expectedPages = expectedTimes.Select(x => new Page { - Time = x + Time = x, }).ToArray(); CheckGenerateResult(beatmap, expectedPages, config); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorTest.cs index 5a4009b36..777630074 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorTest.cs @@ -26,7 +26,7 @@ public void TestCanGenerate() TestCaseTagHelper.ParseLyric("[4000,6000]:lyric2"), TestCaseTagHelper.ParseLyric("[7000,9000]:lyric3"), TestCaseTagHelper.ParseLyric("[10000,12000]:lyric4"), - } + }, }; CheckCanGenerate(beatmap, true, config); @@ -57,7 +57,7 @@ public void TestGenerate() lyric2, lyric3, lyric4, - } + }, }; var expected = new ClassicLyricLayoutCategory(); @@ -90,7 +90,7 @@ public void TestGenerateWithThreeLyrics() lyric3, lyric4, lyric5, - } + }, }; var expected = new ClassicLyricLayoutCategory(); @@ -123,7 +123,7 @@ public void TestGenerateWithNotMapping() lyric2, lyric3, lyric4, - } + }, }; var expected = new ClassicLyricLayoutCategory(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricTimingInfoGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricTimingInfoGeneratorTest.cs index 028df025c..056b60131 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricTimingInfoGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicLyricTimingInfoGeneratorTest.cs @@ -27,7 +27,7 @@ public void TestCanGenerate() TestCaseTagHelper.ParseLyric("[4000,6000]:lyric2"), TestCaseTagHelper.ParseLyric("[7000,9000]:lyric3"), TestCaseTagHelper.ParseLyric("[10000,12000]:lyric4"), - } + }, }; CheckCanGenerate(beatmap, true, config); @@ -58,7 +58,7 @@ public void TestGenerate() lyric2, lyric3, lyric4, - } + }, }; var expected = new ClassicLyricTimingInfo(); @@ -100,7 +100,7 @@ public void TestGenerateWithThreeLyrics() lyric3, lyric4, lyric5, - } + }, }; var expected = new ClassicLyricTimingInfo(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGeneratorTest.cs index e885538ce..a0185c443 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGeneratorTest.cs @@ -25,7 +25,7 @@ public void TestCanGenerate() TestCaseTagHelper.ParseLyric("[4000,6000]:lyric2"), TestCaseTagHelper.ParseLyric("[7000,9000]:lyric3"), TestCaseTagHelper.ParseLyric("[10000,12000]:lyric4"), - } + }, }; CheckCanGenerate(beatmap, true, config); @@ -56,7 +56,7 @@ public void TestGenerate() lyric2, lyric3, lyric4, - } + }, }; // Note: we did not care about the generator result here. diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Preview/PreviewStageInfoGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Preview/PreviewStageInfoGeneratorTest.cs index 37ce789a2..c37120889 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Preview/PreviewStageInfoGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/Preview/PreviewStageInfoGeneratorTest.cs @@ -25,7 +25,7 @@ public void TestCanGenerate() TestCaseTagHelper.ParseLyric("[4000,6000]:lyric2"), TestCaseTagHelper.ParseLyric("[7000,9000]:lyric3"), TestCaseTagHelper.ParseLyric("[10000,12000]:lyric4"), - } + }, }; CheckCanGenerate(beatmap, true, config); @@ -58,7 +58,7 @@ public void TestGenerate() lyric2, lyric3, lyric4, - } + }, }; // Note: we did not care about the generator result here. diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/StageInfoGeneratorSelectorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/StageInfoGeneratorSelectorTest.cs index eeba86a9d..1d3d4a281 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/StageInfoGeneratorSelectorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Beatmaps/Stages/StageInfoGeneratorSelectorTest.cs @@ -54,7 +54,7 @@ private KaraokeBeatmap createBeatmap() TestCaseTagHelper.ParseLyric("[4000,6000]:lyric2"), TestCaseTagHelper.ParseLyric("[7000,9000]:lyric3"), TestCaseTagHelper.ParseLyric("[10000,12000]:lyric4"), - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/Notes/NoteGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/Notes/NoteGeneratorTest.cs index f02f0ce49..da5fddaf4 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/Notes/NoteGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/Notes/NoteGeneratorTest.cs @@ -56,7 +56,7 @@ public void TestGenerateWithRuby(string[] rubyTags, string[] expectedNoteTexts) { Text = "カラオケ", TimeTags = TestCaseTagHelper.ParseTimeTags(new[] { "[0,start]:1000", "[1,start]:2000", "[2,start]:3000", "[3,start]:4000", "[3,end]:5000" }), - RubyTags = TestCaseTagHelper.ParseRubyTags(rubyTags) + RubyTags = TestCaseTagHelper.ParseRubyTags(rubyTags), }; var expectedNotes = expectedNoteTexts.Select(x => @@ -66,13 +66,13 @@ public void TestGenerateWithRuby(string[] rubyTags, string[] expectedNoteTexts) return new Note { Text = x.Split(',')[0], - RubyText = x.Split(',')[1] + RubyText = x.Split(',')[1], }; } return new Note { - Text = x + Text = x, }; }).ToArray(); CheckGenerateResult(lyric, expectedNotes, config); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/ReferenceLyric/ReferenceLyricDetectorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/ReferenceLyric/ReferenceLyricDetectorTest.cs index d7c78db6e..9ce408c9a 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/ReferenceLyric/ReferenceLyricDetectorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/ReferenceLyric/ReferenceLyricDetectorTest.cs @@ -19,7 +19,7 @@ public void TestCanDetect(string lyricText, string detectedLyricText, bool canDe { var detectedLyric = new Lyric { - Text = detectedLyricText + Text = detectedLyricText, }; var lyrics = new[] @@ -28,7 +28,7 @@ public void TestCanDetect(string lyricText, string detectedLyricText, bool canDe { Text = lyricText, }, - detectedLyric + detectedLyric, }; var config = GeneratorEmptyConfig(); CheckCanDetect(lyrics, detectedLyric, canDetect, config); @@ -49,7 +49,7 @@ public void TestCanDetectWithIgnorePrefixAndPostfixSymbol(string lyricText, stri { var detectedLyric = new Lyric { - Text = detectedLyricText + Text = detectedLyricText, }; var lyrics = new[] @@ -58,7 +58,7 @@ public void TestCanDetectWithIgnorePrefixAndPostfixSymbol(string lyricText, stri { Text = lyricText, }, - detectedLyric + detectedLyric, }; var config = GeneratorEmptyConfig(x => x.IgnorePrefixAndPostfixSymbol.Value = true); CheckCanDetect(lyrics, detectedLyric, canDetect, config); @@ -75,7 +75,7 @@ public void TestDetect(string firstLyricText, string secondLyricText, bool refer var secondLyric = new Lyric { Text = secondLyricText, - Order = 2 + Order = 2, }; var config = GeneratorEmptyConfig(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/TimeTags/Ja/JaTimeTagGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/TimeTags/Ja/JaTimeTagGeneratorTest.cs index c1681899d..454d5d85f 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/TimeTags/Ja/JaTimeTagGeneratorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Generator/Lyrics/TimeTags/Ja/JaTimeTagGeneratorTest.cs @@ -134,15 +134,15 @@ public void TestGenerateWithRubyLyric() { StartIndex = 0, EndIndex = 1, - Text = "あした" + Text = "あした", }, new RubyTag { StartIndex = 7, EndIndex = 7, - Text = "あそ" - } - } + Text = "あそ", + }, + }, }; string[] expectedTimeTags = @@ -159,7 +159,7 @@ public void TestGenerateWithRubyLyric() "[9,start]:", "[10,start]:", "[12,start]:", - "[13,start]:" + "[13,start]:", }; CheckGenerateResult(lyric, expectedTimeTags, config); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLayoutToolTip.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLayoutToolTip.cs index b4018ff0e..e3f04358d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLayoutToolTip.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneLayoutToolTip.cs @@ -32,8 +32,8 @@ public void SetUp() => Schedule(() => Child = toolTip = new LayoutToolTip { Anchor = Anchor.Centre, - Origin = Anchor.Centre - } + Origin = Anchor.Centre, + }, }; toolTip.Show(); }); @@ -60,7 +60,7 @@ private void setTooltip(string testName, Action callBack) { var singer = new Lyric { - Text = "karaoke!" + Text = "karaoke!", }; callBack(singer); toolTip.SetContent(singer); @@ -81,7 +81,7 @@ public class TestingSkin : KaraokeSkin Name = "karaoke! (default skin)", Creator = "team karaoke!", Protected = true, - InstantiationInfo = typeof(TestingSkin).GetInvariantInstantiationInfo() + InstantiationInfo = typeof(TestingSkin).GetInvariantInstantiationInfo(), }; public TestingSkin(IStorageResourceProvider? resources) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneTimeTagTooltip.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneTimeTagTooltip.cs index 06f3fef38..a4e27f7bd 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneTimeTagTooltip.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneTimeTagTooltip.cs @@ -21,7 +21,7 @@ public void SetUp() => Schedule(() => Child = toolTip = new TimeTagTooltip { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; toolTip.Show(); }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/HitObjectWritableUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/HitObjectWritableUtilsTest.cs index 6bd15e4d9..5a1702ff2 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/HitObjectWritableUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/HitObjectWritableUtilsTest.cs @@ -27,7 +27,7 @@ public void TestIsRemoveLyricLocked() { test(new Lyric { - Lock = lockState + Lock = lockState, }); } @@ -64,7 +64,7 @@ public void TestIsWriteLyricPropertyLocked() { test(new Lyric { - Lock = lockState + Lock = lockState, }); } @@ -104,7 +104,7 @@ public void TestIsCreateOrRemoveNoteLocked() { test(new Lyric { - Lock = lockState + Lock = lockState, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/LockStateUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/LockStateUtilsTest.cs index 028a0213e..a9f4cd084 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/LockStateUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/LockStateUtilsTest.cs @@ -18,7 +18,7 @@ public void TestFindUnlockObjects(LockState[] lockStates, int? expected) var lyrics = lockStates.Select(x => new Lyric { Text = "karaoke", - Lock = x + Lock = x, }); int actual = LockStateUtils.FindUnlockObjects(lyrics).Length; diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/ValueChangedEventUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/ValueChangedEventUtilsTest.cs index 0d4196559..5f60aae38 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/ValueChangedEventUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Editor/Utils/ValueChangedEventUtilsTest.cs @@ -18,7 +18,7 @@ public void TestLyricChangedWithSameLyric() { var lyric1 = new Lyric { - Text = "lyric 1" + Text = "lyric 1", }; var oldCaret = new ClickingCaretPosition(lyric1); @@ -32,12 +32,12 @@ public void TestLyricChangedWithDifferentLyric() { var lyric1 = new Lyric { - Text = "lyric 1" + Text = "lyric 1", }; var lyric2 = new Lyric { - Text = "lyric 2" + Text = "lyric 2", }; var oldCaret = new ClickingCaretPosition(lyric1); @@ -51,7 +51,7 @@ public void TestLyricChangedWithSameLyricButDifferentCaretPosition() { var lyric1 = new Lyric { - Text = "lyric 1" + Text = "lyric 1", }; var oldCaret = new ClickingCaretPosition(lyric1); @@ -66,7 +66,7 @@ public void TestEditModeChangedWithDefaultValue() var oldMode = default(ModeWithSubMode); var newMode = new ModeWithSubMode { - Mode = LyricEditorMode.View + Mode = LyricEditorMode.View, }; Assert.IsTrue(ValueChangedEventUtils.EditModeChanged(new ValueChangedEvent(oldMode, newMode))); @@ -77,11 +77,11 @@ public void TestEditModeChanged() { var oldMode = new ModeWithSubMode { - Mode = LyricEditorMode.View + Mode = LyricEditorMode.View, }; var newMode = new ModeWithSubMode { - Mode = LyricEditorMode.View + Mode = LyricEditorMode.View, }; Assert.IsFalse(ValueChangedEventUtils.EditModeChanged(new ValueChangedEvent(oldMode, newMode))); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneFontSelector.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneFontSelector.cs index 5b61ae8bd..9f5394299 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneFontSelector.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneFontSelector.cs @@ -39,7 +39,7 @@ public void TestAllFiles() var language = new BindableFontUsage { MinFontSize = 32, - MaxFontSize = 72 + MaxFontSize = 72, }; Child = new FontSelector { @@ -47,7 +47,7 @@ public void TestAllFiles() Size = new Vector2(0.6f, 0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = language + Current = language, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLanguageSelector.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLanguageSelector.cs index c27cf7f9b..9a1af6092 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLanguageSelector.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLanguageSelector.cs @@ -25,7 +25,7 @@ public void TestAllLanguages() Size = new Vector2(0.5f, 0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = language + Current = language, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLyricTooltip.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLyricTooltip.cs index baa0483ac..4de174560 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLyricTooltip.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneLyricTooltip.cs @@ -22,7 +22,7 @@ public void SetUp() => Schedule(() => Child = toolTip = new LyricTooltip { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; toolTip.Show(); }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMessageContainer.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMessageContainer.cs index 933aa9c7a..a11df8533 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMessageContainer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMessageContainer.cs @@ -21,7 +21,7 @@ public void SetUp() => Schedule(() => { Width = 300, Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs index ac1192529..6fd9f9e90 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs @@ -23,8 +23,8 @@ public void SetUp() => Schedule(() => { Anchor = Anchor.Centre, Origin = Anchor.Centre, - DeviceName = "Super large microphone device name : )" - } + DeviceName = "Super large microphone device name : )", + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneRightTriangle.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneRightTriangle.cs index 8c88fbc74..5bf2733cb 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneRightTriangle.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneRightTriangle.cs @@ -36,9 +36,9 @@ private void load(OsuColour colours) rightTriangle = new RightTriangle { Size = new Vector2(100), - Colour = colours.Yellow - } - } + Colour = colours.Yellow, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneSingerToolTip.cs b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneSingerToolTip.cs index 76513febd..3eb8ef088 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneSingerToolTip.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneSingerToolTip.cs @@ -21,7 +21,7 @@ public void SetUp() => Schedule(() => Child = toolTip = new SingerToolTip { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; toolTip.Show(); }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseNoteHelper.cs b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseNoteHelper.cs index 8cf3dd68e..1970d74b4 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseNoteHelper.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseNoteHelper.cs @@ -18,8 +18,8 @@ public static Lyric CreateLyricForNote(int id, string text, double startTime, do TimeTags = new List { new(new TextIndex(0), startTime), - new(new TextIndex(text.Length - 1, TextIndex.IndexState.End), startTime + duration) - } + new(new TextIndex(text.Length - 1, TextIndex.IndexState.End), startTime + duration), + }, }.ChangeId(id); } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs index fea6ee218..5f67d8080 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs @@ -48,7 +48,7 @@ public static RubyTag ParseRubyTag(string? str) { StartIndex = startIndex, EndIndex = endIndex, - Text = text + Text = text, }; } @@ -82,7 +82,7 @@ public static RomajiTag ParseRomajiTag(string? str) { StartIndex = startIndex, EndIndex = endIndex, - Text = text + Text = text, }; } @@ -166,8 +166,8 @@ public static Lyric ParseLyric(string str, int? id = null) TimeTags = new[] { new TimeTag(new TextIndex(0), startTime), - new TimeTag(new TextIndex(text.Length - 1, TextIndex.IndexState.End), endTime) - } + new TimeTag(new TextIndex(text.Length - 1, TextIndex.IndexState.End), endTime), + }, }.ChangeId(id != null ? TestCaseElementIdHelper.CreateElementIdByNumber(id.Value) : ElementId.Empty); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ElementIdConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ElementIdConverterTest.cs index 80c81b37a..faffd9868 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ElementIdConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ElementIdConverterTest.cs @@ -35,6 +35,6 @@ public void TestDeserialize(string json, string? id) { null => null, "" => ElementId.Empty, - _ => new ElementId(str) + _ => new ElementId(str), }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/LyricConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/LyricConverterTest.cs index 2a7fcc932..000d2d363 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/LyricConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/LyricConverterTest.cs @@ -65,7 +65,7 @@ public void TestLyricConverterWithSyncConfig() { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceLyricConfig = new SyncLyricConfig() + ReferenceLyricConfig = new SyncLyricConfig(), }; string expected = @@ -82,7 +82,7 @@ public void TestLyricConverterWithReferenceConfig() { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceLyricConfig = new ReferenceLyricConfig() + ReferenceLyricConfig = new ReferenceLyricConfig(), }; string expected = diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ReferenceLyricPropertyConfigConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ReferenceLyricPropertyConfigConverterTest.cs index 14a7210a3..701535814 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ReferenceLyricPropertyConfigConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ReferenceLyricPropertyConfigConverterTest.cs @@ -15,7 +15,7 @@ public void TestReferenceLyricConfigSerializer() { var config = new ReferenceLyricConfig { - OffsetTime = 100 + OffsetTime = 100, }; const string expected = "{\"$type\":\"ReferenceLyricConfig\",\"offset_time\":100.0}"; @@ -30,7 +30,7 @@ public void TestReferenceLyricConfigDeserializer() var expected = new ReferenceLyricConfig { - OffsetTime = 100 + OffsetTime = 100, }; var actual = (ReferenceLyricConfig)JsonConvert.DeserializeObject(json, CreateSettings())!; Assert.AreEqual(expected.OffsetTime, actual.OffsetTime); @@ -43,7 +43,7 @@ public void TestSyncLyricConfigSerializer() { OffsetTime = 100, SyncSingerProperty = true, - SyncTimeTagProperty = false + SyncTimeTagProperty = false, }; const string expected = "{\"$type\":\"SyncLyricConfig\",\"offset_time\":100.0,\"sync_time_tag_property\":false}"; @@ -60,7 +60,7 @@ public void TestSyncLyricConfigDeserializer() { OffsetTime = 100, SyncSingerProperty = true, - SyncTimeTagProperty = false + SyncTimeTagProperty = false, }; var actual = (SyncLyricConfig)JsonConvert.DeserializeObject(json, CreateSettings())!; Assert.AreEqual(expected.OffsetTime, actual.OffsetTime); diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagConverterTest.cs index 41216e444..248237f70 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagConverterTest.cs @@ -24,7 +24,7 @@ public void TestSerialize(int startIndex, int endIndex, string text, string json { StartIndex = startIndex, EndIndex = endIndex, - Text = text + Text = text, }; string expected = $"\"{json}\""; @@ -49,7 +49,7 @@ public void TestDeserialize(string json, int startIndex, int endIndex, string te { StartIndex = startIndex, EndIndex = endIndex, - Text = text + Text = text, }; var actual = JsonConvert.DeserializeObject($"\"{json}\"", CreateSettings()) ?? throw new InvalidCastException(); TextTagAssert.ArePropertyEqual(expected, actual); diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagsConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagsConverterTest.cs index 27b3968ec..17c68a3a0 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagsConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RomajiTagsConverterTest.cs @@ -27,13 +27,13 @@ public void TestSerialize() { StartIndex = 2, EndIndex = 2, - Text = "ji" + Text = "ji", }, new RomajiTag { StartIndex = 0, EndIndex = 1, - Text = "roma" + Text = "roma", }, }; @@ -53,13 +53,13 @@ public void TestDeserialize() { StartIndex = 0, EndIndex = 1, - Text = "roma" + Text = "roma", }, new RomajiTag { StartIndex = 2, EndIndex = 2, - Text = "ji" + Text = "ji", }, }; var actual = JsonConvert.DeserializeObject(json, CreateSettings()) ?? throw new InvalidCastException(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagConverterTest.cs index 4a9b3834f..e74bb7c25 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagConverterTest.cs @@ -23,7 +23,7 @@ public void TestSerialize(int startIndex, int endIndex, string text, string json { StartIndex = startIndex, EndIndex = endIndex, - Text = text + Text = text, }; string expected = $"\"{json}\""; @@ -48,7 +48,7 @@ public void TestDeserialize(string json, int startIndex, int endIndex, string te { StartIndex = startIndex, EndIndex = endIndex, - Text = text + Text = text, }; var actual = JsonConvert.DeserializeObject($"\"{json}\"", CreateSettings()) ?? throw new InvalidCastException(); TextTagAssert.ArePropertyEqual(expected, actual); diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagsConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagsConverterTest.cs index e09f598ab..4b0c12e52 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagsConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/RubyTagsConverterTest.cs @@ -27,13 +27,13 @@ public void TestSerialize() { StartIndex = 1, EndIndex = 1, - Text = "ビ" + Text = "ビ", }, new RubyTag { StartIndex = 0, EndIndex = 0, - Text = "ル" + Text = "ル", }, }; @@ -53,13 +53,13 @@ public void TestDeserialize() { StartIndex = 0, EndIndex = 0, - Text = "ル" + Text = "ル", }, new RubyTag { StartIndex = 1, EndIndex = 1, - Text = "ビ" + Text = "ビ", }, }; var actual = JsonConvert.DeserializeObject(json, CreateSettings()) ?? throw new InvalidCastException(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ShaderConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ShaderConverterTest.cs index b494812ac..9a4a6842b 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ShaderConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/ShaderConverterTest.cs @@ -61,8 +61,8 @@ public void TestSerializerListItems() { ShadowOffset = new Vector2(3), ShadowColour = new Color4(0.5f, 0.5f, 0.5f, 0.5f), - } - } + }, + }, }; const string expected = @@ -86,8 +86,8 @@ public void TestDeserializeListItems() { ShadowOffset = new Vector2(3), ShadowColour = new Color4(0.5f, 0.5f, 0.5f, 0.5f), - } - } + }, + }, }; var actual = (StepShader)JsonConvert.DeserializeObject(json, CreateSettings())!; diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TimeTagsConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TimeTagsConverterTest.cs index da501879a..2a4ae72d7 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TimeTagsConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TimeTagsConverterTest.cs @@ -26,7 +26,7 @@ public void TestSerialize() var timeTags = new[] { new TimeTag(new TextIndex(0, TextIndex.IndexState.End), 1000), - new TimeTag(new TextIndex(0), 0) + new TimeTag(new TextIndex(0), 0), }; const string expected = "[\"[0,start]:0\",\"[0,end]:1000\"]"; diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TranslatesConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TranslatesConverterTest.cs index fd04f3fed..9b9de83e9 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TranslatesConverterTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/TranslatesConverterTest.cs @@ -23,7 +23,7 @@ public void TestSerialize() var translates = new Dictionary { { new CultureInfo("en-US"), "karaoke" }, - { new CultureInfo("Ja-jp"), "カラオケ" } + { new CultureInfo("Ja-jp"), "カラオケ" }, }; const string expected = "[{\"key\":1033,\"value\":\"karaoke\"},{\"key\":1041,\"value\":\"カラオケ\"}]"; @@ -39,7 +39,7 @@ public void TestDeserialize() var expected = new Dictionary { { new CultureInfo("en-US"), "karaoke" }, - { new CultureInfo("Ja-jp"), "カラオケ" } + { new CultureInfo("Ja-jp"), "カラオケ" }, }; var actual = JsonConvert.DeserializeObject>(json, CreateSettings()) ?? throw new InvalidCastException(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs index c29408eeb..b754fd173 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs @@ -22,7 +22,7 @@ public void TestCreateModWithStage() { Mod = new TModStage(), Beatmap = new TestKaraokeBeatmap(Ruleset.Value), - PassCondition = () => true + PassCondition = () => true, }); } @@ -34,7 +34,7 @@ public void TestCreateModWithoutStage() Mod = new TModStage(), // todo: add the stage info to beatmap. Beatmap = new TestKaraokeBeatmap(Ruleset.Value), - PassCondition = () => true + PassCondition = () => true, }); } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs index b05c0230c..a689278fc 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs @@ -15,6 +15,6 @@ public void TestMod() => CreateModTest(new ModTestData Mod = new KaraokeModAutoplay(), Autoplay = true, Beatmap = new TestKaraokeBeatmap(Ruleset.Value), - PassCondition = () => true + PassCondition = () => true, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs index b19d08eb9..a472141c6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs @@ -15,6 +15,6 @@ public void TestMod() => CreateModTest(new ModTestData Mod = new KaraokeModAutoplayBySinger(), Autoplay = true, Beatmap = new TestKaraokeBeatmap(Ruleset.Value), - PassCondition = () => true + PassCondition = () => true, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs index 30e239b4f..486effd40 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs @@ -26,6 +26,6 @@ public void TestCheckNoteExistInPlayfield() => CreateModTest(new ModTestData // check has no note in playfield return lyricPlayfield.AllHitObjects.Any() && notePlayfield.Alpha == 0f; - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs index f5ee4c539..1c370f989 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs @@ -26,6 +26,6 @@ public void TestFlashlightExist() => CreateModTest(new ModTestData // Should has at least one flashlight return drawableRuleset.KeyBindingInputManager.ChildrenOfType().Any(); - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs index 34f2cbe5f..3a6d4f459 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs @@ -15,7 +15,7 @@ public void TestSnowMod() => CreateModTest(new ModTestData Mod = new KaraokeModSnow(), Autoplay = false, Beatmap = new TestKaraokeBeatmap(Ruleset.Value), - PassCondition = () => true + PassCondition = () => true, }); [Test] @@ -24,6 +24,6 @@ public void TestWindowsUpdateMod() => CreateModTest(new ModTestData Mod = new KaraokeModWindowsUpdate(), Autoplay = false, Beatmap = new TestKaraokeBeatmap(Ruleset.Value), - PassCondition = () => true + PassCondition = () => true, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs index 53e8827e6..cd12a718e 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs @@ -27,6 +27,6 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData var hud = skinnableTargetContainers?.Components.OfType().FirstOrDefault(); return true; //return hud != null; - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs index d53858c15..0449b87db 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/LyricTest.cs @@ -32,7 +32,7 @@ public void TestClone() SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(new[] { 1, 2 }), Translates = new Dictionary { - { new CultureInfo("en-US"), "karaoke" } + { new CultureInfo("en-US"), "karaoke" }, }, Language = new CultureInfo("ja-JP"), Order = 1, @@ -41,8 +41,8 @@ public void TestClone() ReferenceLyric = referencedLyric, ReferenceLyricConfig = new ReferenceLyricConfig { - OffsetTime = 100 - } + OffsetTime = 100, + }, }; var clonedLyric = lyric.DeepClone(); @@ -113,9 +113,9 @@ public void TestSyncFromReferenceLyric() SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(new[] { 1 }), Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } + { new CultureInfo(17), "からおけ" }, }, - Language = new CultureInfo(17) + Language = new CultureInfo(17), }; var lyric = new Lyric @@ -153,7 +153,7 @@ public void TestReferenceLyricPropertyChanged() referencedLyric.SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(new[] { 1 }); referencedLyric.Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } + { new CultureInfo(17), "からおけ" }, }; referencedLyric.Language = new CultureInfo(17); @@ -184,9 +184,9 @@ public void TestReferenceLyricListPropertyChanged() SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(new[] { 1 }), Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } + { new CultureInfo(17), "からおけ" }, }, - Language = new CultureInfo(17) + Language = new CultureInfo(17), }; var lyric = new Lyric @@ -242,16 +242,16 @@ public void TestConfigChange() SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(new[] { 1 }), Translates = new Dictionary { - { new CultureInfo(17), "からおけ" } + { new CultureInfo(17), "からおけ" }, }, - Language = new CultureInfo(17) + Language = new CultureInfo(17), }; var lyric = new Lyric { ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceLyricConfig = config + ReferenceLyricConfig = config, }; // the property should not same as the reference reference because those properties are not sync. diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/RomajiTagTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/RomajiTagTest.cs index c2181ca8d..28a35023b 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/RomajiTagTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/RomajiTagTest.cs @@ -15,7 +15,7 @@ public void TestClone() { Text = "romaji", StartIndex = 0, - EndIndex = 2 + EndIndex = 2, }; var clonedRomajiTag = romajiTag.DeepClone(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/RubyTagTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/RubyTagTest.cs index e1b9453a2..2e7ee3d72 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/RubyTagTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/RubyTagTest.cs @@ -15,7 +15,7 @@ public void TestClone() { Text = "ruby", StartIndex = 0, - EndIndex = 1 + EndIndex = 1, }; var clonedRubyTag = rubyTag.DeepClone(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricUtilsTest.cs index 214c28b3e..afde6bffa 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricUtilsTest.cs @@ -247,7 +247,7 @@ public void TestGetTimeTagDisplayRubyText(int indexOfTimeTag, string expected) { "[0]:か", "[2,3]:おけ", - }) + }), }; var timeTag = lyric.TimeTags[indexOfTimeTag]; @@ -286,7 +286,7 @@ public void TestLyricTimeFormattedString(double startTime, double endTime, strin var lyric = new Lyric { StartTime = startTime, - Duration = endTime - startTime + Duration = endTime - startTime, }; string actual = LyricUtils.LyricTimeFormattedString(lyric); @@ -325,7 +325,7 @@ public void TestContainsSinger(string[] existSingers, string compareSinger, bool var singer = TestCaseTagHelper.ParseSinger(compareSinger); var lyric = new Lyric { - SingerIds = TestCaseTagHelper.ParseSingers(existSingers).Select(x => x.ID).ToArray() + SingerIds = TestCaseTagHelper.ParseSingers(existSingers).Select(x => x.ID).ToArray(), }; bool actual = LyricUtils.ContainsSinger(lyric, singer); @@ -341,7 +341,7 @@ public void TestOnlyContainsSingers(string[] existSingers, string[] compareSinge var singers = TestCaseTagHelper.ParseSingers(compareSingers).ToList(); var lyric = new Lyric { - SingerIds = TestCaseTagHelper.ParseSingers(existSingers).Select(x => x.ID).ToArray() + SingerIds = TestCaseTagHelper.ParseSingers(existSingers).Select(x => x.ID).ToArray(), }; bool actual = LyricUtils.OnlyContainsSingers(lyric, singers); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricsUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricsUtilsTest.cs index 700dfce0e..5767f29f2 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricsUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/LyricsUtilsTest.cs @@ -44,7 +44,7 @@ public void TestSeparateLyricTimeTag(string text, string[] timeTags, int splitIn var lyric = new Lyric { Text = text, - TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags), }; var (firstLyric, secondLyric) = LyricsUtils.SplitLyric(lyric, splitIndex); @@ -65,7 +65,7 @@ public void TestSeparateLyricRubyTag(string text, string[] rubyTags, int splitIn var lyric = new Lyric { Text = text, - RubyTags = TestCaseTagHelper.ParseRubyTags(rubyTags) + RubyTags = TestCaseTagHelper.ParseRubyTags(rubyTags), }; var (firstLyric, secondLyric) = LyricsUtils.SplitLyric(lyric, splitIndex); @@ -86,7 +86,7 @@ public void TestSeparateLyricRomajiTag(string text, string[] romajiTags, int spl var lyric = new Lyric { Text = text, - RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajiTags) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(romajiTags), }; var (firstLyric, secondLyric) = LyricsUtils.SplitLyric(lyric, splitIndex); @@ -117,7 +117,7 @@ public void TestSeparateLyricSinger(int[] singerIndexes, int[] expectedFirstSing var lyric = new Lyric { Text = "karaoke!", - SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(singerIndexes) + SingerIds = TestCaseElementIdHelper.CreateElementIdsByNumbers(singerIndexes), }; var (firstLyric, secondLyric) = LyricsUtils.SplitLyric(lyric, split_index); @@ -145,7 +145,7 @@ public void TestSeparateLyricLanguage(int? lcid, int? firstLcid, int? secondLcid var lyric = new Lyric { Text = "karaoke!", - Language = cultureInfo + Language = cultureInfo, }; var (firstLyric, secondLyric) = LyricsUtils.SplitLyric(lyric, split_index); @@ -180,12 +180,12 @@ public void TestCombineLyricTimeTag(string[] firstTimeTags, string[] secondTimeT var lyric1 = new Lyric { Text = "karaoke", - TimeTags = TestCaseTagHelper.ParseTimeTags(firstTimeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(firstTimeTags), }; var lyric2 = new Lyric { Text = "karaoke", - TimeTags = TestCaseTagHelper.ParseTimeTags(secondTimeTags) + TimeTags = TestCaseTagHelper.ParseTimeTags(secondTimeTags), }; var combineLyric = LyricsUtils.CombineLyric(lyric1, lyric2); @@ -209,12 +209,12 @@ public void TestCombineLyricRubyTag(string[] firstRubyTags, string[] secondRubyT var lyric1 = new Lyric { Text = "karaoke", - RubyTags = TestCaseTagHelper.ParseRubyTags(firstRubyTags) + RubyTags = TestCaseTagHelper.ParseRubyTags(firstRubyTags), }; var lyric2 = new Lyric { Text = "karaoke", - RubyTags = TestCaseTagHelper.ParseRubyTags(secondRubyTags) + RubyTags = TestCaseTagHelper.ParseRubyTags(secondRubyTags), }; var combineLyric = LyricsUtils.CombineLyric(lyric1, lyric2); @@ -234,12 +234,12 @@ public void TestCombineLyricRomajiTag(string[] firstRomajiTags, string[] secondR var lyric1 = new Lyric { Text = "karaoke", - RomajiTags = TestCaseTagHelper.ParseRomajiTags(firstRomajiTags) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(firstRomajiTags), }; var lyric2 = new Lyric { Text = "karaoke", - RomajiTags = TestCaseTagHelper.ParseRomajiTags(secondRomajiTags) + RomajiTags = TestCaseTagHelper.ParseRomajiTags(secondRomajiTags), }; var combineLyric = LyricsUtils.CombineLyric(lyric1, lyric2); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NoteUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NoteUtilsTest.cs index 5006a44c1..b3d551dfd 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NoteUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NoteUtilsTest.cs @@ -20,7 +20,7 @@ public void TestDisplayText(string text, string rubyText, bool useRubyTextIfHave var note = new Note { Text = text, - RubyText = rubyText + RubyText = rubyText, }; string actual = NoteUtils.DisplayText(note, useRubyTextIfHave); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NotesUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NotesUtilsTest.cs index 0b72936b6..25c28ecab 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NotesUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/NotesUtilsTest.cs @@ -58,7 +58,7 @@ public void TestSplitNoteOtherProperty() Tone = new Tone(-1, true), ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }; // create other property and make sure other class is applied value. diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/TextTagUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/TextTagUtilsTest.cs index f7ce5d5f8..1cebdaaea 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/TextTagUtilsTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/Utils/TextTagUtilsTest.cs @@ -42,7 +42,7 @@ public void TestGetFixedIndex(string textTag, string lyric, string actualTag) { Text = textTag.Text, StartIndex = startIndex, - EndIndex = endIndex + EndIndex = endIndex, }; } } @@ -83,7 +83,7 @@ public void TestGetShiftingIndex(string textTag, string lyric, int offset, strin { Text = textTag.Text, StartIndex = startIndex, - EndIndex = endIndex + EndIndex = endIndex, }; } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/LyricWorkingPropertyValidatorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/LyricWorkingPropertyValidatorTest.cs index 50d227fac..200ab1f41 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/LyricWorkingPropertyValidatorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/LyricWorkingPropertyValidatorTest.cs @@ -79,7 +79,7 @@ public void TestSingers() { { new Singer().ChangeId(singerId1), Array.Empty() }, { new Singer().ChangeId(singerId2), Array.Empty() }, - { new Singer().ChangeId(singerId3), Array.Empty() } + { new Singer().ChangeId(singerId3), Array.Empty() }, }); AssetIsValid(lyric, LyricWorkingProperty.Singers, true); @@ -97,7 +97,7 @@ public void TestSingers() { { new Singer().ChangeId(singerId3), Array.Empty() }, { new Singer().ChangeId(singerId2), Array.Empty() }, - { new Singer().ChangeId(singerId1), Array.Empty() } + { new Singer().ChangeId(singerId1), Array.Empty() }, }); AssetIsValid(lyric, LyricWorkingProperty.Singers, true); @@ -107,7 +107,7 @@ public void TestSingers() { { new Singer().ChangeId(singerId1), Array.Empty() }, { new Singer().ChangeId(singerId2), Array.Empty() }, - { new Singer().ChangeId(singerId3), Array.Empty() } + { new Singer().ChangeId(singerId3), Array.Empty() }, }); AssetIsValid(lyric, LyricWorkingProperty.Singers, true); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneKaraokeChangeLogMarkdownContainer.cs b/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneKaraokeChangeLogMarkdownContainer.cs index 281406a7a..c6fb0b1c0 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneKaraokeChangeLogMarkdownContainer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneKaraokeChangeLogMarkdownContainer.cs @@ -27,7 +27,7 @@ public void SetUp() => Schedule(() => var build = new APIChangelogBuild("karaoke-dev", "karaoke-dev.github.io") { Path = "content/changelog/2020.0620", - RootUrl = "https://github.com/karaoke-dev/karaoke-dev.github.io/tree/master/content/changelog/2020.0620" + RootUrl = "https://github.com/karaoke-dev/karaoke-dev.github.io/tree/master/content/changelog/2020.0620", }; Children = new Drawable[] @@ -44,9 +44,9 @@ public void SetUp() => Schedule(() => Child = markdownContainer = new ChangeLogMarkdownContainer(build) { RelativeSizeAxes = Axes.X, - AutoSizeAxes = Axes.Y - } - } + AutoSizeAxes = Axes.Y, + }, + }, }; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneOverlayColourProvider.cs b/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneOverlayColourProvider.cs index 98be55b9c..4eb8d3fbe 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneOverlayColourProvider.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneOverlayColourProvider.cs @@ -62,7 +62,7 @@ public void ShowWithNoFetch() AutoSizeAxes = Axes.X, Columns = columns, Content = content, - } + }, }; }); } @@ -99,7 +99,7 @@ public PreviewColourDrawable(Color4 color) Anchor = Anchor.Centre, Origin = Anchor.Centre, Text = color.ToHex(), - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapInfoGraph.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapInfoGraph.cs index 7920b97f8..a26dedbf6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapInfoGraph.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapInfoGraph.cs @@ -31,14 +31,14 @@ private void createTest(ScoreInfo score, IBeatmap beatmap) => AddStep("create te new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4Extensions.FromHex("#333") + Colour = Color4Extensions.FromHex("#333"), }, new BeatmapInfoGraph(beatmap) { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(600, 130) - } + Size = new Vector2(600, 130), + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapMetadataGraph.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapMetadataGraph.cs index 14e2b3798..17ca76107 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapMetadataGraph.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneBeatmapMetadataGraph.cs @@ -38,14 +38,14 @@ private void createTest(ScoreInfo score, IBeatmap beatmap) => AddStep("create te new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4Extensions.FromHex("#333") + Colour = Color4Extensions.FromHex("#333"), }, new BeatmapMetadataGraph(beatmap) { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(600, 200) - } + Size = new Vector2(600, 200), + }, }; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneHitEventTimingDistributionGraph.cs index 763d2fb29..a98a8818c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneHitEventTimingDistributionGraph.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneHitEventTimingDistributionGraph.cs @@ -43,14 +43,14 @@ private void createTest(IReadOnlyList events) => AddStep("create test" new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4Extensions.FromHex("#333") + Colour = Color4Extensions.FromHex("#333"), }, new HitEventTimingDistributionGraph(events) { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(600, 130) - } + Size = new Vector2(600, 130), + }, }; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneNotScorableGraph.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneNotScorableGraph.cs index 3c22236ff..0cab1c772 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneNotScorableGraph.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneNotScorableGraph.cs @@ -26,14 +26,14 @@ private void createTest() => AddStep("create test", () => new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4Extensions.FromHex("#333") + Colour = Color4Extensions.FromHex("#333"), }, new NotScorableGraph { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(600, 130) - } + Size = new Vector2(600, 130), + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneResultsScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneResultsScreen.cs index 66931817b..fa76036b8 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneResultsScreen.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneResultsScreen.cs @@ -30,7 +30,7 @@ public partial class TestSceneResultsScreen : OsuManualInputManagerTestScene private static TestResultsScreen createResultsScreen() => new(new TestKaraokeScoreInfo { - HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents() + HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(), }); [Test] diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneScoringResultGraph.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneScoringResultGraph.cs index 4909c1252..2dcb81cba 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneScoringResultGraph.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneScoringResultGraph.cs @@ -31,14 +31,14 @@ private void createTest(ScoreInfo score, IBeatmap beatmap) => AddStep("create te new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4Extensions.FromHex("#333") + Colour = Color4Extensions.FromHex("#333"), }, new ScoringResultGraph(score, beatmap) { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(600, 130) - } + Size = new Vector2(600, 130), + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneStatisticsPanel.cs index 9cc2b1eb6..b80dd380d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneStatisticsPanel.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneStatisticsPanel.cs @@ -17,7 +17,7 @@ public void TestScoreWithStatistics() { var score = new TestKaraokeScoreInfo { - HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents() + HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(), }; loadPanel(score); @@ -41,7 +41,7 @@ private void loadPanel(ScoreInfo? score) => AddStep("load panel", () => { RelativeSizeAxes = Axes.Both, State = { Value = Visibility.Visible }, - Score = { Value = score } + Score = { Value = score }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Replays/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Karaoke.Tests/Replays/TestSceneAutoGeneration.cs index b228dfe73..d20fe31ee 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Replays/TestSceneAutoGeneration.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Replays/TestSceneAutoGeneration.cs @@ -30,7 +30,7 @@ public void TestSingleShortNote() Display = true, Tone = new Tone(0, true), ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }); var generated = new KaraokeAutoGenerator(beatmap).Generate(); @@ -58,7 +58,7 @@ public void TestSingleNoteWithLongTime() Display = true, Tone = new Tone(0, true), ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }); var generated = new KaraokeAutoGenerator(beatmap).Generate(); @@ -87,7 +87,7 @@ public void TestNoteStair() Display = true, Tone = new Tone(0, true), ReferenceLyricId = firstReferencedLyric.ID, - ReferenceLyric = firstReferencedLyric + ReferenceLyric = firstReferencedLyric, }); beatmap.HitObjects.Add(new Note { @@ -95,7 +95,7 @@ public void TestNoteStair() Display = true, Tone = new Tone(1, true), ReferenceLyricId = secondReferencedLyric.ID, - ReferenceLyric = secondReferencedLyric + ReferenceLyric = secondReferencedLyric, }); var generated = new KaraokeAutoGenerator(beatmap).Generate(); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Components/TestSceneLyricSelector.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Components/TestSceneLyricSelector.cs index 1c88c5a9c..b4425f867 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Components/TestSceneLyricSelector.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Components/TestSceneLyricSelector.cs @@ -39,7 +39,7 @@ public void TestAllFiles() Size = new Vector2(0.5f, 0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = language + Current = language, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/BaseCharIndexCaretPositionAlgorithmTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/BaseCharIndexCaretPositionAlgorithmTest.cs index 867b2e4c8..76b2e297d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/BaseCharIndexCaretPositionAlgorithmTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/BaseCharIndexCaretPositionAlgorithmTest.cs @@ -195,46 +195,46 @@ private TCaret createCaretPosition(IEnumerable lyrics, int lyricIndex, in { new Lyric { - Text = "カラオケ" - } + Text = "カラオケ", + }, }; private static Lyric[] singleLyricWithOneText => new[] { new Lyric { - Text = "A" - } + Text = "A", + }, }; private static Lyric[] singleLyricWithNoText => new[] { - new Lyric() + new Lyric(), }; private static Lyric[] twoLyricsWithText => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; private static Lyric[] threeLyricsWithSpacing => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric(), new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; #endregion diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/ClickingCaretPositionAlgorithmTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/ClickingCaretPositionAlgorithmTest.cs index 96450d6d8..417388939 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/ClickingCaretPositionAlgorithmTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/ClickingCaretPositionAlgorithmTest.cs @@ -122,38 +122,38 @@ private static ClickingCaretPosition createCaretPosition(IEnumerable lyri { new Lyric { - Text = "カラオケ" - } + Text = "カラオケ", + }, }; private static Lyric[] singleLyricWithNoText => new[] { - new Lyric() + new Lyric(), }; private static Lyric[] twoLyricsWithText => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; private static Lyric[] threeLyricsWithSpacing => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric(), new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; #endregion diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/CuttingCaretPositionAlgorithmTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/CuttingCaretPositionAlgorithmTest.cs index 6a62f2276..de3f8fe47 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/CuttingCaretPositionAlgorithmTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/CuttingCaretPositionAlgorithmTest.cs @@ -203,54 +203,54 @@ private static CuttingCaretPosition createCaretPosition(IEnumerable lyric { new Lyric { - Text = "カラオケ" - } + Text = "カラオケ", + }, }; private static Lyric[] singleLyricWithTwoText => new[] { new Lyric { - Text = "AA" - } + Text = "AA", + }, }; private static Lyric[] singleLyricWithOneText => new[] { new Lyric { - Text = "A" - } + Text = "A", + }, }; private static Lyric[] singleLyricWithNoText => new[] { - new Lyric() + new Lyric(), }; private static Lyric[] twoLyricsWithText => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; private static Lyric[] threeLyricsWithSpacing => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric(), new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; #endregion diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/NavigateCaretPositionAlgorithmTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/NavigateCaretPositionAlgorithmTest.cs index 42ee7e656..1f2e2d892 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/NavigateCaretPositionAlgorithmTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/NavigateCaretPositionAlgorithmTest.cs @@ -122,38 +122,38 @@ private static NavigateCaretPosition createCaretPosition(IEnumerable lyri { new Lyric { - Text = "カラオケ" - } + Text = "カラオケ", + }, }; private static Lyric[] singleLyricWithNoText => new[] { - new Lyric() + new Lyric(), }; private static Lyric[] twoLyricsWithText => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; private static Lyric[] threeLyricsWithSpacing => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric(), new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; #endregion diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithmTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithmTest.cs index 0005fb878..b23054880 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithmTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithmTest.cs @@ -254,22 +254,22 @@ private static TimeTagCaretPosition createCaretPosition(IEnumerable lyric "[1,start]:2000", "[2,start]:3000", "[3,start]:4000", - "[3,end]:5000" - }) - } + "[3,end]:5000", + }), + }, }; private static Lyric[] singleLyricWithoutTimeTag => new[] { new Lyric { - Text = "カラオケ" - } + Text = "カラオケ", + }, }; private static Lyric[] singleLyricWithNoText => new[] { - new Lyric() + new Lyric(), }; private static Lyric[] twoLyricsWithText => new[] @@ -283,8 +283,8 @@ private static TimeTagCaretPosition createCaretPosition(IEnumerable lyric "[1,start]:2000", "[2,start]:3000", "[3,start]:4000", - "[3,end]:5000" - }) + "[3,end]:5000", + }), }, new Lyric { @@ -294,9 +294,9 @@ private static TimeTagCaretPosition createCaretPosition(IEnumerable lyric "[0,start]:1000", "[1,start]:2000", "[2,start]:3000", - "[2,end]:5000" - }) - } + "[2,end]:5000", + }), + }, }; private static Lyric[] threeLyricsWithSpacing => new[] @@ -310,8 +310,8 @@ private static TimeTagCaretPosition createCaretPosition(IEnumerable lyric "[1,start]:2000", "[2,start]:3000", "[3,start]:4000", - "[3,end]:5000" - }) + "[3,end]:5000", + }), }, new Lyric(), new Lyric @@ -322,9 +322,9 @@ private static TimeTagCaretPosition createCaretPosition(IEnumerable lyric "[0,start]:1000", "[1,start]:2000", "[2,start]:3000", - "[2,end]:5000" - }) - } + "[2,end]:5000", + }), + }, }; #endregion diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TypingCaretPositionAlgorithmTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TypingCaretPositionAlgorithmTest.cs index 33cb233c1..d408d69c6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TypingCaretPositionAlgorithmTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/CaretPosition/Algorithms/TypingCaretPositionAlgorithmTest.cs @@ -198,38 +198,38 @@ private static TypingCaretPosition createCaretPosition(IEnumerable lyrics { new Lyric { - Text = "カラオケ" - } + Text = "カラオケ", + }, }; private static Lyric[] singleLyricWithNoText => new[] { - new Lyric() + new Lyric(), }; private static Lyric[] twoLyricsWithText => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; private static Lyric[] threeLyricsWithSpacing => new[] { new Lyric { - Text = "カラオケ" + Text = "カラオケ", }, new Lyric(), new Lyric { - Text = "大好き" - } + Text = "大好き", + }, }; #endregion diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorColourProvider.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorColourProvider.cs index 953c63033..208a0c4d3 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorColourProvider.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorColourProvider.cs @@ -41,7 +41,7 @@ public void ShowWithNoFetch() { var editMOdeColumns = new TableColumn[] { - new TitleTableColumn("Edit mode") + new TitleTableColumn("Edit mode"), }; var editModeContent = types.Select(type => { @@ -49,8 +49,8 @@ public void ShowWithNoFetch() { new OsuSpriteText { - Text = type.ToString() - } + Text = type.ToString(), + }, }; }).To2DArray(); @@ -89,10 +89,10 @@ public void ShowWithNoFetch() Content = content, Margin = new MarginPadding { - Left = edit_mode_name_width - } - } - } + Left = edit_mode_name_width, + }, + }, + }, }; }); } @@ -129,7 +129,7 @@ public PreviewColourDrawable(Color4 color) Anchor = Anchor.Centre, Origin = Anchor.Centre, Text = color.ToHex(), - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorDescriptionTextFlowContainer.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorDescriptionTextFlowContainer.cs index ebf4446b1..3158be93c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorDescriptionTextFlowContainer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorDescriptionTextFlowContainer.cs @@ -33,8 +33,8 @@ public void SetUp() => Schedule(() => { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(100) - } + Size = new Vector2(100), + }, }; }); @@ -52,10 +52,10 @@ public void TestDisplayDescriptionWithEditMode() "singer_mode", new SwitchModeDescriptionAction { Text = "edit text mode", - Mode = LyricEditorMode.Singer + Mode = LyricEditorMode.Singer, } - } - } + }, + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestScenePreviewKaraokeSpriteText.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestScenePreviewKaraokeSpriteText.cs index 1c5073408..cd231339a 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestScenePreviewKaraokeSpriteText.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestScenePreviewKaraokeSpriteText.cs @@ -73,16 +73,16 @@ private void load(OsuColour colour) { RelativeSizeAxes = Axes.Both, Colour = colour.RedDarker, - Alpha = 0.3f - } + Alpha = 0.3f, + }, }, spriteText = new OsuSpriteText { Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, Font = OsuFont.GetFont(size: 20), - } - } + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/LyricCaretStateTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/LyricCaretStateTest.cs index 743c06ed5..3adf37d15 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/LyricCaretStateTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/LyricCaretStateTest.cs @@ -46,13 +46,13 @@ public LyricCaretStateTest() }, new Lyric { - Text = "Second lyric" + Text = "Second lyric", }, new Lyric { - Text = "Third lyric" + Text = "Third lyric", }, - } + }, }; } @@ -72,7 +72,7 @@ private void load() Children = new Drawable[] { lyricsProvider, - lyricCaretState = new LyricCaretState() + lyricCaretState = new LyricCaretState(), }; } @@ -411,7 +411,7 @@ public void SwitchMode(LyricEditorMode mode) bindableModeWitSubMode.Value = bindableModeWitSubMode.Value with { Mode = mode, - SubMode = getTheSubMode(mode) + SubMode = getTheSubMode(mode), }; } @@ -427,7 +427,7 @@ public void SwitchMode(LyricEditorMode mode) LyricEditorMode.EditTimeTag => TimeTagEditMode.Create, LyricEditorMode.EditNote => NoteEditMode.Generate, LyricEditorMode.Singer => null, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; public void SwitchSubMode(TSubMode subMode) where TSubMode : Enum diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneEditorMenuBar.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneEditorMenuBar.cs index 85dee3ef3..544faa5a0 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneEditorMenuBar.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneEditorMenuBar.cs @@ -50,7 +50,7 @@ private void load() new EditorMenuItem("Export to .lrc", MenuItemType.Standard, () => { }), new EditorMenuItem("Export to text", MenuItemType.Standard, () => { }), new EditorMenuItem("Export to json", MenuItemType.Destructive, () => { }), - } + }, }, new LyricEditorModeMenu(new Bindable(), "Mode"), new MenuItem("View") @@ -59,7 +59,7 @@ private void load() { new LyricEditorTextSizeMenu(lyricEditorConfig, "Text size"), new AutoFocusToEditLyricMenu(lyricEditorConfig, "Auto focus to edit lyric"), - } + }, }, new MenuItem("Config") { @@ -68,17 +68,17 @@ private void load() new EditorMenuItem("Lyric editor"), new GeneratorConfigMenu("Auto-generator"), new LockStateMenu(lyricEditorConfig, "Lock"), - } + }, }, new MenuItem("Tools") { Items = new MenuItem[] { new KaraokeSkinEditorMenu(null!, null!, "Skin editor"), - } + }, }, - } - } + }, + }, }); } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestScenePageScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestScenePageScreen.cs index 364928359..c77773a0d 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestScenePageScreen.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestScenePageScreen.cs @@ -38,7 +38,7 @@ protected override KaraokeBeatmap CreateBeatmap() new() { Time = 3000, - } + }, }); return karaokeBeatmap; @@ -54,7 +54,7 @@ private void load() { Content, dialogOverlay = new DialogOverlay(), - lyricsProvider = new LyricsProvider() + lyricsProvider = new LyricsProvider(), }); Dependencies.CacheAs(dialogOverlay); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneSingerScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneSingerScreen.cs index a36313b5b..569107aa6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneSingerScreen.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneSingerScreen.cs @@ -72,7 +72,7 @@ private void load() new OsuContextMenuContainer { RelativeSizeAxes = Axes.Both, - Child = Content + Child = Content, }, dialogOverlay = new DialogOverlay(), lyricsProvider = new LyricsProvider(), @@ -81,7 +81,7 @@ private void load() var beatDivisor = new BindableBeatDivisor { - Value = Beatmap.Value.BeatmapInfo.BeatDivisor + Value = Beatmap.Value.BeatmapInfo.BeatDivisor, }; var editorClock = new EditorClock(Beatmap.Value.Beatmap, beatDivisor); Dependencies.CacheAs(editorClock); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneTranslateScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneTranslateScreen.cs index cbebb9228..f75e9ece6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneTranslateScreen.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneTranslateScreen.cs @@ -29,7 +29,7 @@ protected override KaraokeBeatmap CreateBeatmap() { new("zh-TW"), new("en-US"), - new("ja-JP") + new("ja-JP"), }; return karaokeBeatmap; @@ -45,7 +45,7 @@ private void load() { Content, dialogOverlay = new DialogOverlay(), - lyricsProvider = new LyricsProvider() + lyricsProvider = new LyricsProvider(), }); Dependencies.CacheAs(dialogOverlay); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssueIcon.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssueIcon.cs index 8c7bb32f0..239a389d0 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssueIcon.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssueIcon.cs @@ -23,7 +23,7 @@ public void SetUp() => Schedule(() => { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(64) + Size = new Vector2(64), }; }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssuesToolTip.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssuesToolTip.cs index e0bb5f73c..d7969492b 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssuesToolTip.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Issues/TestSceneIssuesToolTip.cs @@ -20,7 +20,7 @@ public void SetUp() => Schedule(() => Child = toolTip = new IssuesToolTip { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; toolTip.Show(); }); diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Markdown/TestSceneDescriptionTextFlowContainer.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Markdown/TestSceneDescriptionTextFlowContainer.cs index 7221e47fe..0dac5852a 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Markdown/TestSceneDescriptionTextFlowContainer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Components/Markdown/TestSceneDescriptionTextFlowContainer.cs @@ -31,8 +31,8 @@ public void SetUp() => Schedule(() => { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Size = new Vector2(100) - } + Size = new Vector2(100), + }, }; }); @@ -43,7 +43,7 @@ public void TestDisplayDescription() { lyricEditorDescriptionTextFlowContainer.Description = new DescriptionFormat { - Text = "Test description with `Markdown` format." + Text = "Test description with `Markdown` format.", }; }); } @@ -63,11 +63,11 @@ public void TestDisplayDescriptionWithKey() { AdjustableActions = new[] { - KaraokeEditAction.SetTime - } + KaraokeEditAction.SetTime, + }, } - } - } + }, + }, }; }); @@ -84,11 +84,11 @@ public void TestDisplayDescriptionWithKey() Text = "set time key.", AdjustableActions = new[] { - KaraokeEditAction.SetTime - } + KaraokeEditAction.SetTime, + }, } - } - } + }, + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/GenericEditorScreenTestScene.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/GenericEditorScreenTestScene.cs index ef9c06ae4..e8e3c1ead 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/GenericEditorScreenTestScene.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/GenericEditorScreenTestScene.cs @@ -42,7 +42,7 @@ protected override void LoadComplete() CreateEditorScreen().With(x => { x.State.Value = Visibility.Visible; - }) + }), }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/KaraokeSkinEditorScreenTestScene.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/KaraokeSkinEditorScreenTestScene.cs index a766596f7..b347aea9c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/KaraokeSkinEditorScreenTestScene.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/KaraokeSkinEditorScreenTestScene.cs @@ -46,8 +46,8 @@ protected override void LoadComplete() CreateEditorScreen(karaokeSkin).With(x => { x.State.Value = Visibility.Visible; - }) - } + }), + }, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/TestSceneKaraokeSkinEditor.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/TestSceneKaraokeSkinEditor.cs index 3f3147aa2..872a6d571 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/TestSceneKaraokeSkinEditor.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Skin/TestSceneKaraokeSkinEditor.cs @@ -54,7 +54,7 @@ public class TestingSkin : KaraokeSkin Name = "karaoke! (default skin)", Creator = "team karaoke!", Protected = true, - InstantiationInfo = typeof(TestingSkin).GetInvariantInstantiationInfo() + InstantiationInfo = typeof(TestingSkin).GetInvariantInstantiationInfo(), }; public TestingSkin(IStorageResourceProvider? resources) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeBeatmapSkinDecodingTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeBeatmapSkinDecodingTest.cs index f36c93848..6c9bceb55 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeBeatmapSkinDecodingTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeBeatmapSkinDecodingTest.cs @@ -22,7 +22,7 @@ public void TestKaraokeBeatmapSkinDefaultValue() var testingNote = new Note { ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }; // try to get default value from the skin. diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeHitObjectTestScene.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeHitObjectTestScene.cs index 758993152..f1a97463a 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeHitObjectTestScene.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeHitObjectTestScene.cs @@ -46,9 +46,9 @@ private void load() { h.AccentColour.Value = Color4.Orange; })); - }) + }), }, - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinDecodingTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinDecodingTest.cs index be6b58d66..af5a8943c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinDecodingTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinDecodingTest.cs @@ -22,7 +22,7 @@ public void TestKaraokeSkinDefaultValue() var testingNote = new Note { ReferenceLyricId = referencedLyric.ID, - ReferenceLyric = referencedLyric + ReferenceLyric = referencedLyric, }; // try to get default value from the skin. diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinnableColumnTestScene.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinnableColumnTestScene.cs index dcdd8653b..ea55c54c5 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinnableColumnTestScene.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/KaraokeSkinnableColumnTestScene.cs @@ -41,7 +41,7 @@ protected KaraokeSkinnableColumnTestScene() { RelativeSizeAxes = Axes.Both, Colour = Color4.SlateGray.Opacity(0.2f), - Depth = 1 + Depth = 1, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/NotePlayfieldTestContainer.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/NotePlayfieldTestContainer.cs index 6dc09904f..3ddce7252 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/NotePlayfieldTestContainer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/NotePlayfieldTestContainer.cs @@ -25,7 +25,7 @@ public NotePlayfieldTestContainer(int column) playfield = new NotePlayfield(column); InternalChild = content = new KaraokeInputManager(new KaraokeRuleset().RulesetInfo) { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }; } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneColumnBackground.cs index 132983341..f32935700 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneColumnBackground.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneColumnBackground.cs @@ -31,8 +31,8 @@ private void load() Height = 0.5f, Child = new SkinnableDrawable(new KaraokeSkinComponentLookup(KaraokeSkinComponents.ColumnBackground), _ => new DefaultColumnBackground(0)) { - RelativeSizeAxes = Axes.Both - } + RelativeSizeAxes = Axes.Both, + }, }, new NotePlayfieldTestContainer(1) { @@ -40,10 +40,10 @@ private void load() Height = 0.5f, Child = new SkinnableDrawable(new KaraokeSkinComponentLookup(KaraokeSkinComponents.ColumnBackground), _ => new DefaultColumnBackground(1)) { - RelativeSizeAxes = Axes.Both - } - } - } + RelativeSizeAxes = Axes.Both, + }, + }, + }, }); } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs index 2f2d26f5a..443f43f4b 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneLyric.cs @@ -61,14 +61,14 @@ private Drawable testSingle(double timeOffset = 0) { StartIndex = 0, EndIndex = 0, - Text = "か" + Text = "か", }, new RubyTag { StartIndex = 2, EndIndex = 2, - Text = "お" - } + Text = "お", + }, }, RomajiTags = new[] { @@ -76,14 +76,14 @@ private Drawable testSingle(double timeOffset = 0) { StartIndex = 1, EndIndex = 1, - Text = "ra" + Text = "ra", }, new RomajiTag { StartIndex = 3, EndIndex = 3, - Text = "ke" - } + Text = "ke", + }, }, EffectApplier = new LyricPreviewStageEffectApplier(new[] { @@ -93,10 +93,10 @@ private Drawable testSingle(double timeOffset = 0) EndTime = startTime + duration, Timings = new Dictionary { - { 0, startTime } - } - } - }, new PreviewStageDefinition()) + { 0, startTime }, + }, + }, + }, new PreviewStageDefinition()), }; lyric.Translates.Add(cultureInfo, "karaoke"); @@ -117,7 +117,7 @@ protected virtual TestDrawableLyric CreateDrawableLyric(Lyric lyric) { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Depth = depthIndex++ + Depth = depthIndex++, }; protected partial class TestDrawableLyric : DrawableLyric diff --git a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneNotePlayfield.cs b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneNotePlayfield.cs index 93822f757..2376ef247 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneNotePlayfield.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Skinning/TestSceneNotePlayfield.cs @@ -13,7 +13,7 @@ private void load() { SetContents(_ => new KaraokeInputManager(new KaraokeRuleset().RulesetInfo) { - Child = new NotePlayfield(COLUMNS) + Child = new NotePlayfield(COLUMNS), }); } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/UI/Position/NotePositionCalculatorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/UI/Position/NotePositionCalculatorTest.cs index a6a4293ff..c6032f291 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/UI/Position/NotePositionCalculatorTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/UI/Position/NotePositionCalculatorTest.cs @@ -24,7 +24,7 @@ public void TestPositionAtTone(double scale, float expected) var calculator = new NotePositionCalculator(default_columns, default_column_height, default_spacing); var note = new Note { - Tone = TestCaseToneHelper.NumberToTone(scale) + Tone = TestCaseToneHelper.NumberToTone(scale), }; float actual = calculator.YPositionAt(note); @@ -51,7 +51,7 @@ public void TestPositionAtScoringAction(float scale, float expected) var calculator = new NotePositionCalculator(default_columns, default_column_height, default_spacing); var action = new KaraokeScoringAction { - Scale = scale + Scale = scale, }; float actual = calculator.YPositionAt(action); diff --git a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneBeatmapCoverInfo.cs b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneBeatmapCoverInfo.cs index 5ea85db93..40d6941e3 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneBeatmapCoverInfo.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneBeatmapCoverInfo.cs @@ -18,7 +18,7 @@ public TestSceneBeatmapCoverInfo() Add(beatmapCoverInfo = new BeatmapCoverInfo { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }); } diff --git a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneControlLayer.cs b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneControlLayer.cs index 583fad241..1b296770c 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneControlLayer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneControlLayer.cs @@ -31,7 +31,7 @@ private void load() Child = SettingOverlayContainer = new SettingOverlayContainer { RelativeSizeAxes = Axes.Both, - } + }, }); AddStep("Toggle setting", SettingOverlayContainer.ToggleGeneralSettingsOverlay); diff --git a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneNotePlayfield.cs b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneNotePlayfield.cs index 85040b105..4c7afdbdd 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneNotePlayfield.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneNotePlayfield.cs @@ -59,9 +59,9 @@ private void load() }, new[] { - createColumn(ScrollingDirection.Right, COLUMNS) - } - } + createColumn(ScrollingDirection.Right, COLUMNS), + }, + }, }; } @@ -119,7 +119,7 @@ private void createNote(double increaseTime = 2000, double duration = 1000, int Tone = new Tone { Scale = tone }, ReferenceLyricId = referencedLyric.ID, ReferenceLyric = referencedLyric, - ReferenceTimeTagIndex = 0 + ReferenceTimeTagIndex = 0, }; note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty()); @@ -173,7 +173,7 @@ private Drawable createColumn(ScrollingDirection direction, int column) Padding = new MarginPadding(20), RelativeSizeAxes = Axes.Both, TimeRange = 2000, - Child = playfield + Child = playfield, }; } diff --git a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneRulesetIcon.cs b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneRulesetIcon.cs index c9638369d..f0b6349bf 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneRulesetIcon.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneRulesetIcon.cs @@ -28,7 +28,7 @@ public TestSceneRulesetIcon() Radius = 15, Roundness = 15, }, - Size = new Vector2(40) + Size = new Vector2(40), }; } } diff --git a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneScoringStatus.cs b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneScoringStatus.cs index d567e2969..dc7aa95f9 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneScoringStatus.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/UI/TestSceneScoringStatus.cs @@ -31,7 +31,7 @@ public void TestMode(ScoringStatusMode mode) Child = new ScoringStatus(mode) { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; }); } diff --git a/osu.Game.Rulesets.Karaoke.sln.DotSettings b/osu.Game.Rulesets.Karaoke.sln.DotSettings index dc4184515..c3b3e8b59 100644 --- a/osu.Game.Rulesets.Karaoke.sln.DotSettings +++ b/osu.Game.Rulesets.Karaoke.sln.DotSettings @@ -18,6 +18,8 @@ WARNING WARNING True + WARNING + WARNING WARNING WARNING HINT @@ -277,6 +279,7 @@ Explicit ExpressionBody BlockBody + True FileScoped TargetTyped True diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs index f70e90b33..0e137aa6c 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs @@ -216,7 +216,7 @@ static Tone convertTone(string tone) return new Tone { Scale = scale, - Half = half + Half = half, }; } } @@ -230,7 +230,7 @@ private void processTranslate(Beatmap beatmap, IEnumerable translateLine var translations = translateLines.Select(translate => new { key = translate.Split('=').FirstOrDefault()?.Split('[').LastOrDefault()?.Split(']').FirstOrDefault(), - value = translate.Split('=').LastOrDefault() ?? string.Empty + value = translate.Split('=').LastOrDefault() ?? string.Empty, }).GroupBy(x => x.key, y => y.value).ToList(); foreach (var translation in translations) @@ -255,7 +255,7 @@ private void processTranslate(Beatmap beatmap, IEnumerable translateLine var dictionary = new LegacyProperties { - AvailableTranslates = availableTranslates + AvailableTranslates = availableTranslates, }; beatmap.HitObjects.Add(dictionary); diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcDecoder.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcDecoder.cs index 4c131ec6c..4a9fa35b8 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcDecoder.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcDecoder.cs @@ -41,7 +41,7 @@ protected override void ParseStreamInto(LineBufferedReader stream, Beatmap outpu Order = output.HitObjects.Count + 1, // should create default order. Text = lrcLyric.Text, TimeTags = TimeTagsUtils.Sort(lrcTimeTags.Concat(lrcRubyTimeTags)), - RubyTags = lrcRubies + RubyTags = lrcRubies, }; }); @@ -63,7 +63,7 @@ static RubyTag convertRubyTag(LrcParser.Model.RubyTag rubyTag) { Text = rubyTag.Text, StartIndex = rubyTag.StartCharIndex, - EndIndex = rubyTag.EndCharIndex + EndIndex = rubyTag.EndCharIndex, }; static TimeTag[] convertTimeTagsFromRubyTags(LrcParser.Model.RubyTag rubyTag) diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcEncoder.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcEncoder.cs index 73f6cc6ef..056839c2f 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcEncoder.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/LrcEncoder.cs @@ -32,7 +32,7 @@ static LrcParser.Model.Lyric encodeLyric(Lyric lyric) => { Text = lyric.Text, TimeTags = convertTimeTag(lyric.TimeTags), - RubyTags = convertRubyTag(lyric.RubyTags) + RubyTags = convertRubyTag(lyric.RubyTags), }; static SortedDictionary convertTimeTag(IList timeTags) @@ -55,7 +55,7 @@ static List convertRubyTag(IEnumerable rubyTags) { Text = x.Text, StartCharIndex = x.StartIndex, - EndCharIndex = x.EndIndex + EndCharIndex = x.EndIndex, }).ToList(); } diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmap.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmap.cs index 3bce5a303..dadd1c25b 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmap.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmap.cs @@ -44,13 +44,13 @@ public override IEnumerable GetStatistics() { Name = @"Singer", Content = singers.ToString(), - CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.User } + CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.User }, }, new() { Name = @"Lyric", Content = lyrics.ToString(), - CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.AlignLeft } + CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.AlignLeft }, }, }; @@ -61,7 +61,7 @@ public override IEnumerable GetStatistics() { Name = @"Note", Content = notes.ToString(), - CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.Music } + CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.Music }, }); } else @@ -70,7 +70,7 @@ public override IEnumerable GetStatistics() { Name = @"This beatmap is not scorable.", Content = @"This beatmap is not scorable.", - CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.Times } + CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.Times }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/NoteInfo.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/NoteInfo.cs index 467fd38e0..0f983565d 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/NoteInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/NoteInfo.cs @@ -12,7 +12,7 @@ public class NoteInfo public Tone MaxTone => new() { - Scale = Columns / 2 + Scale = Columns / 2, }; public Tone MinTone => -MaxTone; diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Page.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Page.cs index 5682820c0..92b363e66 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Page.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Page.cs @@ -23,7 +23,7 @@ public Page DeepClone() { return new Page { - Time = Time + Time = Time, }; } diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Singer.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Singer.cs index f7215ff02..90f87eaac 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Singer.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Singer.cs @@ -37,7 +37,7 @@ public string AvatarFile public Bindable HueBindable = new BindableFloat { MinValue = 0, - MaxValue = 1 + MaxValue = 1, }; public float Hue diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/SingerState.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/SingerState.cs index 5a069a361..d9d78dac8 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/SingerState.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/SingerState.cs @@ -40,7 +40,7 @@ public int Order public Bindable HueBindable = new BindableFloat { MinValue = 0, - MaxValue = 1 + MaxValue = 1, }; public float Hue diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Classic/ClassicLyricLayoutAlignment.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Classic/ClassicLyricLayoutAlignment.cs index e5ae82b7b..1912bf6a3 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Classic/ClassicLyricLayoutAlignment.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Classic/ClassicLyricLayoutAlignment.cs @@ -9,5 +9,5 @@ public enum ClassicLyricLayoutAlignment Center, - Right + Right, } diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/StageInfo.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/StageInfo.cs index 562658e5b..867bc24b0 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/StageInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/StageInfo.cs @@ -22,7 +22,7 @@ public IStageEffectApplier GetStageAppliers(KaraokeHitObject hitObject) { Lyric => ConvertToLyricStageAppliers(elements), Note => ConvertToNoteStageAppliers(elements), - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; } @@ -31,14 +31,14 @@ private IEnumerable getStageElements(KaraokeHitObject hitObject) = { Lyric lyric => GetLyricStageElements(lyric), Note note => GetNoteStageElements(note), - _ => Array.Empty() + _ => Array.Empty(), }; public Tuple GetStartAndEndTime(KaraokeHitObject hitObject) => hitObject switch { Lyric lyric => GetStartAndEndTime(lyric), - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; #region Stage element diff --git a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs index 91d5d5ed0..e62931ab2 100644 --- a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs +++ b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditCheckerConfigManager.cs @@ -25,5 +25,5 @@ public enum KaraokeRulesetEditCheckerSetting LyricRubyPositionSorting, LyricRomajiPositionSorting, LyricTimeTagTimeSelfCheck, - LyricTimeTagTimeGroupCheck + LyricTimeTagTimeGroupCheck, } diff --git a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditGeneratorConfigManager.cs b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditGeneratorConfigManager.cs index 28d6486e6..ef23eb1af 100644 --- a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditGeneratorConfigManager.cs +++ b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetEditGeneratorConfigManager.cs @@ -81,7 +81,7 @@ protected static KaraokeRulesetEditGeneratorSetting GetSettingByType() = Type t when t == typeof(JaRubyTagGeneratorConfig) => KaraokeRulesetEditGeneratorSetting.JaRubyTagGeneratorConfig, Type t when t == typeof(JaTimeTagGeneratorConfig) => KaraokeRulesetEditGeneratorSetting.JaTimeTagGeneratorConfig, Type t when t == typeof(ZhTimeTagGeneratorConfig) => KaraokeRulesetEditGeneratorSetting.ZhTimeTagGeneratorConfig, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; public TValue Get() where TValue : GeneratorConfig, new() @@ -133,5 +133,5 @@ public enum KaraokeRulesetEditGeneratorSetting // Time tag generator JaTimeTagGeneratorConfig, - ZhTimeTagGeneratorConfig + ZhTimeTagGeneratorConfig, } diff --git a/osu.Game.Rulesets.Karaoke/Difficulty/KaraokeDifficultyCalculator.cs b/osu.Game.Rulesets.Karaoke/Difficulty/KaraokeDifficultyCalculator.cs index 75daf79f7..7a12863cf 100644 --- a/osu.Game.Rulesets.Karaoke/Difficulty/KaraokeDifficultyCalculator.cs +++ b/osu.Game.Rulesets.Karaoke/Difficulty/KaraokeDifficultyCalculator.cs @@ -67,7 +67,7 @@ protected override IEnumerable CreateDifficultyHitObjects(I protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => new Skill[] { - new Strain(mods, ((KaraokeBeatmap)beatmap).NoteInfo) + new Strain(mods, ((KaraokeBeatmap)beatmap).NoteInfo), }; protected override Mod[] DifficultyAdjustmentMods => diff --git a/osu.Game.Rulesets.Karaoke/Difficulty/KaraokePerformanceCalculator.cs b/osu.Game.Rulesets.Karaoke/Difficulty/KaraokePerformanceCalculator.cs index 513ffef1a..e18a3c429 100644 --- a/osu.Game.Rulesets.Karaoke/Difficulty/KaraokePerformanceCalculator.cs +++ b/osu.Game.Rulesets.Karaoke/Difficulty/KaraokePerformanceCalculator.cs @@ -68,7 +68,7 @@ protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo s Difficulty = difficultyValue, Accuracy = accValue, ScaledScore = scaledScore, - Total = totalValue + Total = totalValue, }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/Components/EditBodyPiece.cs b/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/Components/EditBodyPiece.cs index b707a78ab..3bf4bf9d0 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/Components/EditBodyPiece.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/Components/EditBodyPiece.cs @@ -23,7 +23,7 @@ private void load(OsuColour colours) { RelativeSizeAxes = Axes.Both, AlwaysPresent = true, - Alpha = 0 + Alpha = 0, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/NoteSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/NoteSelectionBlueprint.cs index 09627ff02..fb9feb615 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/NoteSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Blueprints/Notes/NoteSelectionBlueprint.cs @@ -47,7 +47,7 @@ public NoteSelectionBlueprint(Note note) { AddInternal(new EditBodyPiece { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/HitObjectChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/HitObjectChangeHandler.cs index 508f76bfe..7d0462536 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/HitObjectChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/HitObjectChangeHandler.cs @@ -139,7 +139,7 @@ private bool isCreateObjectLocked(T hitObject) { Lyric => false, Note note => note.ReferenceLyric != null && HitObjectWritableUtils.IsCreateOrRemoveNoteLocked(note.ReferenceLyric), - _ => throw new InvalidCastException() + _ => throw new InvalidCastException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/LockChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/LockChangeHandler.cs index bdb170d94..495c27f3a 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/LockChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/LockChangeHandler.cs @@ -30,7 +30,7 @@ protected sealed override bool IsWritePropertyLocked(KaraokeHitObject hitObject) { Lyric lyric => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.Lock)), Note note => HitObjectWritableUtils.IsWriteNotePropertyLocked(note, nameof(Lyric.Lock)), - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricTimeTagsChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricTimeTagsChangeHandler.cs index 36dc94176..93ab896ba 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricTimeTagsChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/ILyricTimeTagsChangeHandler.cs @@ -28,7 +28,7 @@ public enum ShiftingDirection { Left, - Right + Right, } public enum ShiftingType diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandler.cs index aa1eaa6b9..eed1b9d8b 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandler.cs @@ -233,7 +233,7 @@ static TextIndex getNewIndex(TextIndex originIndex, ShiftingDirection direction, { ShiftingType.Index => TextIndexUtils.ShiftingIndex(originIndex, direction == ShiftingDirection.Left ? -1 : 1), ShiftingType.State => direction == ShiftingDirection.Left ? TextIndexUtils.GetPreviousIndex(originIndex) : TextIndexUtils.GetNextIndex(originIndex), - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; } } @@ -293,6 +293,6 @@ private enum InsertDirection { Start, - End + End, } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapAvailableTranslates.cs b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapAvailableTranslates.cs index 674450d86..41a058711 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapAvailableTranslates.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapAvailableTranslates.cs @@ -19,7 +19,7 @@ public class CheckBeatmapAvailableTranslates : CheckBeatmapProperty GetPropertyFromBeatmap(KaraokeBeatmap karaokeBeatmap) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapClassicStageInfo.cs b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapClassicStageInfo.cs index 47ec7a1bb..ce7f6be82 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapClassicStageInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapClassicStageInfo.cs @@ -34,7 +34,7 @@ public class CheckBeatmapClassicStageInfo : CheckBeatmapStageInfo new IssueTemplatePageIntervalTooShort(this), new IssueTemplatePageIntervalTooLong(this), new IssueTemplatePageIntervalShouldHaveAtLeastOneLyric(this), - new IssueTemplateLyricNotWrapIntoTime(this) + new IssueTemplateLyricNotWrapIntoTime(this), }; protected override PageInfo GetPropertyFromBeatmap(KaraokeBeatmap karaokeBeatmap) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricReferenceLyric.cs b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricReferenceLyric.cs index 5d4e549b5..11b52247b 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricReferenceLyric.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricReferenceLyric.cs @@ -18,7 +18,7 @@ public class CheckLyricReferenceLyric : CheckHitObjectReferenceProperty CheckReferenceProperty(Lyric lyric, IEnumerable allAvailableReferencedHitObjects) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricTime.cs b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricTime.cs index 585d93e92..eebbbb99a 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricTime.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckLyricTime.cs @@ -17,7 +17,7 @@ public class CheckLyricTime : CheckHitObjectProperty { new IssueTemplateLyricTimeOverlapping(this), new IssueTemplateLyricStartTimeInvalid(this), - new IssueTemplateLyricEndTimeInvalid(this) + new IssueTemplateLyricEndTimeInvalid(this), }; protected override IEnumerable Check(Lyric lyric) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckNoteTime.cs b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckNoteTime.cs index f78b8fcbc..fa3e8ca1b 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckNoteTime.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Checks/CheckNoteTime.cs @@ -20,7 +20,7 @@ public class CheckNoteTime : CheckHitObjectProperty { new IssueTemplateNoteInvalidReferenceTimeTagTime(this), new IssueTemplateNoteDurationTooShort(this), - new IssueTemplateNoteDurationTooLong(this) + new IssueTemplateNoteDurationTooLong(this), }; protected override IEnumerable Check(Note note) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Components/Containers/Section.cs b/osu.Game.Rulesets.Karaoke/Edit/Components/Containers/Section.cs index df31833a8..0e2704df9 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Components/Containers/Section.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Components/Containers/Section.cs @@ -42,8 +42,8 @@ protected Section() AutoSizeAxes = Axes.Y, Spacing = new Vector2(SECTION_SPACING), Direction = FillDirection.Vertical, - Margin = new MarginPadding { Top = 30 } - } + Margin = new MarginPadding { Top = 30 }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Components/Cursor/TimeTagTooltip.cs b/osu.Game.Rulesets.Karaoke/Edit/Components/Cursor/TimeTagTooltip.cs index c2ec029a1..2c09eae7b 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Components/Cursor/TimeTagTooltip.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Components/Cursor/TimeTagTooltip.cs @@ -35,11 +35,11 @@ public TimeTagTooltip() { new Dimension(GridSizeMode.Absolute, time_display_height), new Dimension(GridSizeMode.Absolute, BORDER), - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, ColumnDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, Content = new[] { @@ -47,8 +47,8 @@ public TimeTagTooltip() { trackTimer = new OsuSpriteText { - Font = OsuFont.GetFont(size: 21, fixedWidth: true) - } + Font = OsuFont.GetFont(size: 21, fixedWidth: true), + }, }, null, new Drawable[] @@ -61,16 +61,16 @@ public TimeTagTooltip() { index = new OsuSpriteText { - Font = OsuFont.GetFont(size: 12) + Font = OsuFont.GetFont(size: 12), }, indexState = new OsuSpriteText { - Font = OsuFont.GetFont(size: 12) - } - } - } - } - } + Font = OsuFont.GetFont(size: 12), + }, + }, + }, + }, + }, }; } @@ -79,7 +79,7 @@ protected override Drawable SetBackground() return background = new Box { RelativeSizeAxes = Axes.X, - Height = time_display_height + BORDER + Height = time_display_height + BORDER, }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Components/Sprites/DrawableLayoutPreview.cs b/osu.Game.Rulesets.Karaoke/Edit/Components/Sprites/DrawableLayoutPreview.cs index afbc5d38b..96e7d661a 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Components/Sprites/DrawableLayoutPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Components/Sprites/DrawableLayoutPreview.cs @@ -31,17 +31,17 @@ public DrawableLayoutPreview() { background = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, previewLyric = new Box { - Height = 15 + Height = 15, }, notSupportText = new OsuSpriteText { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }; previewLyric.Hide(); @@ -114,7 +114,7 @@ private void updateLayout() Left = Layout.Alignment.HasFlagFast(Anchor.x0) ? horizontalMargin : 0, Right = Layout.Alignment.HasFlagFast(Anchor.x2) ? horizontalMargin : 0, Top = Layout.Alignment.HasFlagFast(Anchor.y0) ? verticalMargin : 0, - Bottom = Layout.Alignment.HasFlagFast(Anchor.y2) ? verticalMargin : 0 + Bottom = Layout.Alignment.HasFlagFast(Anchor.y2) ? verticalMargin : 0, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Components/UserInterfaceV2/NoteEditPopover.cs b/osu.Game.Rulesets.Karaoke/Edit/Components/UserInterfaceV2/NoteEditPopover.cs index e1f281dc0..e9d80e121 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Components/UserInterfaceV2/NoteEditPopover.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Components/UserInterfaceV2/NoteEditPopover.cs @@ -33,8 +33,8 @@ public NoteEditPopover(Note note) Children = new Section[] { new NoteSection(note), - } - } + }, + }, }; } @@ -57,21 +57,21 @@ public NoteSection(Note note) Label = "Text", Description = "The text display on the note.", Current = note.TextBindable, - TabbableContentContainer = this + TabbableContentContainer = this, }, rubyText = new LabelledTextBox { Label = "Ruby text", Description = "Should place something like ruby, 拼音 or ふりがな.", Current = note.RubyTextBindable, - TabbableContentContainer = this + TabbableContentContainer = this, }, display = new LabelledSwitchButton { Label = "Display", Description = "This note will be hidden and not scorable if not display.", Current = note.DisplayBindable, - } + }, }; ScheduleAfterChildren(() => diff --git a/osu.Game.Rulesets.Karaoke/Edit/EditorNotePlayfield.cs b/osu.Game.Rulesets.Karaoke/Edit/EditorNotePlayfield.cs index 6067b5ea5..c45905b69 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/EditorNotePlayfield.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/EditorNotePlayfield.cs @@ -28,7 +28,7 @@ public EditorNotePlayfield(int columns) Name = "Background", RelativeSizeAxes = Axes.Both, Colour = Color4.Black, - Alpha = 0.5f + Alpha = 0.5f, }, }); @@ -36,7 +36,7 @@ public EditorNotePlayfield(int columns) { Name = "Scoring Visualization", RelativeSizeAxes = Axes.Both, - Alpha = 0.6f + Alpha = 0.6f, }); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Export/ExportLyricManager.cs b/osu.Game.Rulesets.Karaoke/Edit/Export/ExportLyricManager.cs index 6f3c68ac9..8a9592bb7 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Export/ExportLyricManager.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Export/ExportLyricManager.cs @@ -38,7 +38,7 @@ public void ExportToLrc() var encoder = new LrcEncoder(); sw.WriteLine(encoder.Encode(new Beatmap { - HitObjects = beatmap.HitObjects.ToList() + HitObjects = beatmap.HitObjects.ToList(), })); } @@ -56,7 +56,7 @@ public void ExportToText() var encoder = new LyricTextEncoder(); sw.WriteLine(encoder.Encode(new Beatmap { - HitObjects = beatmap.HitObjects.ToList() + HitObjects = beatmap.HitObjects.ToList(), })); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Pages/PageGeneratorConfig.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Pages/PageGeneratorConfig.cs index d1a8daf9a..2f2023141 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Pages/PageGeneratorConfig.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Pages/PageGeneratorConfig.cs @@ -12,14 +12,14 @@ public class PageGeneratorConfig : GeneratorConfig public Bindable MinTime { get; } = new BindableDouble(CheckBeatmapPageInfo.MIN_INTERVAL) { MinValue = CheckBeatmapPageInfo.MIN_INTERVAL, - MaxValue = CheckBeatmapPageInfo.MAX_INTERVAL + MaxValue = CheckBeatmapPageInfo.MAX_INTERVAL, }; [ConfigSource("Max time", "Max interval between pages.")] public Bindable MaxTime { get; } = new BindableDouble(CheckBeatmapPageInfo.MAX_INTERVAL) { MinValue = CheckBeatmapPageInfo.MIN_INTERVAL, - MaxValue = CheckBeatmapPageInfo.MAX_INTERVAL + MaxValue = CheckBeatmapPageInfo.MAX_INTERVAL, }; [ConfigSource("Clear the exist page.", "Clear the exist page after generated.")] diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGenerator.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGenerator.cs index 2b07ecfb5..81989c221 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGenerator.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGenerator.cs @@ -101,7 +101,7 @@ static string generateName(ClassicLyricLayoutAlignment alignment) => ClassicLyricLayoutAlignment.Left => "Left", ClassicLyricLayoutAlignment.Center => "Center", ClassicLyricLayoutAlignment.Right => "Right", - _ => throw new ArgumentOutOfRangeException(nameof(alignment), alignment, null) + _ => throw new ArgumentOutOfRangeException(nameof(alignment), alignment, null), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorConfig.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorConfig.cs index 289266caa..6c41cba5b 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorConfig.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicLyricLayoutCategoryGeneratorConfig.cs @@ -31,6 +31,6 @@ public class ClassicLyricLayoutCategoryGeneratorConfig : GeneratorConfig public BindableFloat HorizontalMargin { get; } = new() { MinValue = 32, - MaxValue = 100 + MaxValue = 100, }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGenerator.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGenerator.cs index 5185ba7ea..bf0d08c50 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGenerator.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Beatmaps/Stages/Classic/ClassicStageInfoGenerator.cs @@ -36,7 +36,7 @@ protected override StageInfo GenerateFromItem(KaraokeBeatmap item) LyricRowAmount = { Value = lyricRowAmount, - } + }, }); // it's OK not to get the config in the config manager. @@ -45,7 +45,7 @@ protected override StageInfo GenerateFromItem(KaraokeBeatmap item) LyricRowAmount = { Value = lyricRowAmount, - } + }, }); return new ClassicStageInfo diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/ConfigCategoryAttribute.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/ConfigCategoryAttribute.cs index 415d5a5f4..ade0843fb 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/ConfigCategoryAttribute.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/ConfigCategoryAttribute.cs @@ -25,7 +25,7 @@ public override bool Equals(object? obj) return obj switch { ConfigCategoryAttribute category => Equals(category), - _ => false + _ => false, }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/Notes/NoteGenerator.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/Notes/NoteGenerator.cs index 3b332efe8..365fb3509 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/Notes/NoteGenerator.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/Notes/NoteGenerator.cs @@ -66,7 +66,7 @@ protected override Note[] GenerateFromItem(Lyric item) ReferenceLyricId = item.ID, // technically this property should be assigned by beatmap processor, but should be OK to assign here for testing purpose. ReferenceLyric = item, - ReferenceTimeTagIndex = timeTagIndex + ReferenceTimeTagIndex = timeTagIndex, }); } } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RomajiTags/Ja/JaRomajiTagGenerator.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RomajiTags/Ja/JaRomajiTagGenerator.cs index 90ea63e5c..8261ce4f3 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RomajiTags/Ja/JaRomajiTagGenerator.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RomajiTags/Ja/JaRomajiTagGenerator.cs @@ -69,8 +69,8 @@ protected override RomajiTag[] GenerateFromItem(Lyric item) { Text = romaji, StartIndex = offsetAtt.StartOffset, - EndIndex = offsetAtt.EndOffset - 1 - } + EndIndex = offsetAtt.EndOffset - 1, + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RubyTags/Ja/JaRubyTagGenerator.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RubyTags/Ja/JaRubyTagGenerator.cs index ed38b8d9a..b380216e5 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RubyTags/Ja/JaRubyTagGenerator.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Generator/Lyrics/RubyTags/Ja/JaRubyTagGenerator.cs @@ -67,7 +67,7 @@ protected override RubyTag[] GenerateFromItem(Lyric item) { Text = Config.RubyAsKatakana.Value ? katakana : hiragana, StartIndex = offsetAtt.StartOffset, - EndIndex = offsetAtt.EndOffset - 1 + EndIndex = offsetAtt.EndOffset - 1, }); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/KaraokeBlueprintContainer.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeBlueprintContainer.cs index 31008aba3..d072ebe27 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/KaraokeBlueprintContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/KaraokeBlueprintContainer.cs @@ -23,7 +23,7 @@ public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObjec { Note note => new NoteSelectionBlueprint(note), Lyric lyric => new LyricSelectionBlueprint(lyric), - _ => throw new ArgumentOutOfRangeException(nameof(hitObject)) + _ => throw new ArgumentOutOfRangeException(nameof(hitObject)), }; protected override SelectionHandler CreateSelectionHandler() => new KaraokeSelectionHandler(); diff --git a/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs index 4451e68c5..29d86faf8 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs @@ -158,7 +158,7 @@ protected void CreateMenuBar() Items = new MenuItem[] { new NoteEditorPreviewMenu(editConfigManager, "Note editor"), - } + }, }, new("Tools") { @@ -166,16 +166,16 @@ protected void CreateMenuBar() { // todo: remove this menu until we have a better way to edit skin. new KaraokeSkinEditorMenu(editor, null!, "Skin editor"), - new KaraokeEditorMenu(editor, "Karaoke editor") - } + new KaraokeEditorMenu(editor, "Karaoke editor"), + }, }, new("Debug") { Items = new MenuItem[] { new EditorMenuItem("Export to json beatmap", MenuItemType.Destructive, () => exportLyricManager.ExportToJsonBeatmap()), - } - } + }, + }, }; }); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/KaraokeSelectionHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeSelectionHandler.cs index 3365e5c66..25a491730 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/KaraokeSelectionHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/KaraokeSelectionHandler.cs @@ -51,7 +51,7 @@ protected override IEnumerable GetContextMenuItemsForSelection(IEnumer { return new[] { - createSingerMenuItem() + createSingerMenuItem(), }; } @@ -133,7 +133,7 @@ private void performColumnMovement(Tone lastTone, MoveSelectionEvent { > trigger_height => -new Tone { Half = true }, < 0 => new Tone { Half = true }, - _ => default + _ => default, }; if (offset == default(Tone)) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs index 179790b87..59629d713 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs @@ -58,14 +58,14 @@ private void load() new SingerCircle { Current = { BindTarget = Current }, - DeleteRequested = () => DeleteRequested?.Invoke(this) + DeleteRequested = () => DeleteRequested?.Invoke(this), }, singerName = new OsuSpriteText { Anchor = Anchor.TopCentre, - Origin = Anchor.TopCentre - } - } + Origin = Anchor.TopCentre, + }, + }, }; Current.BindValueChanged(singer => singerName.Text = singer.NewValue?.Name ?? "unknown singer", true); @@ -101,7 +101,7 @@ public SingerCircle() Anchor = Anchor.Centre, Origin = Anchor.Centre, RelativeSizeAxes = Axes.Both, - } + }, }; } @@ -120,7 +120,7 @@ private void updateSinger() public MenuItem[] ContextMenuItems => new MenuItem[] { - new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteRequested?.Invoke()) + new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteRequested?.Invoke()), }; public ITooltip GetCustomTooltip() => new SingerToolTip(); diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs index 6ab087d0e..42542ccae 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs @@ -60,7 +60,7 @@ private void load() RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Spacing = new Vector2(10), - Direction = FillDirection.Full + Direction = FillDirection.Full, }; } @@ -90,7 +90,7 @@ private void updateSingers() singers.Add(display = new SingerDisplay { - Current = { Value = Singers[singerIndex] } + Current = { Value = Singers[singerIndex] }, }); // todo : might check does this like works because singer is object. @@ -103,8 +103,8 @@ private void updateSingers() // todo : use better way to create singer with right id. Action = () => Singers.Add(new Singer { - Name = "New singer" - }) + Name = "New singer", + }), }); reindexItems(); @@ -159,24 +159,24 @@ public AddSingerButton() { RelativeSizeAxes = Axes.Both, Colour = Colour4.Transparent, - AlwaysPresent = true + AlwaysPresent = true, }, new SpriteIcon { Anchor = Anchor.Centre, Origin = Anchor.Centre, Size = new Vector2(20), - Icon = FontAwesome.Solid.Plus - } - } + Icon = FontAwesome.Solid.Plus, + }, + }, }, new OsuSpriteText { Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, - Text = "New" - } - } + Text = "New", + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSetupSection.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSetupSection.cs index efcc2fb92..8a210e066 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSetupSection.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSetupSection.cs @@ -32,15 +32,15 @@ private void load() { Label = "Scorable", Description = "Will not show score playfield if the option is unchecked.", - Current = { Value = true } + Current = { Value = true }, }, singerList = new LabelledSingerList { Label = "Singer list", Description = "All the singers in beatmap.", FixedLabelWidth = LABEL_WIDTH, - SingerNamePrefix = "#" - } + SingerNamePrefix = "#", + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Utils/HitObjectWritableUtils.cs b/osu.Game.Rulesets.Karaoke/Edit/Utils/HitObjectWritableUtils.cs index 5b8677d93..c7ce1710d 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Utils/HitObjectWritableUtils.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Utils/HitObjectWritableUtils.cs @@ -90,7 +90,7 @@ private static bool isWriteLyricPropertyLockedByState(LockState lockState, strin // base class nameof(Lyric.Samples) => false, nameof(Lyric.LegacyBpmMultiplier) => false, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; } @@ -118,10 +118,10 @@ private static bool isWriteLyricPropertyLockedByConfig(IReferenceLyricPropertyCo // base class nameof(Lyric.Samples) => false, nameof(Lyric.LegacyBpmMultiplier) => false, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }, null => false, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; } @@ -149,7 +149,7 @@ private static bool isCreateOrRemoveNoteLocked(IReferenceLyricPropertyConfig? co ReferenceLyricConfig => false, SyncLyricConfig => true, null => false, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/BackgroundToolTip.cs b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/BackgroundToolTip.cs index 88de91741..267dd64a2 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/BackgroundToolTip.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/BackgroundToolTip.cs @@ -32,7 +32,7 @@ protected BackgroundToolTip() { background = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, SetBackground(), content = new Container @@ -40,8 +40,8 @@ protected BackgroundToolTip() AutoSizeAxes = Axes.Both, AutoSizeDuration = 200, AutoSizeEasing = Easing.OutQuint, - Padding = new MarginPadding(ContentPadding) - } + Padding = new MarginPadding(ContentPadding), + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/LyricToolTip.cs b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/LyricToolTip.cs index 647ad2bf8..c52979f14 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/LyricToolTip.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/LyricToolTip.cs @@ -24,7 +24,7 @@ public override void SetContent(Lyric lyric) Margin = new MarginPadding(10), Font = new FontUsage(size: 32), RubyFont = new FontUsage(size: 12), - RomajiFont = new FontUsage(size: 12) + RomajiFont = new FontUsage(size: 12), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs index bb0fb4adb..00a8159e1 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs @@ -99,7 +99,7 @@ public SingerToolTip() RelativeSizeAxes = Axes.X, ShowTooltip = false, }, - } + }, }, singerEnglishName = new TruncatingSpriteText { @@ -109,11 +109,11 @@ public SingerToolTip() Font = OsuFont.GetFont(weight: FontWeight.Bold, size: sub_text_size), RelativeSizeAxes = Axes.X, ShowTooltip = false, - } - } - } - } - } + }, + }, + }, + }, + }, }, singerDescription = new OsuSpriteText { @@ -122,8 +122,8 @@ public SingerToolTip() Colour = Color4.White.Opacity(0.75f), Font = OsuFont.Default.With(size: 14), Name = "Description", - } - } + }, + }, }; bindableName.BindValueChanged(e => singerName.Text = e.NewValue, true); diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Shapes/RightTriangle.cs b/osu.Game.Rulesets.Karaoke/Graphics/Shapes/RightTriangle.cs index cc0a434ee..63d020a4b 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Shapes/RightTriangle.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Shapes/RightTriangle.cs @@ -50,7 +50,7 @@ private static Triangle toTriangle(Quad q, TriangleRightAngleDirection rightAngl TriangleRightAngleDirection.TopRight => new Triangle(q.TopLeft, q.TopRight, q.BottomRight), TriangleRightAngleDirection.BottomLeft => new Triangle(q.TopLeft, q.BottomLeft, q.BottomRight), TriangleRightAngleDirection.BottomRight => new Triangle(q.TopRight, q.BottomLeft, q.BottomRight), - _ => throw new ArgumentOutOfRangeException(nameof(rightAngleDirection), rightAngleDirection, null) + _ => throw new ArgumentOutOfRangeException(nameof(rightAngleDirection), rightAngleDirection, null), }; public override bool Contains(Vector2 screenSpacePos) => toTriangle(ScreenSpaceDrawQuad, RightAngleDirection).Contains(screenSpacePos); diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs index d66e83430..8f80a6f6f 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs @@ -26,7 +26,7 @@ public DrawableSingerAvatar() RelativeSizeAxes = Axes.Both, FillMode = FillMode.Fit, Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }; } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs index af4e6fa17..1e2b97db5 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs @@ -58,7 +58,7 @@ public CircleCheckbox() Icon = FontAwesome.Solid.Check, Scale = new Vector2(0), }, - new HoverSounds() + new HoverSounds(), }; Current.DisabledChanged += disabled => diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs index 503e367d9..5329d7393 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs @@ -73,9 +73,9 @@ public MicrophoneSoundVisualizer() Anchor = Anchor.Centre, Origin = Anchor.Centre, }, - } - } - } + }, + }, + }, }; updateDeviceInfo(); @@ -124,7 +124,7 @@ protected override bool Handle(UIEvent e) MicrophoneStartPitchingEvent microphoneStartPitching => OnMicrophoneStartSinging(microphoneStartPitching), MicrophoneEndPitchingEvent microphoneEndPitching => OnMicrophoneEndSinging(microphoneEndPitching), MicrophonePitchingEvent microphonePitching => OnMicrophoneSinging(microphonePitching), - _ => base.Handle(e) + _ => base.Handle(e), }; } @@ -183,7 +183,7 @@ public MicrophoneInfo() Padding = new MarginPadding { Top = 20, - Left = 15 + Left = 15, }, Spacing = new Vector2(15), Direction = FillDirection.Horizontal, @@ -192,16 +192,16 @@ public MicrophoneInfo() microphoneIcon = new SpriteIcon { Size = new Vector2(24), - Icon = FontAwesome.Solid.Microphone + Icon = FontAwesome.Solid.Microphone, }, deviceName = new TruncatingSpriteText { Width = 250, Font = OsuFont.Default.With(size: 20), Text = "Microphone name", - } - } - } + }, + }, + }, }; } @@ -339,8 +339,8 @@ public PitchVisualizer() Spacing = new Vector2(spacing), Children = Enumerable.Range(0, dot_amount).Select(i => new PitchDot { - Colour = calculateDotColour(i, 0.8f) - }).ToArray() + Colour = calculateDotColour(i, 0.8f), + }).ToArray(), }, currentDot = new PitchDot { @@ -418,9 +418,9 @@ public PitchDot() { Colour = Color4.White, RelativeSizeAxes = Axes.Both, - } + }, }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs index 65e6fc581..37cd8a869 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs @@ -110,7 +110,7 @@ protected override bool OnClick(ClickEvent e) public virtual IEnumerable FilterTerms => new[] { - new LocalisableString(Model?.ToString() ?? string.Empty) + new LocalisableString(Model?.ToString() ?? string.Empty), }; protected virtual void CreateDisplayContent(OsuTextFlowContainer textFlowContainer, TModel model) diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs index 94a40cf24..6cc447ca1 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs @@ -74,7 +74,7 @@ public SingerDisplay() { Singer = singer, Name = "Avatar", - Size = new Vector2(32) + Size = new Vector2(32), }); } @@ -152,5 +152,5 @@ public enum ExpansionMode /// /// The will always be contracted. /// - AlwaysContracted + AlwaysContracted, } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs index 8e0f264ad..3b6948f0e 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs @@ -71,7 +71,7 @@ public FontSelector() RowDimensions = new[] { new Dimension(GridSizeMode.Relative, 0.4f), - new Dimension() + new Dimension(), }, Content = new[] { @@ -81,8 +81,8 @@ public FontSelector() { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Text = "カラオケ, karaoke" - } + Text = "カラオケ, karaoke", + }, }, new Drawable[] { @@ -106,12 +106,12 @@ public FontSelector() familyProperty = new FontFamilyPropertyList { Name = "Font family selection area", - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, weightProperty = new FontPropertyList { Name = "Font widget selection area", - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, new GridContainer { @@ -140,15 +140,15 @@ public FontSelector() Padding = new MarginPadding(10), LabelText = "FixedWidth", }, - } - } - } + }, + }, + }, }, - } - } - } - } - } + }, + }, + }, + }, + }, }; fonts.BindCollectionChanged((_, b) => @@ -302,7 +302,7 @@ public FontFormatBadge(FontFormat fontFormat) { box = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, badgeText = new OsuSpriteText { @@ -310,9 +310,9 @@ public FontFormatBadge(FontFormat fontFormat) Margin = new MarginPadding { Vertical = 1, - Horizontal = 3 + Horizontal = 3, }, - } + }, }; } @@ -324,7 +324,7 @@ private void load(OsuColour colours) FontFormat.Internal => colours.Gray7, FontFormat.Fnt => colours.Pink, FontFormat.Ttf => colours.Blue, - _ => throw new ArgumentOutOfRangeException(nameof(fontFormat)) + _ => throw new ArgumentOutOfRangeException(nameof(fontFormat)), }; // todo : might apply translate. @@ -359,7 +359,7 @@ public FontPropertyList() { background = new CornerBackground { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, new GridContainer { @@ -367,7 +367,7 @@ public FontPropertyList() RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 40), - new Dimension() + new Dimension(), }, Content = new[] { @@ -376,7 +376,7 @@ public FontPropertyList() filter = new TextPropertySearchTextBox { RelativeSizeAxes = Axes.X, - } + }, }, new Drawable[] { @@ -387,11 +387,11 @@ public FontPropertyList() { Current.Value = item; }; - }) - } - } - } - } + }), + }, + }, + }, + }, }; filter.Current.BindValueChanged(e => propertyFlowList.Filter(e.NewValue)); diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledColourSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledColourSelector.cs index 6cf601211..894c4636c 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledColourSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledColourSelector.cs @@ -67,18 +67,18 @@ private void load(OsuColour colours) { fill = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, colourHexCode = new OsuSpriteText { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Font = OsuFont.Default.With(size: 12) - } + Font = OsuFont.Default.With(size: 12), + }, }, - Action = this.ShowPopover + Action = this.ShowPopover, }, - } + }, }; } @@ -100,8 +100,8 @@ private void updateColour() { Child = new OsuColourPicker { - Current = { BindTarget = Current } - } + Current = { BindTarget = Current }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledHueSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledHueSelector.cs index ca90ab2ff..4cd50e1bf 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledHueSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledHueSelector.cs @@ -28,7 +28,7 @@ protected override OsuHueSelector CreateComponent() Type = EdgeEffectType.Shadow, Offset = new Vector2(0, 1), Radius = 3, - Colour = Colour4.Black.Opacity(0.3f) + Colour = Colour4.Black.Opacity(0.3f), }; /// @@ -80,8 +80,8 @@ public SliderNub(OsuHueSelector osuHueSelector) EdgeEffect = createShadowParameters(), Child = fill = new Box { - RelativeSizeAxes = Axes.Both - } + RelativeSizeAxes = Axes.Both, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs index 2289af34e..8c082ddbd 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs @@ -43,7 +43,7 @@ public LanguageSelector() RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 40), - new Dimension() + new Dimension(), }, Content = new[] { @@ -52,7 +52,7 @@ public LanguageSelector() filter = new LanguageSelectionSearchTextBox { RelativeSizeAxes = Axes.X, - } + }, }, new Drawable[] { @@ -63,9 +63,9 @@ public LanguageSelector() { Current.Value = item.CultureInfo; }, - } - } - } + }, + }, + }, }; filter.Current.BindValueChanged(e => languageList.Filter(e.NewValue)); diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ElementIdConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ElementIdConverter.cs index fa9b48a2a..546040137 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ElementIdConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ElementIdConverter.cs @@ -23,7 +23,7 @@ public class ElementIdConverter : JsonConverter { null => null, "" => ElementId.Empty, - _ => new ElementId(str) + _ => new ElementId(str), }; public override void WriteJson(JsonWriter writer, ElementId? value, JsonSerializer serializer) diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/FontUsageConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/FontUsageConverter.cs index 44c432dbe..c6ab69cf2 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/FontUsageConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/FontUsageConverter.cs @@ -30,7 +30,7 @@ public override FontUsage ReadJson(JsonReader reader, Type objectType, FontUsage "size" => current.With(size: property.Value.ToObject()), "italics" => current.With(italics: property.Value.ToObject()), "fixedWidth" => current.With(fixedWidth: property.Value.ToObject()), - _ => current + _ => current, }); } diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinElementConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinElementConverter.cs index 70192847e..8d3af92ab 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinElementConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinElementConverter.cs @@ -22,7 +22,7 @@ public static ElementType GetElementType(MemberInfo elementType) => _ when elementType == typeof(LyricLayout) => ElementType.LyricLayout, _ when elementType == typeof(LyricStyle) => ElementType.LyricStyle, _ when elementType == typeof(NoteStyle) => ElementType.NoteStyle, - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; public static Type GetObjectType(ElementType elementType) => @@ -32,6 +32,6 @@ public static Type GetObjectType(ElementType elementType) => ElementType.LyricLayout => typeof(LyricLayout), ElementType.LyricStyle => typeof(LyricStyle), ElementType.NoteStyle => typeof(NoteStyle), - _ => throw new NotSupportedException() + _ => throw new NotSupportedException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs index 9ab7d9210..ddbff740f 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs @@ -29,7 +29,7 @@ public override RomajiTag ReadJson(JsonReader reader, Type objectType, RomajiTag { StartIndex = result.GetGroupValue("start"), EndIndex = result.GetGroupValue("end") ?? result.GetGroupValue("start"), - Text = result.GetGroupValue("romaji") + Text = result.GetGroupValue("romaji"), }; } diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs index e236f99ec..69fc0ec20 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs @@ -29,7 +29,7 @@ public override RubyTag ReadJson(JsonReader reader, Type objectType, RubyTag? ex { StartIndex = result.GetGroupValue("start"), EndIndex = result.GetGroupValue("end") ?? result.GetGroupValue("start"), - Text = result.GetGroupValue("ruby") + Text = result.GetGroupValue("ruby"), }; } diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/StageInfoConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/StageInfoConverter.cs index 770e94591..c4123b509 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/StageInfoConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/StageInfoConverter.cs @@ -19,7 +19,7 @@ protected override string GetNameByType(MemberInfo type) => { Type t when t == typeof(ClassicStageInfo) => classic_stage, Type t when t == typeof(PreviewStageInfo) => preview_stage, - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; protected override Type GetTypeByName(string name) => @@ -27,6 +27,6 @@ protected override Type GetTypeByName(string name) => { classic_stage => typeof(ClassicStageInfo), preview_stage => typeof(PreviewStageInfo), - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ToneConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ToneConverter.cs index 0bba22bc5..582375198 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ToneConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ToneConverter.cs @@ -21,7 +21,7 @@ public override Tone ReadJson(JsonReader reader, Type objectType, Tone existingV return new Tone { Scale = scale, - Half = half + Half = half, }; } diff --git a/osu.Game.Rulesets.Karaoke/Judgements/KaraokeNoteJudgement.cs b/osu.Game.Rulesets.Karaoke/Judgements/KaraokeNoteJudgement.cs index f0b4e3b7a..da72ddbee 100644 --- a/osu.Game.Rulesets.Karaoke/Judgements/KaraokeNoteJudgement.cs +++ b/osu.Game.Rulesets.Karaoke/Judgements/KaraokeNoteJudgement.cs @@ -22,7 +22,7 @@ protected override double HealthIncreaseFor(HitResult result) HitResult.Good => 0.035, HitResult.Great => 0.055, HitResult.Perfect => 0.065, - _ => 0 + _ => 0, }; } } diff --git a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs index 9c8f315be..3021d6bb7 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs @@ -124,7 +124,7 @@ public override void HandleInputStateChange(InputStateChangeEvent inputStateChan var action = new KaraokeScoringAction { - Scale = scale + Scale = scale, }; if (lastVoice.HasVoice && !voice.HasVoice) diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs index 0fb6e4d87..4d18265b8 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs @@ -126,7 +126,7 @@ public override IEnumerable GetDefaultKeyBindings(int variant = 0) = new KeyBinding(InputKey.Enter, KaraokeEditAction.SetTime), new KeyBinding(InputKey.BackSpace, KaraokeEditAction.ClearTime), }, - _ => Array.Empty() + _ => Array.Empty(), }; public override LocalisableString GetVariantName(int variant) @@ -165,7 +165,7 @@ public override IEnumerable GetModsFor(ModType type) => new KaraokeModDisableNote(), new KaraokeModSnow(), }, - _ => Array.Empty() + _ => Array.Empty(), }; public override Drawable CreateIcon() => new KaraokeIcon(this); @@ -233,7 +233,7 @@ public override LocalisableString GetDisplayNameForHitResult(HitResult result) HitResult.Great => "Great", HitResult.Ok => "OK", HitResult.Meh => "Meh", - _ => base.GetDisplayNameForHitResult(result) + _ => base.GetDisplayNameForHitResult(result), }; } @@ -250,13 +250,13 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm new("Info", () => new BeatmapInfoGraph(playableBeatmap) { RelativeSizeAxes = Axes.X, - Height = info_height + Height = info_height, }), new("Metadata", () => new BeatmapMetadataGraph(playableBeatmap) { RelativeSizeAxes = Axes.X, - Height = info_height - }) + Height = info_height, + }), }; // Set component to remain height @@ -267,7 +267,7 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm statistic.Add(new StatisticItem("Scoring Result", () => new ScoringResultGraph(score, playableBeatmap) { RelativeSizeAxes = Axes.X, - Height = remain_height - text_size - spacing + Height = remain_height - text_size - spacing, })); } else @@ -275,7 +275,7 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm statistic.Add(new StatisticItem("Result", () => new NotScorableGraph { RelativeSizeAxes = Axes.X, - Height = remain_height - text_size - spacing + Height = remain_height - text_size - spacing, })); } diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModFlashlight.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModFlashlight.cs index 970fc40fd..b3fe7f1cd 100644 --- a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModFlashlight.cs +++ b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModFlashlight.cs @@ -29,14 +29,14 @@ public partial class KaraokeModFlashlight : ModFlashlight MaxValue = 3f, Default = 1f, Value = 1f, - Precision = 0.1f + Precision = 0.1f, }; [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")] public override BindableBool ComboBasedSize { get; } = new() { Default = false, - Value = false + Value = false, }; public override float DefaultFlashlightSize => 50; diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModPractice.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModPractice.cs index a87abc547..4b6c984a6 100644 --- a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModPractice.cs +++ b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModPractice.cs @@ -34,7 +34,7 @@ public void ApplyToDrawableRuleset(DrawableRuleset drawableRul karaokePlayfield.DisplayCursor = new BindableBool { Default = true, - Value = true + Value = true, }; } } @@ -49,8 +49,8 @@ public void ApplyToOverlay(ISettingHUDOverlay overlay) { Expanded = { - Value = false - } + Value = false, + }, }); } } diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModSnow.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModSnow.cs index ba17e571d..e93ed727a 100644 --- a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModSnow.cs +++ b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModSnow.cs @@ -101,7 +101,7 @@ protected override void Update() Size = new Vector2(50, 50), Scale = new Vector2(1, 1) * SnowSize, Alpha = currentAlpha, - HorizontalSpeed = RNG.Next(-100, 100) + WingAffection * 10 + HorizontalSpeed = RNG.Next(-100, 100) + WingAffection * 10, }; Add(newFlake); } diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModWindowsUpdate.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModWindowsUpdate.cs index 4789e31c3..959c63ba9 100644 --- a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModWindowsUpdate.cs +++ b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModWindowsUpdate.cs @@ -42,7 +42,7 @@ protected override bool FailCondition(HealthProcessor healthProcessor, Judgement { overlay.Add(windowsUpdateContainer = new WindowsUpdateContainer { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }); } @@ -59,7 +59,7 @@ public WindowsUpdateContainer() { Name = "Background", RelativeSizeAxes = Axes.Both, - Colour = new Color4(0, 120, 215, 255) + Colour = new Color4(0, 120, 215, 255), }, new LoadingIcon { @@ -94,7 +94,7 @@ public WindowsUpdateContainer() Origin = Anchor.Centre, Scale = new Vector2(1.3f), Y = -30, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableBarLine.cs index c9e9c3518..f0981d087 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableBarLine.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableBarLine.cs @@ -82,7 +82,7 @@ private void load() Origin = Anchor.Centre, Size = new Vector2(triangle_width), Y = -triangle_offset, - Rotation = 180 + Rotation = 180, }, new EquilateralTriangle { @@ -91,10 +91,10 @@ private void load() Origin = Anchor.Centre, Size = new Vector2(triangle_width), Y = triangle_offset, - Rotation = 0 - } - } - } + Rotation = 0, + }, + }, + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Objects/Stages/Classic/LyricClassicStageEffectApplier.cs b/osu.Game.Rulesets.Karaoke/Objects/Stages/Classic/LyricClassicStageEffectApplier.cs index 6a4d1b18f..c73a86e13 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Stages/Classic/LyricClassicStageEffectApplier.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Stages/Classic/LyricClassicStageEffectApplier.cs @@ -56,7 +56,7 @@ static Anchor getLyricAnchor(ClassicLyricLayoutAlignment alignment) => ClassicLyricLayoutAlignment.Left => Anchor.BottomLeft, ClassicLyricLayoutAlignment.Center => Anchor.BottomCentre, ClassicLyricLayoutAlignment.Right => Anchor.BottomRight, - _ => throw new ArgumentOutOfRangeException(nameof(alignment), alignment, null) + _ => throw new ArgumentOutOfRangeException(nameof(alignment), alignment, null), }; static MarginPadding getPosition(ClassicStageDefinition definition, ClassicLyricLayout layout) diff --git a/osu.Game.Rulesets.Karaoke/Objects/Tone.cs b/osu.Game.Rulesets.Karaoke/Objects/Tone.cs index b3d76c74b..902545af2 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Tone.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Tone.cs @@ -40,7 +40,7 @@ public override bool Equals(object? obj) { Tone tone => Equals(tone), int intValue => Equals(intValue), - _ => false + _ => false, }; } @@ -53,7 +53,7 @@ public override bool Equals(object? obj) private static Tone add(Tone tone1, Tone tone2) => new() { Scale = tone1.Scale + tone2.Scale + (tone1.Half && tone2.Half ? 1 : 0), - Half = tone1.Half ^ tone2.Half + Half = tone1.Half ^ tone2.Half, }; public static Tone operator -(Tone tone1, Tone tone2) => subtract(tone1, tone2); @@ -66,7 +66,7 @@ public override bool Equals(object? obj) private static Tone negate(Tone tone) => tone with { - Scale = -tone.Scale + (tone.Half ? -1 : 0) + Scale = -tone.Scale + (tone.Half ? -1 : 0), }; public static bool operator ==(Tone tone1, Tone tone2) => tone1.Equals(tone2); diff --git a/osu.Game.Rulesets.Karaoke/Objects/Types/IHasLock.cs b/osu.Game.Rulesets.Karaoke/Objects/Types/IHasLock.cs index 460c1d0ec..1cc60860f 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Types/IHasLock.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Types/IHasLock.cs @@ -19,5 +19,5 @@ public enum LockState Partial, [Description("Full")] - Full + Full, } diff --git a/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricsUtils.cs b/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricsUtils.cs index 71280b294..7f19990a9 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricsUtils.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Utils/LyricsUtils.cs @@ -131,7 +131,7 @@ private static TimeTag[] shiftingTimeTag(IEnumerable timeTags, int offs { Text = t.Text, StartIndex = startIndex, - EndIndex = endIndex + EndIndex = endIndex, }; }).ToArray(); diff --git a/osu.Game.Rulesets.Karaoke/Objects/Utils/TextTagsUtils.cs b/osu.Game.Rulesets.Karaoke/Objects/Utils/TextTagsUtils.cs index 578e12285..b709890df 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Utils/TextTagsUtils.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Utils/TextTagsUtils.cs @@ -17,7 +17,7 @@ public static T[] Sort(IEnumerable textTags, Sorting sorting = Sorting.Asc { Sorting.Asc => textTags.OrderBy(x => x.StartIndex).ThenBy(x => x.EndIndex).ToArray(), Sorting.Desc => textTags.OrderByDescending(x => x.EndIndex).ThenByDescending(x => x.StartIndex).ToArray(), - _ => throw new InvalidEnumArgumentException(nameof(sorting)) + _ => throw new InvalidEnumArgumentException(nameof(sorting)), }; public static T[] FindOutOfRange(IEnumerable textTags, string lyric) where T : ITextTag @@ -96,7 +96,7 @@ public static T[] FindEmptyText(IEnumerable textTags) where T : ITextTag { StartIndex = firstValue.StartIndex, EndIndex = lastValue.EndIndex, - Text = string.Join(string.Empty, sortingValue.Select(x => x.Text)) + Text = string.Join(string.Empty, sortingValue.Select(x => x.Text)), }; } @@ -110,6 +110,6 @@ public enum Sorting /// /// Mark previous tag is error if conflict. /// - Desc + Desc, } } diff --git a/osu.Game.Rulesets.Karaoke/Objects/Utils/TimeTagsUtils.cs b/osu.Game.Rulesets.Karaoke/Objects/Utils/TimeTagsUtils.cs index 5e0be34df..7a3adffd0 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Utils/TimeTagsUtils.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Utils/TimeTagsUtils.cs @@ -306,7 +306,7 @@ public enum GroupCheck /// /// Mark previous tag is error if conflict. /// - Desc + Desc, } public enum SelfCheck diff --git a/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingPropertyValidator.cs b/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingPropertyValidator.cs index fba22a0fc..901f7ce30 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingPropertyValidator.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingPropertyValidator.cs @@ -25,7 +25,7 @@ protected override bool HasDataProperty(LyricWorkingProperty flags) => LyricWorkingProperty.Page => false, LyricWorkingProperty.ReferenceLyric => true, LyricWorkingProperty.EffectApplier => false, - _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null) + _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null), }; protected override bool IsWorkingPropertySynced(Lyric hitObject, LyricWorkingProperty flags) => @@ -38,7 +38,7 @@ protected override bool IsWorkingPropertySynced(Lyric hitObject, LyricWorkingPro LyricWorkingProperty.Page => true, LyricWorkingProperty.ReferenceLyric => isReferenceLyricSynced(hitObject), LyricWorkingProperty.EffectApplier => true, - _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null) + _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null), }; private bool isWorkingSingerSynced(Lyric lyric) diff --git a/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingPropertyValidator.cs b/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingPropertyValidator.cs index f3662b1ea..a30a23bf7 100644 --- a/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingPropertyValidator.cs +++ b/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingPropertyValidator.cs @@ -18,7 +18,7 @@ protected override bool HasDataProperty(NoteWorkingProperty flags) => NoteWorkingProperty.Page => false, NoteWorkingProperty.ReferenceLyric => true, NoteWorkingProperty.EffectApplier => false, - _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null) + _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null), }; protected override bool IsWorkingPropertySynced(Note hitObject, NoteWorkingProperty flags) => @@ -27,6 +27,6 @@ protected override bool IsWorkingPropertySynced(Note hitObject, NoteWorkingPrope NoteWorkingProperty.Page => true, NoteWorkingProperty.ReferenceLyric => hitObject.ReferenceLyric?.ID == hitObject.ReferenceLyricId, NoteWorkingProperty.EffectApplier => true, - _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null) + _ => throw new ArgumentOutOfRangeException(nameof(flags), flags, null), }; } diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangeLogMarkdownContainer.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangeLogMarkdownContainer.cs index c0665f869..7713136c9 100644 --- a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangeLogMarkdownContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangeLogMarkdownContainer.cs @@ -61,7 +61,7 @@ public partial class ChangeLogMarkdownTextFlowContainer : OsuMarkdownTextFlowCon { "launcher", "https://github.com/karaoke-dev/launcher/" }, { "sample", "https://github.com/karaoke-dev/sample-beatmap/" }, { "microphone-package", "https://github.com/karaoke-dev/osu-framework-microphone/" }, - { "font-package", "https://github.com/karaoke-dev/osu-framework-font/" } + { "font-package", "https://github.com/karaoke-dev/osu-framework-font/" }, }; protected override void AddLinkText(string text, LinkInline linkInline) @@ -98,7 +98,7 @@ protected override void AddLinkText(string text, LinkInline linkInline) AddDrawable(new OsuMarkdownLinkText($"{text}#{issue}", new LinkInline { - Url = new Uri(baseUri, $"pull/{issue}").AbsoluteUri + Url = new Uri(baseUri, $"pull/{issue}").AbsoluteUri, })); if (issue != issues.LastOrDefault()) @@ -124,7 +124,7 @@ protected override void AddLinkText(string text, LinkInline linkInline) }); AddDrawable(new UserLinkText(user, new LinkInline { - Url = $"https://github.com/{user}" + Url = $"https://github.com/{user}", }) { Scale = textScale, diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogBuild.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogBuild.cs index 9d171ef57..9a79d33fa 100644 --- a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogBuild.cs +++ b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogBuild.cs @@ -83,9 +83,9 @@ public ChangelogBuild(APIChangelogBuild build) Font = OsuFont.GetFont(weight: FontWeight.Light, size: 19), Colour = Color4.Red, }, - } - } + }, + }, }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogListing.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogListing.cs index 94fde6bba..a59f2208e 100644 --- a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogListing.cs +++ b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogListing.cs @@ -46,7 +46,7 @@ private void load(OverlayColourProvider colourProvider, Bindable SelectBuild?.Invoke(b) + SelectBuild = b => SelectBuild?.Invoke(b), }); fill.Insert(1, new NavigationIconButton(Build.Versions.Previous) { Icon = FontAwesome.Solid.ChevronRight, - SelectBuild = b => SelectBuild?.Invoke(b) + SelectBuild = b => SelectBuild?.Invoke(b), }); return fill; diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSection.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSection.cs index 238e975bf..f3406fdc4 100644 --- a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSection.cs +++ b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSection.cs @@ -51,9 +51,9 @@ public ChangelogSection(int year, IReadOnlyList posts) new PostsContainer { Expanded = { BindTarget = Expanded }, - Children = posts.Select(p => new PostButton(p)).ToArray() - } - } + Children = posts.Select(p => new PostButton(p)).ToArray(), + }, + }, }; } @@ -74,7 +74,7 @@ public PostButton(APIChangelogBuild post) { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - Text = post.DisplayVersion + Text = post.DisplayVersion, }; } @@ -121,7 +121,7 @@ public PostsContainer() AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical, Spacing = new Vector2(0, 5), - Alpha = 0 + Alpha = 0, }; } diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSidebar.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSidebar.cs index 07011d2e1..09e2cd1fa 100644 --- a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSidebar.cs +++ b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSidebar.cs @@ -34,7 +34,7 @@ private void load(OverlayColourProvider colourProvider, Bindable().Where(x => x.Display).ToArray(); return new Replay { - Frames = notes.SelectMany((element, index) => getReplayFrames(element, notes.ElementAtOrDefault(index + 1))).ToList() + Frames = notes.SelectMany((element, index) => getReplayFrames(element, notes.ElementAtOrDefault(index + 1))).ToList(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Replays/KaraokeAutoGeneratorBySinger.cs b/osu.Game.Rulesets.Karaoke/Replays/KaraokeAutoGeneratorBySinger.cs index 65788ce8c..f076dc45e 100644 --- a/osu.Game.Rulesets.Karaoke/Replays/KaraokeAutoGeneratorBySinger.cs +++ b/osu.Game.Rulesets.Karaoke/Replays/KaraokeAutoGeneratorBySinger.cs @@ -82,7 +82,7 @@ public override Replay Generate() var result = readTask.GetResultSafely(); return new Replay { - Frames = getReplayFrames(result).ToList() + Frames = getReplayFrames(result).ToList(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs b/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs index ff5ed2eb7..1a314beae 100644 --- a/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs @@ -26,10 +26,10 @@ protected override void CollectReplayInputs(List inputs) { new() { - Scale = CurrentFrame.Scale - } + Scale = CurrentFrame.Scale, + }, } - : new List() + : new List(), }); } } diff --git a/osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs b/osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs index cd19fba93..105fd65d9 100644 --- a/osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs +++ b/osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs @@ -18,7 +18,7 @@ public override bool IsHitResultAllowed(HitResult result) => result switch { DEFAULT_HIT_RESULT => true, - _ => false + _ => false, }; protected override DifficultyRange[] GetRanges() => lyric_ranges; diff --git a/osu.Game.Rulesets.Karaoke/Scoring/KaraokeNoteHitWindows.cs b/osu.Game.Rulesets.Karaoke/Scoring/KaraokeNoteHitWindows.cs index be1d712e0..7c97ee96a 100644 --- a/osu.Game.Rulesets.Karaoke/Scoring/KaraokeNoteHitWindows.cs +++ b/osu.Game.Rulesets.Karaoke/Scoring/KaraokeNoteHitWindows.cs @@ -19,7 +19,7 @@ public override bool IsHitResultAllowed(HitResult result) => { HitResult.Perfect => true, HitResult.Meh => true, - _ => false + _ => false, }; protected override DifficultyRange[] GetRanges() => karaoke_ranges; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSection.cs index cc298a0f3..b11ecef58 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSection.cs @@ -13,7 +13,7 @@ protected AutoGenerateSection() { Children = new[] { - CreateAutoGenerateSubsection() + CreateAutoGenerateSubsection(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSubsection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSubsection.cs index 2dc6d74f4..08c9acaa9 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSubsection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSubsection.cs @@ -44,11 +44,11 @@ private void load() { new Dimension(), new Dimension(GridSizeMode.Absolute, 5), - new Dimension(GridSizeMode.Absolute, 36) + new Dimension(GridSizeMode.Absolute, 36), }, RowDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, Content = new[] { @@ -61,8 +61,8 @@ private void load() x.Anchor = Anchor.Centre; x.Origin = Anchor.Centre; x.Size = new Vector2(36); - }) - } + }), + }, }, }, CreateDescriptionTextFlowContainer().With(x => @@ -71,7 +71,7 @@ private void load() x.AutoSizeAxes = Axes.Y; x.Padding = new MarginPadding { Horizontal = horizontal_padding }; x.Description = CreateInvalidDescriptionFormat(); - }) + }), }; }); } @@ -143,8 +143,8 @@ private Popover createSelectionPopover() selectedSetting = null; }, }; - }).ToList() - } + }).ToList(), + }, }; private partial class AutoGenerateButton : EditorSectionButton diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/BeatmapEditorRoundedScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/BeatmapEditorRoundedScreen.cs index 8690badd8..392b7b495 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/BeatmapEditorRoundedScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/BeatmapEditorRoundedScreen.cs @@ -49,8 +49,8 @@ private void load(OverlayColourProvider colourProvider) { RelativeSizeAxes = Axes.Both, }, - } - } + }, + }, }); } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/AutoFocusToEditLyricMenu.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/AutoFocusToEditLyricMenu.cs index 9936652c6..98080fd56 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/AutoFocusToEditLyricMenu.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/AutoFocusToEditLyricMenu.cs @@ -23,7 +23,7 @@ public AutoFocusToEditLyricMenu(KaraokeRulesetLyricEditorConfigManager config, s { var selections = new List { - new ToggleMenuItem(getName(disable_selection_index), MenuItemType.Standard, _ => updateAutoFocusToEditLyric()) + new ToggleMenuItem(getName(disable_selection_index), MenuItemType.Standard, _ => updateAutoFocusToEditLyric()), }; selections.AddRange(Enumerable.Range(0, 4).Select(x => new ToggleMenuItem(getName(x), MenuItemType.Standard, _ => updateAutoFocusToEditLyricSkipRows(x)))); Items = selections; @@ -50,7 +50,7 @@ private string getName(int number) { disable_selection_index => "Disable", 0 => "Enable", - _ => $"Enable (skip {number} rows)" + _ => $"Enable (skip {number} rows)", }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs index 3b732ca8c..0688d849b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LanguageSelectorPopover.cs @@ -18,7 +18,7 @@ public LanguageSelectorPopover(Bindable bindable) { Width = 260, Height = 400, - Current = bindable + Current = bindable, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs index 541ccab8d..ff4177fd6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs @@ -46,7 +46,7 @@ public LyricSelector() RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 40), - new Dimension() + new Dimension(), }, Content = new[] { @@ -55,7 +55,7 @@ public LyricSelector() filter = new LyricSelectionSearchTextBox { RelativeSizeAxes = Axes.X, - } + }, }, new Drawable[] { @@ -66,9 +66,9 @@ public LyricSelector() { Current.Value = item; }; - }) - } - } + }), + }, + }, }; filter.Current.BindValueChanged(e => lyricList.Filter(e.NewValue)); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/KaraokeBeatmapEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/KaraokeBeatmapEditor.cs index ca81ecd5e..94d1121bd 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/KaraokeBeatmapEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/KaraokeBeatmapEditor.cs @@ -80,7 +80,7 @@ protected override GenericEditorScreen GenerateS KaraokeBeatmapEditorScreenMode.Singer => new SingerScreen(), KaraokeBeatmapEditorScreenMode.Translate => new TranslateScreen(), KaraokeBeatmapEditorScreenMode.Page => new PageScreen(), - _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode") + _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode"), }; protected override MenuItem[] GenerateMenuItems(KaraokeBeatmapEditorScreenMode screenMode) @@ -100,7 +100,7 @@ protected override MenuItem[] GenerateMenuItems(KaraokeBeatmapEditorScreenMode s new EditorMenuItem("Export to text", MenuItemType.Standard, () => exportLyricManager.ExportToText()), new EditorMenuItem("Export to json", MenuItemType.Destructive, () => exportLyricManager.ExportToJson()), new EditorMenuItem("Export to json beatmap", MenuItemType.Destructive, () => exportLyricManager.ExportToJsonBeatmap()), - } + }, }, new LyricEditorModeMenu(bindableLyricEditorMode, "Mode"), new("View") @@ -110,14 +110,14 @@ protected override MenuItem[] GenerateMenuItems(KaraokeBeatmapEditorScreenMode s new LyricEditorPreferLayoutMenu(lyricEditorConfigManager, "Layout"), new LyricEditorTextSizeMenu(lyricEditorConfigManager, "Text size"), new AutoFocusToEditLyricMenu(lyricEditorConfigManager, "Auto focus to edit lyric"), - } + }, }, new("Config") { - Items = new MenuItem[] { new EditorMenuItem("Lyric editor"), new GeneratorConfigMenu("Auto-generator"), new LockStateMenu(lyricEditorConfigManager, "Lock") } + Items = new MenuItem[] { new EditorMenuItem("Lyric editor"), new GeneratorConfigMenu("Auto-generator"), new LockStateMenu(lyricEditorConfigManager, "Lock") }, }, }, - _ => Array.Empty() + _ => Array.Empty(), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithm.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithm.cs index a6823fcfb..238b0626f 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithm.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/CaretPosition/Algorithms/TimeTagCaretPositionAlgorithm.cs @@ -170,7 +170,7 @@ private bool timeTagMovable(TimeTag timeTag) MovingTimeTagCaretMode.None => true, MovingTimeTagCaretMode.OnlyStartTag => timeTag.Index.State == TextIndex.IndexState.Start, MovingTimeTagCaretMode.OnlyEndTag => timeTag.Index.State == TextIndex.IndexState.End, - _ => throw new InvalidOperationException(nameof(MovingTimeTagCaretMode)) + _ => throw new InvalidOperationException(nameof(MovingTimeTagCaretMode)), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/ClipboardToast.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/ClipboardToast.cs index 77aae991d..61331a418 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/ClipboardToast.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/ClipboardToast.cs @@ -34,5 +34,5 @@ public enum ClipboardAction Copy, [Description("Paste")] - Paste + Paste, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/BlueprintLayer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/BlueprintLayer.cs index 2450b30dc..771c57172 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/BlueprintLayer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/BlueprintLayer.cs @@ -54,7 +54,7 @@ protected void InitializeBlueprint() LyricEditorMode.EditRuby => new RubyBlueprintContainer(lyric), LyricEditorMode.EditRomaji => new RomajiBlueprintContainer(lyric), LyricEditorMode.EditTimeTag => modeWithSubMode.SubMode is TimeTagEditMode.Adjust ? new TimeTagBlueprintContainer(lyric) : null, - _ => null + _ => null, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/TextTagSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/TextTagSelectionBlueprint.cs index 51a3efa45..22339696c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/TextTagSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/TextTagSelectionBlueprint.cs @@ -45,7 +45,7 @@ protected TextTagSelectionBlueprint(T item) Alpha = 0f, AlwaysPresent = true, }, - } + }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs index ccdbc5ecd..99b20997b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs @@ -68,7 +68,7 @@ private void updateDrawableCaret(ICaretPosition? position, DrawableCaretType typ TimeTagIndexCaretPosition => new DrawableTimeTagIndexCaret(type), // record time-tag TimeTagCaretPosition => new DrawableTimeTagCaret(type), - _ => null + _ => null, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaret.cs index 84ff45cf5..b40064a0b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaret.cs @@ -27,7 +27,7 @@ protected static float GetAlpha(DrawableCaretType type) => { DrawableCaretType.HoverCaret => 0.5f, DrawableCaretType.Caret => 1, - _ => throw new ArgumentOutOfRangeException(nameof(type), type, null) + _ => throw new ArgumentOutOfRangeException(nameof(type), type, null), }; public sealed override void ApplyCaretPosition(ICaretPosition caret) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaretType.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaretType.cs index 49e5487b8..90a573344 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaretType.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCaretType.cs @@ -7,5 +7,5 @@ public enum DrawableCaretType { HoverCaret, - Caret + Caret, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCuttingCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCuttingCaret.cs index aee7fbb53..65d648bc7 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCuttingCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCuttingCaret.cs @@ -55,10 +55,10 @@ public DrawableCuttingCaret(DrawableCaretType type) Origin = Anchor.Centre, RelativeSizeAxes = Axes.Y, Width = 2, - EdgeSmoothness = new Vector2(1, 0) - } - } - } + EdgeSmoothness = new Vector2(1, 0), + }, + }, + }, }; switch (type) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagCaret.cs index 5324700f1..0ce5bc9e1 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagCaret.cs @@ -47,7 +47,7 @@ static double getMoveToDuration(DrawableCaretType type) => { DrawableCaretType.HoverCaret => 0, DrawableCaretType.Caret => 100, - _ => throw new ArgumentOutOfRangeException(nameof(type), type, null) + _ => throw new ArgumentOutOfRangeException(nameof(type), type, null), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagIndexCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagIndexCaret.cs index 9d548e67b..481fb3e96 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagIndexCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTimeTagIndexCaret.cs @@ -28,7 +28,7 @@ public DrawableTimeTagIndexCaret(DrawableCaretType type) RelativeSizeAxes = Axes.Both, Colour = Colour4.White, Alpha = 0.1f, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs index 5fe89b28c..319506b5d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableTypingCaret.cs @@ -34,7 +34,7 @@ public DrawableTypingCaret(DrawableCaretType type) { RelativeSizeAxes = Axes.Both, Colour = Color4.White, - Alpha = GetAlpha(Type) + Alpha = GetAlpha(Type), }; AddInternal(drawableCaret); @@ -214,7 +214,7 @@ static bool processTriggerDeleteText(PlatformAction action) => { // Deletion PlatformAction.DeleteBackwardChar => true, - _ => false + _ => false, }; static bool processTriggerMoveText(PlatformAction action) => @@ -227,7 +227,7 @@ static bool processTriggerMoveText(PlatformAction action) => PlatformAction.MoveForwardWord => true, PlatformAction.MoveBackwardLine => true, PlatformAction.MoveForwardLine => true, - _ => false + _ => false, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Components/DrawableTimeTag.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Components/DrawableTimeTag.cs index 36c4bf31d..42fdd9959 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Components/DrawableTimeTag.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Components/DrawableTimeTag.cs @@ -35,7 +35,7 @@ public DrawableTimeTag(TimeTag timeTag) { Name = "Text index", Size = new Vector2(triangle_width), - State = state + State = state, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs index 15ee1b9fc..26683ef0f 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs @@ -130,7 +130,7 @@ protected override void OnDrag(DragEvent e) NavigateCaretPosition => null, TimeTagIndexCaretPosition => karaokeSpriteText.GetCharIndexByPosition(position), TimeTagCaretPosition => karaokeSpriteText.GetTimeTagByPosition(position), - _ => null + _ => null, }; protected override void OnHoverLost(HoverLostEvent e) @@ -170,7 +170,7 @@ private void triggerWritableVersionChanged() LockLyricPropertyBy.ReferenceLyricConfig => "Cannot modify this property due to this lyric is property is sync from another lyric.", LockLyricPropertyBy.LockState => "This property is locked and not editable", null => default(LocalisableString?), - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } @@ -187,7 +187,7 @@ private void triggerWritableVersionChanged() LyricEditorMode.EditTimeTag => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.TimeTags)), LyricEditorMode.EditNote => HitObjectWritableUtils.GetCreateOrRemoveNoteLockedBy(lyric), LyricEditorMode.Singer => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.SingerIds)), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs index 6ee915c82..12ac4bd81 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/PreviewKaraokeSpriteText.cs @@ -133,7 +133,7 @@ public RectangleF GetRectByCharIndicator(int charIndex) { RubyTag rubyTag => spriteText.GetRubyTagPosition(rubyTag), RomajiTag romajiTag => spriteText.GetRomajiTagPosition(romajiTag), - _ => throw new ArgumentOutOfRangeException(nameof(textTag)) + _ => throw new ArgumentOutOfRangeException(nameof(textTag)), }; #endregion diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/TimeTagLayer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/TimeTagLayer.cs index eda259b13..121db8665 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/TimeTagLayer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/TimeTagLayer.cs @@ -36,7 +36,7 @@ private void updateTimeTags() var position = previewLyricPositionProvider.GetPositionByTimeTag(timeTag); AddInternal(new DrawableTimeTag(timeTag) { - Position = position + Position = position, }); } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagBlueprintContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagBlueprintContainer.cs index f8700975f..5f9c7e67d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagBlueprintContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagBlueprintContainer.cs @@ -126,7 +126,7 @@ protected override IEnumerable GetContextMenuItemsForSelection(IEnumer timeTags.ForEach(x => x.Time = null); // todo : should re-calculate all preview position because some time-tag without position might be affected. - }) + }), }; } @@ -148,7 +148,7 @@ private partial class TimelineDragBox : DragBox protected override Drawable CreateBox() => new Box { RelativeSizeAxes = Axes.Y, - Alpha = 0.3f + Alpha = 0.3f, }; public override void HandleDrag(MouseButtonEvent e) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagSelectionBlueprint.cs index 69b2708f3..1ef0cae13 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/AdjustTimeTagSelectionBlueprint.cs @@ -48,12 +48,12 @@ public AdjustTimeTagSelectionBlueprint(TimeTag item) timeTagPiece = new TimeTagPiece(item) { Anchor = Anchor.CentreLeft, - Origin = TextIndexUtils.GetValueByState(item.Index, Anchor.CentreLeft, Anchor.CentreRight) + Origin = TextIndexUtils.GetValueByState(item.Index, Anchor.CentreLeft, Anchor.CentreRight), }, timeTagWithNoTimePiece = new TimeTagWithNoTimePiece(item) { Anchor = Anchor.BottomLeft, - Origin = TextIndexUtils.GetValueByState(item.Index, Anchor.BottomLeft, Anchor.BottomRight) + Origin = TextIndexUtils.GetValueByState(item.Index, Anchor.BottomLeft, Anchor.BottomRight), }, timeTagText = new OsuSpriteText { @@ -61,7 +61,7 @@ public AdjustTimeTagSelectionBlueprint(TimeTag item) Anchor = Anchor.BottomLeft, Origin = TextIndexUtils.GetValueByState(item.Index, Anchor.TopLeft, Anchor.TopRight), Y = 10, - } + }, }); } @@ -143,8 +143,8 @@ public TimeTagPiece(TimeTag timeTag) Size = new Vector2(time_tag_triangle_size), Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, - State = textIndex.State - } + State = textIndex.State, + }, }; } @@ -166,8 +166,8 @@ public TimeTagWithNoTimePiece(TimeTag timeTag) Size = new Vector2(time_tag_triangle_size), Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, - State = state - } + State = state, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/CurrentTimeMarker.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/CurrentTimeMarker.cs index 82e9c9c57..35a664b9c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/CurrentTimeMarker.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/AdjustTimeTags/CurrentTimeMarker.cs @@ -35,14 +35,14 @@ public CurrentTimeMarker() Anchor = Anchor.TopCentre, Origin = Anchor.BottomCentre, Size = new Vector2(triangle_width, triangle_height), - Scale = new Vector2(1, -1) + Scale = new Vector2(1, -1), }, new Triangle { Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, Size = new Vector2(triangle_width, triangle_height), - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/BaseBottomEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/BaseBottomEditor.cs index 580d530c3..915281edf 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/BaseBottomEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/BaseBottomEditor.cs @@ -26,7 +26,7 @@ private void load(ILyricEditorState state, LyricEditorColourProvider colourProvi new Box { RelativeSizeAxes = Axes.Both, - Colour = colourProvider.Background5(state.Mode) + Colour = colourProvider.Background5(state.Mode), }, new GridContainer { @@ -34,7 +34,7 @@ private void load(ILyricEditorState state, LyricEditorColourProvider colourProvi ColumnDimensions = new[] { new Dimension(GridSizeMode.Absolute, info_part_spacing), - new Dimension() + new Dimension(), }, Content = new[] { @@ -52,10 +52,10 @@ private void load(ILyricEditorState state, LyricEditorColourProvider colourProvi { x.RelativeSizeAxes = Axes.Both; }), - } - } - } - } + }, + }, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditor.cs index efd4a6416..92db91840 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditor.cs @@ -60,7 +60,7 @@ public NoteEditor() Anchor = Anchor.Centre, Origin = Anchor.Centre, }, - } + }, }; bindableFocusedLyric.BindValueChanged(e => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditorSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditorSelectionBlueprint.cs index 67cee831e..e76733a1e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditorSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditorSelectionBlueprint.cs @@ -61,7 +61,7 @@ public NoteEditorSelectionBlueprint(Note note) RelativeSizeAxes = Axes.None; AddInternal(new EditBodyPiece { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagPart.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagPart.cs index df2b0390c..a1857f729 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagPart.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagPart.cs @@ -159,14 +159,14 @@ public RecordingTimeTagVisualization(Lyric lyric, TimeTag timeTag) Anchor = Anchor.Centre, Origin = Anchor.Centre, RelativeSizeAxes = Axes.Both, - State = textIndex.State + State = textIndex.State, }, new OsuSpriteText { Text = LyricUtils.GetTimeTagDisplayRubyText(lyric, timeTag), Anchor = TextIndexUtils.GetValueByState(textIndex, Anchor.BottomLeft, Anchor.BottomRight), Origin = TextIndexUtils.GetValueByState(textIndex, Anchor.TopLeft, Anchor.TopRight), - } + }, }; } @@ -221,7 +221,7 @@ protected override bool OnClick(ClickEvent e) new OsuMenuItem("Clear time", MenuItemType.Destructive, () => { lyricTimeTagsChangeHandler.ClearTimeTagTime(timeTag); - }) + }), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagScrollContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagScrollContainer.cs index 29a3e7f3c..9f336c715 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagScrollContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/RecordingTimeTags/RecordingTimeTagScrollContainer.cs @@ -83,7 +83,7 @@ private void load(OsuColour colours, ITimeTagModeState timeTagModeState, Karaoke Colour = colours.Red, X = 5, Font = OsuFont.GetFont(size: 16, fixedWidth: true), - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/TimeTagScrollContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/TimeTagScrollContainer.cs index b8ef6626d..81c77dd72 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/TimeTagScrollContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/TimeTagScrollContainer.cs @@ -109,7 +109,7 @@ private void load(ILyricCaretState lyricCaretState, OsuColour colours, IBindable HighColour = colours.BlueDarker, }, ticks = new TimelineTickDisplay(), - } + }, }); PostProcessContent(container); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/LyricComposer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/LyricComposer.cs index 9703b1845..8f17b804f 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/LyricComposer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/LyricComposer.cs @@ -81,9 +81,9 @@ public LyricComposer() Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, }, - } - } - } + }, + }, + }, }, }, new Drawable[] @@ -103,11 +103,11 @@ public LyricComposer() bottomEditorContainer = new Container { RelativeSizeAxes = Axes.Both, - } - } + }, + }, }, - } - } + }, + }, }; bindableModeAndSubMode.BindValueChanged(e => @@ -188,7 +188,7 @@ static Panel getInstance(PanelType panelType) => { PanelType.Property => new PropertyPanel(), PanelType.InvalidInfo => new InvalidPanel(), - _ => throw new ArgumentOutOfRangeException(nameof(panelType), panelType, null) + _ => throw new ArgumentOutOfRangeException(nameof(panelType), panelType, null), }; } @@ -294,7 +294,7 @@ private void toggleChangeBottomEditor() LyricEditorMode.EditTimeTag when modeWithSubMode.SubMode is TimeTagEditMode.Recording => BottomEditorType.RecordingTimeTag, LyricEditorMode.EditTimeTag when modeWithSubMode.SubMode is TimeTagEditMode.Adjust => BottomEditorType.AdjustTimeTags, LyricEditorMode.EditNote => BottomEditorType.Note, - _ => null + _ => null, }; } @@ -343,7 +343,7 @@ private void assignBottomEditor(BottomEditorType? bottomEditorType) BottomEditorType.RecordingTimeTag => new RecordingTimeTagBottomEditor(), BottomEditorType.AdjustTimeTags => new AdjustTimeTagBottomEditor(), BottomEditorType.Note => new NoteBottomEditor(), - _ => null + _ => null, }; void updateBottomEditAreaSize(BaseBottomEditor? bottomEditor) @@ -352,7 +352,7 @@ void updateBottomEditAreaSize(BaseBottomEditor? bottomEditor) gridContainer.RowDimensions = new[] { new Dimension(), - new Dimension(GridSizeMode.Absolute, bottomEditorHeight) + new Dimension(GridSizeMode.Absolute, bottomEditorHeight), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panel.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panel.cs index 6c4482d1f..e309bc9c3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panel.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panel.cs @@ -51,7 +51,7 @@ protected Panel() Direction = FillDirection.Vertical, Spacing = new Vector2(10), }, - } + }, }; } @@ -135,6 +135,6 @@ private float getHideXPosition() => { PanelDirection.Left => -DrawWidth, PanelDirection.Right => DrawWidth, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/PanelDirection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/PanelDirection.cs index d746f5254..1d53cf0d8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/PanelDirection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/PanelDirection.cs @@ -7,5 +7,5 @@ public enum PanelDirection { Left, - Right + Right, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/InvalidPanel.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/InvalidPanel.cs index 7e108fe87..578e679bd 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/InvalidPanel.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/InvalidPanel.cs @@ -16,6 +16,6 @@ public InvalidPanel() protected override IReadOnlyList CreateSections() => new Drawable[] { - new IssueSection() + new IssueSection(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/IssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/IssueSection.cs index 71248d9c0..0e635c9ec 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/IssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panels/IssueSection.cs @@ -46,7 +46,7 @@ public IssueSection() AutoSizeAxes = Axes.Y, Padding = new MarginPadding(10), }, - issueTable = new SingleLyricIssueTable() + issueTable = new SingleLyricIssueTable(), }; AddInternal(reloadButton = new IconButton @@ -61,7 +61,7 @@ public IssueSection() throw new ArgumentNullException(nameof(Lyric)); verifier.RefreshByHitObject(Lyric); - } + }, }); bindableIssues.BindCollectionChanged((_, _) => @@ -126,7 +126,7 @@ private void load(LyricEditorColourProvider colourProvider, ILyricEditorState st Text = "Click this area to re-check again.", Font = OsuFont.GetFont(size: 14), }, - } + }, }; AddInternal(new HoverClickSounds(HoverSampleSet.Button)); @@ -166,13 +166,13 @@ protected override Drawable[] CreateContent(Issue issue) => Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new TruncatingSpriteText { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs index aa99a9692..ba60e951d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs @@ -50,7 +50,7 @@ public SpecialActionToolbar() AutoSizeAxes = Axes.Both, Padding = new MarginPadding(5), Spacing = new Vector2(SPACING), - } + }, }; } @@ -118,7 +118,7 @@ private static IEnumerable createItemForEditMode(ModeWithSubMode modeW LyricEditorMode.EditTimeTag => createItemsForEditTimeTagMode(modeWithSubMode.GetSubMode()), LyricEditorMode.EditNote => createItemsForEditNoteMode(modeWithSubMode.GetSubMode()), LyricEditorMode.Singer => Array.Empty(), - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; static IEnumerable createItemsForTextingMode(TextingEditMode textingEditMode) @@ -175,7 +175,7 @@ static IEnumerable createItemsForEditTimeTagMode(TimeTagEditMode timeT { new PlaybackSwitchButton(), }, - _ => throw new ArgumentOutOfRangeException(nameof(timeTagEditMode), timeTagEditMode, null) + _ => throw new ArgumentOutOfRangeException(nameof(timeTagEditMode), timeTagEditMode, null), }; static IEnumerable createItemsForEditNoteMode(NoteEditMode noteEditMode) => @@ -184,7 +184,7 @@ static IEnumerable createItemsForEditNoteMode(NoteEditMode noteEditMod NoteEditMode.Generate => Array.Empty(), NoteEditMode.Edit => Array.Empty(), NoteEditMode.Verify => Array.Empty(), - _ => throw new ArgumentOutOfRangeException(nameof(noteEditMode), noteEditMode, null) + _ => throw new ArgumentOutOfRangeException(nameof(noteEditMode), noteEditMode, null), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs index 32f8f5dee..436636bf4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs @@ -30,7 +30,7 @@ public PlaybackSwitchButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Current = freqAdjust + Current = freqAdjust, }; track.BindValueChanged(tr => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/ToolbarButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/ToolbarButton.cs index 9d515963e..cf86183e7 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/ToolbarButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/ToolbarButton.cs @@ -38,7 +38,7 @@ public void SetIcon(string texture) => public void SetIcon(IconUsage iconUsage) => SetIcon(new SpriteIcon { - Icon = iconUsage + Icon = iconUsage, }); protected void SetState(bool enabled) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/View/AdjustFontSizeButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/View/AdjustFontSizeButton.cs index be78ba9e9..de45335eb 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/View/AdjustFontSizeButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/View/AdjustFontSizeButton.cs @@ -47,7 +47,7 @@ public AdjustFontSizeButton() return; bindableFontSize.Value = previousSize; - } + }, }, new Container { @@ -70,9 +70,9 @@ public AdjustFontSizeButton() return; bindableFontSize.Value = nextSize; - } - } - } + }, + }, + }, }; bindableFontSize.BindValueChanged(e => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs index 7d413da2d..d1d9ecf9b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs @@ -114,7 +114,7 @@ public void Navigate(Issue issue) LyricTimeTagIssue timeTagIssue => new Tuple(timeTagIssue.Lyric, timeTagIssue.TimeTag), LyricIssue lyricIssue => new Tuple(lyricIssue.Lyric, null), NoteIssue noteIssue => new Tuple(noteIssue.Note.ReferenceLyric, null), - _ => new Tuple(null, null) + _ => new Tuple(null, null), }; private IHasBlueprintSelection? getBlueprintSelection(TItem item) where TItem : class @@ -124,7 +124,7 @@ public void Navigate(Issue issue) editRubyModeState, editRomajiModeState, timeTagModeState, - noteModeState + noteModeState, }; return availableEditModes.OfType>().FirstOrDefault(); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs index b895d2f97..55b9d448d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs @@ -132,14 +132,14 @@ public LyricEditor() { Depth = int.MinValue, }, - } + }, }, rightSideSettings = new Container { RelativeSizeAxes = Axes.Both, }, - } - } + }, + }, }); BindableMode.BindValueChanged(e => @@ -210,7 +210,7 @@ private void updateTheSubMode() LyricEditorMode.EditTimeTag => timeTagModeState.BindableEditMode.Value, LyricEditorMode.EditNote => editNoteModeState.BindableEditMode.Value, LyricEditorMode.Singer => null, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; } @@ -261,7 +261,7 @@ private void initializeSettingsArea() LyricEditorMode.EditTimeTag => new TimeTagSettings(), LyricEditorMode.EditNote => new NoteSettings(), LyricEditorMode.Singer => new SingerSettings(), - _ => null + _ => null, }; bool checkDuplicatedWithExistSettings(LyricEditorSettings lyricEditorSettings) @@ -296,7 +296,7 @@ static LyricEditorLayout getSupportedLayout(LyricEditorMode mode) => LyricEditorMode.EditTimeTag => LyricEditorLayout.Detail, LyricEditorMode.EditNote => LyricEditorLayout.Detail, LyricEditorMode.Singer => LyricEditorLayout.Preview, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; } @@ -350,9 +350,9 @@ static Container getContent(LyricEditorLayout layout) => { new PreviewLyricList { - RelativeSizeAxes = Axes.Both - } - } + RelativeSizeAxes = Axes.Both, + }, + }, }, LyricEditorLayout.Detail => new Container { @@ -361,18 +361,18 @@ static Container getContent(LyricEditorLayout layout) => new LyricComposer { RelativeSizeAxes = Axes.Both, - Size = new Vector2(1, 0.6f) + Size = new Vector2(1, 0.6f), }, new DetailLyricList { RelativePositionAxes = Axes.Y, Position = new Vector2(0, 0.6f), Size = new Vector2(1, 0.4f), - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, - } + }, }, - _ => throw new ArgumentOutOfRangeException(nameof(layout), layout, null) + _ => throw new ArgumentOutOfRangeException(nameof(layout), layout, null), }; } @@ -404,7 +404,7 @@ public virtual bool OnPressed(KeyBindingPressEvent e) => KaraokeEditAction.MoveToNextIndex => lyricCaretState.MoveCaret(MovingCaretAction.NextIndex), KaraokeEditAction.MoveToFirstIndex => lyricCaretState.MoveCaret(MovingCaretAction.FirstIndex), KaraokeEditAction.MoveToLastIndex => lyricCaretState.MoveCaret(MovingCaretAction.LastIndex), - _ => false + _ => false, }; public void OnReleased(KeyBindingReleaseEvent e) @@ -475,7 +475,7 @@ private class LocalScrollingInfo : IScrollingInfo public IBindable TimeRange { get; } = new BindableDouble(5000) { MinValue = 1000, - MaxValue = 10000 + MaxValue = 10000, }; public IScrollAlgorithm Algorithm { get; } = new SequentialScrollAlgorithm(new List()); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorScreen.cs index 3fb2b9e8d..e3ad67f7d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorScreen.cs @@ -89,7 +89,7 @@ public LyricEditorScreen() Child = lyricEditor = new FullScreenLyricEditor { RelativeSizeAxes = Axes.Both, - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorSkin.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorSkin.cs index adb7301ae..fe3419ec0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorSkin.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorSkin.cs @@ -53,7 +53,7 @@ public LyricEditorSkin(SkinInfo skin, IStorageResourceProvider? resources) { Radius = 2, Colour = Color4Extensions.FromHex("#3D2D6B"), - OutlineColour = Color4Extensions.FromHex("#CCA532") + OutlineColour = Color4Extensions.FromHex("#CCA532"), }, }, RightLyricTextShaders = new List @@ -61,9 +61,9 @@ public LyricEditorSkin(SkinInfo skin, IStorageResourceProvider? resources) new OutlineShader { Radius = 2, - OutlineColour = Color4Extensions.FromHex("#5932CC") + OutlineColour = Color4Extensions.FromHex("#5932CC"), }, - } + }, }; DefaultElement[ElementType.NoteStyle] = NoteStyle.CreateDefault(); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs index af34859fa..29e1b6a6f 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs @@ -39,7 +39,7 @@ protected override IEnumerable CreateChecks(LyricEditorMode type) => LyricEditorMode.EditTimeTag => new ICheck[] { new CheckLyricTimeTag() }, LyricEditorMode.EditNote => new ICheck[] { new CheckNoteReferenceLyric(), new CheckNoteText(), new CheckNoteTime() }, LyricEditorMode.Singer => Array.Empty(), - _ => throw new ArgumentOutOfRangeException(nameof(type), type, null) + _ => throw new ArgumentOutOfRangeException(nameof(type), type, null), }; public IBindableList GetBindable(KaraokeHitObject hitObject) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs index 4063cb2e3..4c3b63e7b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs @@ -79,7 +79,7 @@ private void load(OsuColour colours, ILyricEditorState state, ILyricSelectionSta Action = () => { lyricSelectionState.EndSelecting(LyricEditorSelectingAction.Apply); - } + }, }, Empty(), new ActionButton @@ -88,7 +88,7 @@ private void load(OsuColour colours, ILyricEditorState state, ILyricSelectionSta Action = () => { lyricSelectionState.EndSelecting(LyricEditorSelectingAction.Cancel); - } + }, }, Empty(), new ActionButton @@ -98,12 +98,12 @@ private void load(OsuColour colours, ILyricEditorState state, ILyricSelectionSta Action = () => { // todo : implement - } + }, }, Empty(), - } - } - } + }, + }, + }, }; selecting.BindTo(lyricSelectionState.Selecting); @@ -155,7 +155,7 @@ public SelectAllArea() { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/BaseLyricList.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/BaseLyricList.cs index d08f08594..3c456f21d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/BaseLyricList.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/BaseLyricList.cs @@ -48,14 +48,14 @@ protected BaseLyricList() Child = container = CreateDrawableLyricList().With(x => { x.RelativeSizeAxes = Axes.Both; - }) + }), }, }, new Drawable[] { new ApplySelectingArea(), - } - } + }, + }, }; container.OnOrderChanged += (x, nowOrder) => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/DetailLyricList.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/DetailLyricList.cs index 8ad8f181c..960a5cc9d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/DetailLyricList.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/DetailLyricList.cs @@ -32,7 +32,7 @@ protected override Drawable CreateBackground(LyricEditorColourProvider colourPro ColumnDimensions = new[] { new Dimension(GridSizeMode.Absolute, timingWidth), - new Dimension() + new Dimension(), }, Content = new[] { @@ -41,15 +41,15 @@ protected override Drawable CreateBackground(LyricEditorColourProvider colourPro new Box { RelativeSizeAxes = Axes.Both, - Colour = colourProvider.Background3(mode) + Colour = colourProvider.Background3(mode), }, new Box { RelativeSizeAxes = Axes.Both, - Colour = colourProvider.Background4(mode) + Colour = colourProvider.Background4(mode), }, - } - } + }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricDetailRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricDetailRow.cs index e476e11f7..b2fa28503 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricDetailRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricDetailRow.cs @@ -27,7 +27,7 @@ protected override IEnumerable GetColumnDimensions() => new[] { new Dimension(GridSizeMode.Absolute, TIMING_WIDTH), - new Dimension() + new Dimension(), }; protected override Drawable CreateTimingInfo(Lyric lyric) @@ -45,7 +45,7 @@ protected override Drawable CreateContent(Lyric lyric) Action = () => { lyricsChangeHandler.CreateAtLast(); - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricPreviewRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricPreviewRow.cs index 0a0b52b6c..468fcdea7 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricPreviewRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/CreateNewLyricPreviewRow.cs @@ -39,8 +39,8 @@ protected override Drawable CreateLyricInfo(Lyric lyric) Action = () => { lyricsChangeHandler.CreateAtLast(); - } - } + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/DetailRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/DetailRow.cs index 995e8656b..bacdea2f3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/DetailRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/DetailRow.cs @@ -24,7 +24,7 @@ protected override IEnumerable GetColumnDimensions() => new[] { new Dimension(GridSizeMode.Absolute, TIMING_WIDTH), - new Dimension() + new Dimension(), }; protected override Dimension GetRowDimensions() @@ -34,7 +34,7 @@ protected override IEnumerable GetDrawables(Lyric lyric) => new[] { CreateTimingInfo(lyric), - CreateContent(lyric) + CreateContent(lyric), }; protected override bool HighlightBackgroundWhenSelected(ICaretPosition? caretPosition) => true; @@ -45,7 +45,7 @@ protected override Func GetBackgroundColour(BackgroundS BackgroundStyle.Idle => _ => new Color4(), // should not have background if not hover. BackgroundStyle.Hover => colourProvider.Background2, // follow the colour in the editor table. BackgroundStyle.Focus => colourProvider.Background1, // follow the colour in the editor table. - _ => throw new ArgumentOutOfRangeException(nameof(style), style, null) + _ => throw new ArgumentOutOfRangeException(nameof(style), style, null), }; protected abstract Drawable CreateTimingInfo(Lyric lyric); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/EditLyricDetailRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/EditLyricDetailRow.cs index f1924967d..def76bf79 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/EditLyricDetailRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/EditLyricDetailRow.cs @@ -21,7 +21,7 @@ protected override Drawable CreateTimingInfo(Lyric lyric) { Anchor = Anchor.CentreRight, Origin = Anchor.CentreRight, - Margin = new MarginPadding { Right = 10 } + Margin = new MarginPadding { Right = 10 }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/LanguageInfo.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/LanguageInfo.cs index b264ecfc7..068708d95 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/LanguageInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/LanguageInfo.cs @@ -58,6 +58,6 @@ protected override bool OnClick(ClickEvent e) public Popover GetPopover() => new LanguageSelectorPopover(languageBindable) { - EnableEmptyOption = true + EnableEmptyOption = true, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SubInfo.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SubInfo.cs index db3820fcb..cd7b10304 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SubInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SubInfo.cs @@ -35,17 +35,17 @@ protected SubInfo(Lyric lyric) { box = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, badgeText = new OsuSpriteText { Margin = new MarginPadding { Vertical = 2, - Horizontal = 5 + Horizontal = 5, }, - Text = "Badge" - } + Text = "Badge", + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/FixedInfo/InvalidInfo.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/FixedInfo/InvalidInfo.cs index 4ae7961f0..024e0a6c9 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/FixedInfo/InvalidInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/FixedInfo/InvalidInfo.cs @@ -126,7 +126,7 @@ public IssueTablePopover(CompositeDrawable parent, IReadOnlyCollection is { new SingleLyricIssueTable { - Issues = issues + Issues = issues, }, new IconButton { @@ -142,9 +142,9 @@ public IssueTablePopover(CompositeDrawable parent, IReadOnlyCollection is // should close the popover if has no issue. if (!issues.Any()) this.HidePopover(); - } - } - } + }, + }, + }, }; } @@ -175,7 +175,7 @@ protected override Drawable[] CreateContent(Issue issue) => Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new TruncatingSpriteText { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs index dc8ec812e..06936100f 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs @@ -80,7 +80,7 @@ public InfoControl(Lyric lyric) { headerBackground = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, timeRange = new OsuSpriteText { @@ -97,7 +97,7 @@ public InfoControl(Lyric lyric) Scale = new Vector2(1.3f), Y = 1, }, - } + }, }, new GridContainer { @@ -114,7 +114,7 @@ public InfoControl(Lyric lyric) { subInfoContainer = new Container { - RelativeSizeAxes = Axes.X + RelativeSizeAxes = Axes.X, }, new FillFlowContainer { @@ -126,12 +126,12 @@ public InfoControl(Lyric lyric) { new OrderInfo(lyric), new LockInfo(lyric), - } - } - } - } - } - } + }, + }, + }, + }, + }, + }, }, }; @@ -235,7 +235,7 @@ public MenuItem[] ContextMenuItems new OsuMenuItem("Create new lyric", MenuItemType.Standard, () => { lyricsChangeHandler.CreateAtPosition(); - }) + }), }; // use lazy way to check lyric is not in first diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/PreviewRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/PreviewRow.cs index f524ff4b9..6a6291196 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/PreviewRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/PreviewRow.cs @@ -28,7 +28,7 @@ protected override IEnumerable GetColumnDimensions() => new[] { new Dimension(GridSizeMode.Absolute, info_part_spacing), - new Dimension() + new Dimension(), }; protected override Dimension GetRowDimensions() => new(GridSizeMode.AutoSize, minSize: min_height, maxSize: max_height); @@ -37,7 +37,7 @@ protected override IEnumerable GetDrawables(Lyric lyric) => new[] { CreateLyricInfo(lyric), - CreateContent(lyric) + CreateContent(lyric), }; protected override bool HighlightBackgroundWhenSelected(ICaretPosition? caretPosition) @@ -55,7 +55,7 @@ protected override Func GetBackgroundColour(BackgroundS BackgroundStyle.Idle => colourProvider.Background5, BackgroundStyle.Hover => colourProvider.Background4, BackgroundStyle.Focus => colourProvider.Background3, - _ => throw new ArgumentOutOfRangeException(nameof(style), style, null) + _ => throw new ArgumentOutOfRangeException(nameof(style), style, null), }; protected abstract Drawable CreateLyricInfo(Lyric lyric); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs index 6d1135cff..3f79812be 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs @@ -67,7 +67,7 @@ protected Row(Lyric lyric) background = new Box { RelativeSizeAxes = Axes.Both, - Alpha = 0.9f + Alpha = 0.9f, }, new GridContainer { @@ -77,10 +77,10 @@ protected Row(Lyric lyric) RowDimensions = new[] { rowDimensions }, Content = new[] { - columns.ToArray() - } - } - } + columns.ToArray(), + }, + }, + }, }; bindableMode.BindValueChanged(_ => @@ -156,7 +156,7 @@ protected enum BackgroundStyle { Idle, Hover, - Focus + Focus, } public partial class SelectArea : CompositeDrawable @@ -187,7 +187,7 @@ public SelectArea(Lyric lyric) { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Components/BlockSectionWrapper.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Components/BlockSectionWrapper.cs index 66e0f011f..4b2db76ea 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Components/BlockSectionWrapper.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Components/BlockSectionWrapper.cs @@ -35,14 +35,14 @@ public BlockSectionWrapper(IconUsage iconUsage, LocalisableString name, Localisa { RelativeSizeAxes = Axes.Both, Alpha = 0.3f, - Colour = Color4.Black + Colour = Color4.Black, }, }, new BlockSectionMessage(iconUsage, name, description) { Anchor = Anchor.Centre, - Origin = Anchor.Centre - } + Origin = Anchor.Centre, + }, }; } @@ -114,9 +114,9 @@ public BlockSectionMessage(IconUsage iconUsage, LocalisableString name, Localisa Text = description, Font = OsuFont.GetFont(size: 14), }, - } + }, }, - } + }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs index 025867d2f..443be7010 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs @@ -67,7 +67,7 @@ protected void TriggerSelect() { if (selected) TriggerSelect(); - } + }, }; protected partial class ObjectFieldSwitchButton : SwitchButton diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs index e7b1060a5..ef305f9a0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs @@ -78,7 +78,7 @@ protected LabelledObjectFieldTextBox(T item) { if (selected) TriggerSelect(item); - } + }, }; private void focus() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/AssignLanguageSubsection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/AssignLanguageSubsection.cs index 198625a63..acb06255a 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/AssignLanguageSubsection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/AssignLanguageSubsection.cs @@ -64,6 +64,6 @@ protected override void StartSelectingLyrics() public Popover GetPopover() => new LanguageSelectorPopover(bindableLanguage) { - EnableEmptyOption = true + EnableEmptyOption = true, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageAutoGenerateSubsection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageAutoGenerateSubsection.cs index 242c52976..3d476f13e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageAutoGenerateSubsection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageAutoGenerateSubsection.cs @@ -24,10 +24,10 @@ protected override DescriptionFormat CreateInvalidDescriptionFormat() typing_mode, new SwitchModeDescriptionAction { Text = "typing mode", - Mode = LyricEditorMode.Texting + Mode = LyricEditorMode.Texting, } - } - } + }, + }, }; protected override ConfigButton CreateConfigButton() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageEditModeSection.cs index 1a93b540c..fdbd40c95 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageEditModeSection.cs @@ -21,7 +21,7 @@ protected override Selection CreateSelection(LanguageEditMode mode) => { LanguageEditMode.Generate => new Selection(), LanguageEditMode.Verify => new LanguageVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(LanguageEditMode mode) => @@ -29,7 +29,7 @@ protected override LocalisableString GetSelectionText(LanguageEditMode mode) => { LanguageEditMode.Generate => "Generate", LanguageEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, LanguageEditMode mode, bool active) => @@ -37,7 +37,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, LanguageEditMode { LanguageEditMode.Generate => active ? colours.Blue : colours.BlueDarker, LanguageEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(LanguageEditMode mode) => @@ -45,7 +45,7 @@ protected override DescriptionFormat GetSelectionDescription(LanguageEditMode mo { LanguageEditMode.Generate => "Auto-generate language with just a click.", LanguageEditMode.Verify => "Check if have lyric with no language.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class LanguageVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageIssueSection.cs index 05ac86d8d..855db0042 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Language/LanguageIssueSection.cs @@ -40,7 +40,7 @@ protected override Drawable[] CreateContent(Issue issue) Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new OsuSpriteText { @@ -52,7 +52,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LanguageSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LanguageSettings.cs index a6773d3cf..19ede1f3c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LanguageSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LanguageSettings.cs @@ -41,6 +41,6 @@ private void load(ILanguageModeState languageModeState) new LanguageEditModeSection(), new LanguageIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LyricPropertySection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LyricPropertySection.cs index 5382fcc3f..1793374b4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LyricPropertySection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LyricPropertySection.cs @@ -94,7 +94,7 @@ static IconUsage getWriteLyricPropertyLockedIcon(LockLyricPropertyBy lockLyricPr { LockLyricPropertyBy.ReferenceLyricConfig => FontAwesome.Solid.Chair, LockLyricPropertyBy.LockState => FontAwesome.Solid.Lock, - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; static LocalisableString getWriteLyricPropertyLockedDescriptionTitle(LockLyricPropertyBy lockLyricPropertyBy) => @@ -102,7 +102,7 @@ static LocalisableString getWriteLyricPropertyLockedDescriptionTitle(LockLyricPr { LockLyricPropertyBy.ReferenceLyricConfig => "Sync", LockLyricPropertyBy.LockState => "Locked", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/NoteSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/NoteSettings.cs index 34d81b938..9a12e4756 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/NoteSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/NoteSettings.cs @@ -46,8 +46,8 @@ private void load(IEditNoteModeState editNoteModeState) NoteEditMode.Verify => new Drawable[] { new NoteEditModeSection(), - new NoteIssueSection() + new NoteIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteAutoGenerateSubsection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteAutoGenerateSubsection.cs index ea218d8ad..8db569f96 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteAutoGenerateSubsection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteAutoGenerateSubsection.cs @@ -32,10 +32,10 @@ protected override DescriptionFormat CreateInvalidDescriptionFormat() create_time_tag_mode, new SwitchModeDescriptionAction { Text = "adjust time-tag mode", - Mode = LyricEditorMode.EditTimeTag + Mode = LyricEditorMode.EditTimeTag, } - } - } + }, + }, }; protected override ConfigButton CreateConfigButton() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteConfigSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteConfigSection.cs index d2d7bc803..d9b6e7bb2 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteConfigSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteConfigSection.cs @@ -25,8 +25,8 @@ private void load(IScrollingInfo scrollingInfo) { Label = "Time range", Description = "Change time-range to zoom-in/zoom-out the notes.", - Current = bindableDouble - } + Current = bindableDouble, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditModeSection.cs index ca323812d..dacf39037 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditModeSection.cs @@ -22,7 +22,7 @@ protected override Selection CreateSelection(NoteEditMode mode) => NoteEditMode.Generate => new Selection(), NoteEditMode.Edit => new Selection(), NoteEditMode.Verify => new NoteVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(NoteEditMode mode) => @@ -31,7 +31,7 @@ protected override LocalisableString GetSelectionText(NoteEditMode mode) => NoteEditMode.Generate => "Generate", NoteEditMode.Edit => "Edit", NoteEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, NoteEditMode mode, bool active) => @@ -40,7 +40,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, NoteEditMode mod NoteEditMode.Generate => active ? colours.Blue : colours.BlueDarker, NoteEditMode.Edit => active ? colours.Red : colours.RedDarker, NoteEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(NoteEditMode mode) => @@ -49,7 +49,7 @@ protected override DescriptionFormat GetSelectionDescription(NoteEditMode mode) NoteEditMode.Generate => "Using time-tag to create default notes.", NoteEditMode.Edit => "Batch edit note property in here.", NoteEditMode.Verify => "Check invalid notes in here.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class NoteVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertyMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertyMode.cs index f5a48d321..f3a17c204 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertyMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertyMode.cs @@ -9,5 +9,5 @@ public enum NoteEditPropertyMode RubyText, - Display + Display, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertySection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertySection.cs index 518a04288..b54cb07f2 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertySection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteEditPropertySection.cs @@ -29,7 +29,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedDescription(Lock { LockLyricPropertyBy.ReferenceLyricConfig => "Notes is sync to another notes.", LockLyricPropertyBy.LockState => "Notes is locked.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => @@ -37,7 +37,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyri { LockLyricPropertyBy.ReferenceLyricConfig => "Cannot edit the notes because it's sync to another lyric's notes.", LockLyricPropertyBy.LockState => "The lyric is locked, so cannot edit the note.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; private partial class NotePropertiesEditor : LyricPropertiesEditor @@ -70,18 +70,18 @@ protected override Drawable CreateDrawable(Note item) NoteEditPropertyMode.Text => new LabelledNoteTextTextBox(item) { Label = $"#{index + 1}", - TabbableContentContainer = this + TabbableContentContainer = this, }, NoteEditPropertyMode.RubyText => new LabelledNoteRubyTextTextBox(item) { Label = item.Text, - TabbableContentContainer = this + TabbableContentContainer = this, }, NoteEditPropertyMode.Display => new LabelledNoteDisplaySwitchButton(item) { Label = item.Text, }, - _ => throw new ArgumentOutOfRangeException(nameof(bindableNoteEditPropertyMode.Value)) + _ => throw new ArgumentOutOfRangeException(nameof(bindableNoteEditPropertyMode.Value)), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteIssueSection.cs index da22f61ce..b0c2a0911 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Notes/NoteIssueSection.cs @@ -53,7 +53,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs index 620e9760d..2b72ed761 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/LabelledReferenceLyricSelector.cs @@ -30,7 +30,7 @@ public LabelledReferenceLyricSelector() protected override SelectLyricButton CreateComponent() => new() { - RelativeSizeAxes = Axes.X + RelativeSizeAxes = Axes.X, }; public Lyric? IgnoredLyric @@ -97,7 +97,7 @@ public LyricSelectorPopover(Bindable bindable, Lyric? ignoreLyric) { Width = 400, Height = 600, - Current = bindable + Current = bindable, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricAutoGenerateSection.cs index 2d9f02e45..c7fa14338 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricAutoGenerateSection.cs @@ -18,7 +18,7 @@ private partial class ReferenceLyricAutoGenerateSubsection : LyricEditorAutoGene protected override DescriptionFormat CreateInvalidDescriptionFormat() => new() { - Text = "Seems every lyrics in the songs are unique. But don't worry, reference lyric can still link by hands." + Text = "Seems every lyrics in the songs are unique. But don't worry, reference lyric can still link by hands.", }; protected override ConfigButton CreateConfigButton() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricConfigSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricConfigSection.cs index 52a851afa..e5bb16fe8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricConfigSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricConfigSection.cs @@ -45,8 +45,8 @@ public ReferenceLyricConfigSection() Items = new[] { sync, - reference - } + reference, + }, }, labelledSyncEverything = new LabelledSwitchButton { @@ -55,8 +55,8 @@ public ReferenceLyricConfigSection() Current = { Value = true, - Disabled = true - } + Disabled = true, + }, }, labelledSyncSinger = new LabelledSwitchButton { @@ -67,7 +67,7 @@ public ReferenceLyricConfigSection() { Label = "Sync time-tags.", Description = "Un-select the selection if want to customize the time-tag.", - } + }, }; bindableReferenceLyricPropertyConfig.BindValueChanged(e => @@ -123,14 +123,14 @@ protected override LocalisableString GetWriteLyricPropertyLockedDescription(Lock lockLyricPropertyBy switch { // technically the property is always editable. - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => lockLyricPropertyBy switch { // technically the property is always editable. - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; private void onConfigChanged() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricEditModeSection.cs index b20837c1d..15b1fc47c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricEditModeSection.cs @@ -21,7 +21,7 @@ protected override Selection CreateSelection(ReferenceLyricEditMode mode) => { ReferenceLyricEditMode.Edit => new Selection(), ReferenceLyricEditMode.Verify => new ReferenceLyricVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(ReferenceLyricEditMode mode) => @@ -29,7 +29,7 @@ protected override LocalisableString GetSelectionText(ReferenceLyricEditMode mod { ReferenceLyricEditMode.Edit => "Edit", ReferenceLyricEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, ReferenceLyricEditMode mode, bool active) => @@ -37,7 +37,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, ReferenceLyricEd { ReferenceLyricEditMode.Edit => active ? colours.Blue : colours.BlueDarker, ReferenceLyricEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(ReferenceLyricEditMode mode) => @@ -45,7 +45,7 @@ protected override DescriptionFormat GetSelectionDescription(ReferenceLyricEditM { ReferenceLyricEditMode.Edit => "Assign the reference lyrics.", ReferenceLyricEditMode.Verify => "Check any invalid reference lyric issue.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class ReferenceLyricVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricIssueSection.cs index 6cda278b5..99cc41d73 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricIssueSection.cs @@ -40,7 +40,7 @@ protected override Drawable[] CreateContent(Issue issue) Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new OsuSpriteText { @@ -52,7 +52,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricSection.cs index ac2cb7efa..7da10113b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Reference/ReferenceLyricSection.cs @@ -26,8 +26,8 @@ public ReferenceLyricSection() labelledReferenceLyricSelector = new LabelledReferenceLyricSelector { Label = "Referenced lyric", - Description = "Select the similar lyric that want to reference or sync the property." - } + Description = "Select the similar lyric that want to reference or sync the property.", + }, }; labelledReferenceLyricSelector.Current.BindValueChanged(x => @@ -53,13 +53,13 @@ protected override LocalisableString GetWriteLyricPropertyLockedDescription(Lock lockLyricPropertyBy switch { // technically the property is always editable. - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => lockLyricPropertyBy switch { // technically the property is always editable. - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/ReferenceSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/ReferenceSettings.cs index b5d6ce5f9..0567059ce 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/ReferenceSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/ReferenceSettings.cs @@ -36,13 +36,13 @@ private void load(IEditReferenceLyricModeState editReferenceLyricModeState) new ReferenceLyricEditModeSection(), new ReferenceLyricAutoGenerateSection(), new ReferenceLyricSection(), - new ReferenceLyricConfigSection() + new ReferenceLyricConfigSection(), }, ReferenceLyricEditMode.Verify => new Drawable[] { new ReferenceLyricEditModeSection(), new ReferenceLyricIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs index c2e3eb582..ec0813132 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs @@ -39,6 +39,6 @@ private void load(IEditRomajiModeState romajiModeState) new RomajiTagEditModeSection(), new RomajiTagIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/CreateNewTextTagButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/CreateNewTextTagButton.cs index 526f48957..521ee9496 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/CreateNewTextTagButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/CreateNewTextTagButton.cs @@ -48,7 +48,7 @@ public Popover GetPopover() { this.HidePopover(); Action?.Invoke(textTag); - } + }, }; } @@ -95,9 +95,9 @@ public CreateNewPopover(Lyric lyric) new AddButton { Text = "Add", - Action = submit - } - } + Action = submit, + }, + }, }; } @@ -145,7 +145,7 @@ private void submit() { StartIndex = Math.Min(startIndex, endIndex), EndIndex = Math.Max(startIndex, endIndex), - Text = textTagText + Text = textTagText, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/LabelledTextTagTextBox.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/LabelledTextTagTextBox.cs index 7ff8e0d59..3b9a73326 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/LabelledTextTagTextBox.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/Components/LabelledTextTagTextBox.cs @@ -62,8 +62,8 @@ protected LabelledTextTagTextBox(Lyric lyric, T textTag) // trigger selected if hover on delete button. TriggerSelect(textTag); } - } - } + }, + }, }); // add the index shifting component at the bottom of the text box. @@ -114,7 +114,7 @@ static int getNewIndex(T textTag, AdjustIndex index) => { AdjustIndex.Start => textTag.StartIndex, AdjustIndex.End => textTag.EndIndex, - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; static int calculateNewIndex(int index, AdjustAction action) => @@ -122,10 +122,10 @@ static int calculateNewIndex(int index, AdjustAction action) => { AdjustAction.Decrease => index - 1, AdjustAction.Increase => index + 1, - _ => throw new InvalidOperationException() + _ => throw new InvalidOperationException(), }; }, - } + }, }); } @@ -191,7 +191,7 @@ public IndexShiftingPart() Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Icon = FontAwesome.Regular.CaretSquareLeft, - Action = () => Action?.Invoke(AdjustIndex.Start, AdjustAction.Decrease) + Action = () => Action?.Invoke(AdjustIndex.Start, AdjustAction.Decrease), }, increaseStartIndexButton = new IconButton { @@ -200,7 +200,7 @@ public IndexShiftingPart() Origin = Anchor.CentreLeft, X = button_size + button_spacing, Icon = FontAwesome.Regular.CaretSquareRight, - Action = () => Action?.Invoke(AdjustIndex.Start, AdjustAction.Increase) + Action = () => Action?.Invoke(AdjustIndex.Start, AdjustAction.Increase), }, reduceEndIndexButton = new IconButton { @@ -209,7 +209,7 @@ public IndexShiftingPart() Origin = Anchor.CentreRight, X = -button_size - button_spacing, Icon = FontAwesome.Regular.CaretSquareLeft, - Action = () => Action?.Invoke(AdjustIndex.End, AdjustAction.Decrease) + Action = () => Action?.Invoke(AdjustIndex.End, AdjustAction.Decrease), }, increaseEndIndexButton = new IconButton { @@ -217,10 +217,10 @@ public IndexShiftingPart() Anchor = Anchor.CentreRight, Origin = Anchor.CentreRight, Icon = FontAwesome.Regular.CaretSquareRight, - Action = () => Action?.Invoke(AdjustIndex.End, AdjustAction.Increase) + Action = () => Action?.Invoke(AdjustIndex.End, AdjustAction.Increase), }, - } - } + }, + }, }; } @@ -255,7 +255,7 @@ public bool OnPressed(KeyBindingPressEvent e) KaraokeEditAction.EditTextTagIncreaseStartIndex => increaseStartIndexButton.TriggerClick(), KaraokeEditAction.EditTextTagReduceEndIndex => reduceEndIndexButton.TriggerClick(), KaraokeEditAction.EditTextTagIncreaseEndIndex => increaseEndIndexButton.TriggerClick(), - _ => false + _ => false, }; } @@ -268,13 +268,13 @@ private enum AdjustIndex { Start, - End + End, } private enum AdjustAction { Decrease, - Increase + Increase, } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagAutoGenerateSection.cs index f51abbccc..420fb60a4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagAutoGenerateSection.cs @@ -29,7 +29,7 @@ protected override string GetDisplayName(KaraokeRulesetEditGeneratorSetting sett setting switch { KaraokeRulesetEditGeneratorSetting.JaRomajiTagGeneratorConfig => "Japanese", - _ => throw new ArgumentOutOfRangeException(nameof(setting)) + _ => throw new ArgumentOutOfRangeException(nameof(setting)), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditModeSection.cs index 71876d8a3..f12d9e6a0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditModeSection.cs @@ -19,7 +19,7 @@ protected override Selection CreateSelection(RomajiTagEditMode mode) => RomajiTagEditMode.Generate => new Selection(), RomajiTagEditMode.Edit => new Selection(), RomajiTagEditMode.Verify => new RomajiTagVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(RomajiTagEditMode mode) => @@ -28,7 +28,7 @@ protected override LocalisableString GetSelectionText(RomajiTagEditMode mode) => RomajiTagEditMode.Generate => "Generate", RomajiTagEditMode.Edit => "Edit", RomajiTagEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, RomajiTagEditMode mode, bool active) => @@ -37,7 +37,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, RomajiTagEditMod RomajiTagEditMode.Generate => active ? colours.Blue : colours.BlueDarker, RomajiTagEditMode.Edit => active ? colours.Red : colours.RedDarker, RomajiTagEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(RomajiTagEditMode mode) => @@ -59,8 +59,8 @@ protected override DescriptionFormat GetSelectionDescription(RomajiTagEditMode m AdjustableActions = new List { KaraokeEditAction.MoveToPreviousLyric, - KaraokeEditAction.MoveToNextLyric - } + KaraokeEditAction.MoveToNextLyric, + }, } }, { @@ -73,13 +73,13 @@ protected override DescriptionFormat GetSelectionDescription(RomajiTagEditMode m KaraokeEditAction.EditTextTagIncreaseStartIndex, KaraokeEditAction.EditTextTagReduceEndIndex, KaraokeEditAction.EditTextTagIncreaseEndIndex, - } + }, } - } - } + }, + }, }, RomajiTagEditMode.Verify => "Check invalid romajies in here.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class RomajiTagVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditSection.cs index b999463fb..aa7ed27a3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RomajiTagEditSection.cs @@ -28,7 +28,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedDescription(Lock { LockLyricPropertyBy.ReferenceLyricConfig => "Romaji is sync to another romaji.", LockLyricPropertyBy.LockState => "Romaji is locked.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => @@ -36,7 +36,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyri { LockLyricPropertyBy.ReferenceLyricConfig => "Cannot edit the romaji because it's sync to another lyric's text.", LockLyricPropertyBy.LockState => "The lyric is locked, so cannot edit the romaji.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; private partial class RomajiTagsEditor : TextTagsEditor diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagAutoGenerateSection.cs index ad508a58e..f6e16ab51 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagAutoGenerateSection.cs @@ -29,7 +29,7 @@ protected override string GetDisplayName(KaraokeRulesetEditGeneratorSetting sett setting switch { KaraokeRulesetEditGeneratorSetting.JaRubyTagGeneratorConfig => "Japanese", - _ => throw new ArgumentOutOfRangeException(nameof(setting)) + _ => throw new ArgumentOutOfRangeException(nameof(setting)), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditModeSection.cs index 46b0284a0..a2d8569bd 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditModeSection.cs @@ -19,7 +19,7 @@ protected override Selection CreateSelection(RubyTagEditMode mode) => RubyTagEditMode.Generate => new Selection(), RubyTagEditMode.Edit => new Selection(), RubyTagEditMode.Verify => new RubyTagVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(RubyTagEditMode mode) => @@ -28,7 +28,7 @@ protected override LocalisableString GetSelectionText(RubyTagEditMode mode) => RubyTagEditMode.Generate => "Generate", RubyTagEditMode.Edit => "Edit", RubyTagEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, RubyTagEditMode mode, bool active) => @@ -37,7 +37,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, RubyTagEditMode RubyTagEditMode.Generate => active ? colours.Blue : colours.BlueDarker, RubyTagEditMode.Edit => active ? colours.Red : colours.RedDarker, RubyTagEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(RubyTagEditMode mode) => @@ -59,8 +59,8 @@ protected override DescriptionFormat GetSelectionDescription(RubyTagEditMode mod AdjustableActions = new List { KaraokeEditAction.MoveToPreviousLyric, - KaraokeEditAction.MoveToNextLyric - } + KaraokeEditAction.MoveToNextLyric, + }, } }, { @@ -73,13 +73,13 @@ protected override DescriptionFormat GetSelectionDescription(RubyTagEditMode mod KaraokeEditAction.EditTextTagIncreaseStartIndex, KaraokeEditAction.EditTextTagReduceEndIndex, KaraokeEditAction.EditTextTagIncreaseEndIndex, - } + }, } - } - } + }, + }, }, RubyTagEditMode.Verify => "Check invalid rubies in here", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class RubyTagVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditSection.cs index 373605ae8..4154b7fd5 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/RubyTagEditSection.cs @@ -28,7 +28,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedDescription(Lock { LockLyricPropertyBy.ReferenceLyricConfig => "Ruby is sync to another ruby.", LockLyricPropertyBy.LockState => "Ruby is locked.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => @@ -36,7 +36,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyri { LockLyricPropertyBy.ReferenceLyricConfig => "Cannot edit the ruby because it's sync to another lyric's text.", LockLyricPropertyBy.LockState => "The lyric is locked, so cannot edit the ruby.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; private partial class RubyTagsEditor : TextTagsEditor diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagAutoGenerateSection.cs index 9ee498e70..4e05aefc8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagAutoGenerateSection.cs @@ -25,10 +25,10 @@ protected override DescriptionFormat CreateInvalidDescriptionFormat() language_mode, new SwitchModeDescriptionAction { Text = "edit language mode", - Mode = LyricEditorMode.Language + Mode = LyricEditorMode.Language, } - } - } + }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagEditSection.cs index c35a77676..a2e74533a 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagEditSection.cs @@ -37,7 +37,7 @@ protected override EditorSectionButton CreateCreateNewItemButton() Text = CreateNewTextTagButtonText(), LabelledTextBoxLabel = CreateNewTextTagTitle(), LabelledTextBoxDescription = CreateNewTextTagDescription(), - Action = AddTextTag + Action = AddTextTag, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagIssueSection.cs index 65a73c607..1762a09e3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyRomaji/TextTagIssueSection.cs @@ -56,7 +56,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyTagSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyTagSettings.cs index b4a0dd719..6dd88cfd6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyTagSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RubyTagSettings.cs @@ -39,6 +39,6 @@ private void load(IEditRubyModeState editRubyModeState) new RubyTagEditModeSection(), new RubyTagIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SettingsDirection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SettingsDirection.cs index 2b5148a72..44d92dfd8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SettingsDirection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SettingsDirection.cs @@ -13,5 +13,5 @@ public enum SettingsDirection /// /// At the right side of the main lyric editor. /// - Right + Right, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs index 180a0473b..cf587620c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs @@ -99,7 +99,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedDescription(Lock { LockLyricPropertyBy.ReferenceLyricConfig => "Singers is sync to another notes.", LockLyricPropertyBy.LockState => "Singers is locked.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => @@ -107,7 +107,7 @@ protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyri { LockLyricPropertyBy.ReferenceLyricConfig => "Cannot edit the singers because it's sync to another lyric's singers.", LockLyricPropertyBy.LockState => "The lyric is locked, so cannot edit the singers.", - _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null) + _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; public partial class LabelledSingerSwitchButton : LabelledSwitchButton, IHasCustomTooltip @@ -148,7 +148,7 @@ public LabelledSingerSwitchButton(ISinger singer) Margin = new MarginPadding { Left = CONTENT_PADDING_HORIZONTAL, - } + }, }); bindableName.BindValueChanged(e => Label = e.NewValue, true); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SpecialActionSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SpecialActionSection.cs index c0d647d93..0f15d58d4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SpecialActionSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/SpecialActionSection.cs @@ -29,7 +29,7 @@ protected SpecialActionSection() Label = SwitchActionTitle, Description = SwitchActionDescription, Current = bindableModeSpecialAction, - } + }, }; bindableModeSpecialAction.BindValueChanged(e => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSection.cs index 26cb715dc..a81aff626 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSection.cs @@ -22,7 +22,7 @@ protected override Selection CreateSelection(TextingEditMode mode) => TextingEditMode.Typing => new Selection(), TextingEditMode.Split => new Selection(), TextingEditMode.Verify => new TextingVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(TextingEditMode mode) => @@ -31,7 +31,7 @@ protected override LocalisableString GetSelectionText(TextingEditMode mode) => TextingEditMode.Typing => "Typing", TextingEditMode.Split => "Split", TextingEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, TextingEditMode mode, bool active) => @@ -40,7 +40,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, TextingEditMode TextingEditMode.Typing => active ? colours.Blue : colours.BlueDarker, TextingEditMode.Split => active ? colours.Red : colours.RedDarker, TextingEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(TextingEditMode mode) => @@ -49,7 +49,7 @@ protected override DescriptionFormat GetSelectionDescription(TextingEditMode mod TextingEditMode.Typing => "Edit the lyric text.", TextingEditMode.Split => "Create/delete or split/combine the lyric.", TextingEditMode.Verify => "Check if have lyric with no text.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class TextingVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSpecialAction.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSpecialAction.cs index ef457fa88..3aa048047 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSpecialAction.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingEditModeSpecialAction.cs @@ -9,5 +9,5 @@ public enum TextingEditModeSpecialAction Delete, - Move + Move, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingIssueSection.cs index 2f60e29b9..1c7a28580 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Texting/TextingIssueSection.cs @@ -52,7 +52,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TextingSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TextingSettings.cs index b84993ac5..dd97ff30d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TextingSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TextingSettings.cs @@ -46,6 +46,6 @@ private void load(ITextingModeState textingModeState) new TextingEditModeSection(), new TextingIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTagSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTagSettings.cs index 37a0e4635..795fd2da1 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTagSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTagSettings.cs @@ -35,13 +35,13 @@ private void load(ITimeTagModeState timeTagModeState) new TimeTagEditModeSection(), new TimeTagAutoGenerateSection(), new TimeTagCreateConfigSection(), - new CreateTimeTagActionReceiver() + new CreateTimeTagActionReceiver(), }, TimeTagEditMode.Recording => new Drawable[] { new TimeTagEditModeSection(), new TimeTagRecordingConfigSection(), - new RecordTimeTagActionReceiver() + new RecordTimeTagActionReceiver(), }, TimeTagEditMode.Adjust => new Drawable[] { @@ -49,6 +49,6 @@ private void load(ITimeTagModeState timeTagModeState) new TimeTagAdjustConfigSection(), new TimeTagIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/Components/LabelledOpacityAdjustment.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/Components/LabelledOpacityAdjustment.cs index c436fffc1..4be785283 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/Components/LabelledOpacityAdjustment.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/Components/LabelledOpacityAdjustment.cs @@ -50,7 +50,7 @@ public LabelledOpacityAdjustment() Anchor = Anchor.TopRight, Origin = Anchor.TopRight, Size = new Vector2(CONFIG_BUTTON_SIZE), - } + }, }); Component.Current.BindValueChanged(_ => updateConfigButtonOpacity(), true); @@ -91,7 +91,7 @@ public Popover GetPopover() { Width = 150, Current = { BindTarget = Current }, - } + }, }; private partial class OpacitySliderBar : RoundedSliderBar diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/CreateTimeTagActionReceiver.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/CreateTimeTagActionReceiver.cs index 575183b0d..fb3f60102 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/CreateTimeTagActionReceiver.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/CreateTimeTagActionReceiver.cs @@ -30,7 +30,7 @@ public bool OnPressed(KeyBindingPressEvent e) { TimeTagIndexCaretPosition timeTagIndexCaretPosition => processCreateTimeTagAction(timeTagIndexCaretPosition, action), TimeTagCaretPosition timeTagCaretPosition => processModifyTimeTagAction(timeTagCaretPosition, action), - _ => throw new NotSupportedException(nameof(caretPosition)) + _ => throw new NotSupportedException(nameof(caretPosition)), }; } @@ -103,7 +103,7 @@ private bool processModifyTimeTagAction(TimeTagCaretPosition timeTagCaretPositio KaraokeEditAction.ShiftTheTimeTagRight => new Tuple(ShiftingDirection.Right, ShiftingType.Index), KaraokeEditAction.ShiftTheTimeTagStateLeft => new Tuple(ShiftingDirection.Left, ShiftingType.State), KaraokeEditAction.ShiftTheTimeTagStateRight => new Tuple(ShiftingDirection.Right, ShiftingType.State), - _ => null + _ => null, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAdjustConfigSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAdjustConfigSection.cs index 4304f1679..6511b3e93 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAdjustConfigSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAdjustConfigSection.cs @@ -24,7 +24,7 @@ private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManage { Label = "Time range", Description = "Change time-range to zoom-in/zoom-out the adjust area.", - Current = timeTagModeState.BindableAdjustZoom + Current = timeTagModeState.BindableAdjustZoom, }, new LabelledOpacityAdjustment { @@ -39,7 +39,7 @@ private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManage Description = "Show/hide or change the opacity of the ticks.", Current = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.AdjustTimeTagShowTick), Opacity = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.AdjustTimeTagTickOpacity), - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAutoGenerateSection.cs index 5292d529e..2018b995d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagAutoGenerateSection.cs @@ -29,10 +29,10 @@ protected override DescriptionFormat CreateInvalidDescriptionFormat() language_mode, new SwitchModeDescriptionAction { Text = "edit language mode", - Mode = LyricEditorMode.Language + Mode = LyricEditorMode.Language, } - } - } + }, + }, }; protected override ConfigButton CreateConfigButton() @@ -51,7 +51,7 @@ protected override string GetDisplayName(KaraokeRulesetEditGeneratorSetting sett { KaraokeRulesetEditGeneratorSetting.JaTimeTagGeneratorConfig => "Japanese", KaraokeRulesetEditGeneratorSetting.ZhTimeTagGeneratorConfig => "Chinese", - _ => throw new ArgumentOutOfRangeException(nameof(setting)) + _ => throw new ArgumentOutOfRangeException(nameof(setting)), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSection.cs index f0ad173dc..6a2feaa1d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSection.cs @@ -22,14 +22,14 @@ private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManage { new TimeTagCreateConfigSubsection { - Current = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.CreateTimeTagEditMode) + Current = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.CreateTimeTagEditMode), }, new LabelledEnumDropdown { Label = "Create tag mode", Description = "Only create start/end time-tag or both.", Current = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.CreateTimeTagMovingCaretMode), - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSubsection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSubsection.cs index ccf9bf729..6ca69bb26 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSubsection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagCreateConfigSubsection.cs @@ -68,7 +68,7 @@ public TimeTagCreateConfigSubsection() AutoSizeAxes = Axes.Y, RowDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, Content = new[] { @@ -79,16 +79,16 @@ public TimeTagCreateConfigSubsection() Padding = new MarginPadding { Horizontal = horizontal_padding }, Action = () => current.Value = x, }).ToArray(), - } - } - } + }, + }, + }, }, lyricEditorDescription = new LyricEditorDescriptionTextFlowContainer { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Padding = new MarginPadding { Horizontal = horizontal_padding }, - } + }, }; current.BindValueChanged(e => @@ -125,7 +125,7 @@ private LocalisableString getButtonTitle(CreateTimeTagEditMode mode) { CreateTimeTagEditMode.Create => "Create", CreateTimeTagEditMode.Modify => "Modify", - _ => throw new InvalidOperationException(nameof(mode)) + _ => throw new InvalidOperationException(nameof(mode)), }; private Color4 getButtonColour(CreateTimeTagEditMode mode, bool active) @@ -133,7 +133,7 @@ private Color4 getButtonColour(CreateTimeTagEditMode mode, bool active) { CreateTimeTagEditMode.Create => active ? colours.Green : colours.GreenDarker, CreateTimeTagEditMode.Modify => active ? colours.Pink : colours.PinkDarker, - _ => throw new InvalidOperationException(nameof(mode)) + _ => throw new InvalidOperationException(nameof(mode)), }; private DescriptionFormat getDescription(CreateTimeTagEditMode mode) => @@ -152,8 +152,8 @@ private DescriptionFormat getDescription(CreateTimeTagEditMode mode) => AdjustableActions = new List { KaraokeEditAction.CreateStartTimeTag, - KaraokeEditAction.CreateEndTimeTag - } + KaraokeEditAction.CreateEndTimeTag, + }, } }, { @@ -163,11 +163,11 @@ private DescriptionFormat getDescription(CreateTimeTagEditMode mode) => AdjustableActions = new List { KaraokeEditAction.RemoveStartTimeTag, - KaraokeEditAction.RemoveEndTimeTag - } + KaraokeEditAction.RemoveEndTimeTag, + }, } - } - } + }, + }, }, CreateTimeTagEditMode.Modify => new DescriptionFormat { @@ -185,14 +185,14 @@ private DescriptionFormat getDescription(CreateTimeTagEditMode mode) => KaraokeEditAction.ShiftTheTimeTagRight, KaraokeEditAction.ShiftTheTimeTagStateLeft, KaraokeEditAction.ShiftTheTimeTagStateRight, - } + }, } }, { "create_time_tag", new InputKeyDescriptionAction { AdjustableActions = new List { KaraokeEditAction.CreateStartTimeTag, KaraokeEditAction.CreateEndTimeTag } } }, - { "remove_time_tag", new InputKeyDescriptionAction { AdjustableActions = new List { KaraokeEditAction.RemoveStartTimeTag, KaraokeEditAction.RemoveEndTimeTag } } } - } + { "remove_time_tag", new InputKeyDescriptionAction { AdjustableActions = new List { KaraokeEditAction.RemoveStartTimeTag, KaraokeEditAction.RemoveEndTimeTag } } }, + }, }, - _ => throw new InvalidOperationException(nameof(mode)) + _ => throw new InvalidOperationException(nameof(mode)), }; private partial class EditModeButton : EditorSectionButton diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagEditModeSection.cs index ab0d0fd4a..6d2bcf635 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagEditModeSection.cs @@ -23,7 +23,7 @@ protected override Selection CreateSelection(TimeTagEditMode mode) => TimeTagEditMode.Create => new Selection(), TimeTagEditMode.Recording => new Selection(), TimeTagEditMode.Adjust => new TimeTagVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(TimeTagEditMode mode) => @@ -32,7 +32,7 @@ protected override LocalisableString GetSelectionText(TimeTagEditMode mode) => TimeTagEditMode.Create => "Create", TimeTagEditMode.Recording => "Recording", TimeTagEditMode.Adjust => "Adjust", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, TimeTagEditMode mode, bool active) => @@ -41,7 +41,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, TimeTagEditMode TimeTagEditMode.Create => active ? colours.Blue : colours.BlueDarker, TimeTagEditMode.Recording => active ? colours.Red : colours.RedDarker, TimeTagEditMode.Adjust => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(TimeTagEditMode mode) => @@ -57,19 +57,19 @@ protected override DescriptionFormat GetSelectionDescription(TimeTagEditMode mod { "set_time_tag_time", new InputKeyDescriptionAction { - AdjustableActions = new List { KaraokeEditAction.SetTime } + AdjustableActions = new List { KaraokeEditAction.SetTime }, } }, { "clear_time_tag_time", new InputKeyDescriptionAction { - AdjustableActions = new List { KaraokeEditAction.ClearTime } + AdjustableActions = new List { KaraokeEditAction.ClearTime }, } - } - } + }, + }, }, TimeTagEditMode.Adjust => "Drag to adjust time-tag time precisely.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class TimeTagVerifySelection : LyricEditorVerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagIssueSection.cs index e31a3e713..1570e79b1 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagIssueSection.cs @@ -64,7 +64,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } @@ -78,7 +78,7 @@ protected override Drawable[] CreateContent(Issue issue) Size = new Vector2(10), Colour = issue.Template.Colour, Margin = new MarginPadding { Left = 10 }, - Icon = FontAwesome.Solid.AlignLeft + Icon = FontAwesome.Solid.AlignLeft, }, new OsuSpriteText { @@ -95,7 +95,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } @@ -105,7 +105,7 @@ protected override Drawable[] CreateContent(Issue issue) { LyricTimeTagIssue timeTagIssue => new Tuple(timeTagIssue.Lyric, timeTagIssue.TimeTag), LyricIssue lyricIssue => new Tuple(lyricIssue.Lyric, null), - _ => throw new InvalidCastException() + _ => throw new InvalidCastException(), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagRecordingConfigSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagRecordingConfigSection.cs index 95a42b6eb..dc94c068c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagRecordingConfigSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/TimeTagRecordingConfigSection.cs @@ -44,7 +44,7 @@ private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManage { Label = "Time range", Description = "Change time-range to zoom-in/zoom-out the recording area.", - Current = timeTagModeState.BindableRecordZoom + Current = timeTagModeState.BindableRecordZoom, }, new LabelledOpacityAdjustment { @@ -59,7 +59,7 @@ private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManage Description = "Show/hide or change the opacity of the ticks.", Current = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.RecordingTimeTagShowTick), Opacity = lyricEditorConfigManager.GetBindable(KaraokeRulesetLyricEditorSetting.RecordingTimeTagTickOpacity), - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs index 0ba6bd87f..0c16208a1 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs @@ -137,7 +137,7 @@ private void refreshAlgorithmAndCaretPosition() LyricEditorMode.EditTimeTag => getTimeTagModeAlgorithm(modeWithSubMode.GetSubMode()), LyricEditorMode.EditNote => new NavigateCaretPositionAlgorithm(lyrics), LyricEditorMode.Singer => new NavigateCaretPositionAlgorithm(lyrics), - _ => throw new InvalidOperationException(nameof(mode)) + _ => throw new InvalidOperationException(nameof(mode)), }; ICaretPositionAlgorithm getTextingModeAlgorithm(TextingEditMode textingEditMode) => @@ -146,7 +146,7 @@ ICaretPositionAlgorithm getTextingModeAlgorithm(TextingEditMode textingEditMode) TextingEditMode.Typing => new TypingCaretPositionAlgorithm(lyrics), TextingEditMode.Split => new CuttingCaretPositionAlgorithm(lyrics), TextingEditMode.Verify => new NavigateCaretPositionAlgorithm(lyrics), - _ => throw new InvalidOperationException(nameof(textingEditMode)) + _ => throw new InvalidOperationException(nameof(textingEditMode)), }; ICaretPositionAlgorithm getTimeTagModeAlgorithm(TimeTagEditMode timeTagEditMode) @@ -156,7 +156,7 @@ ICaretPositionAlgorithm getTimeTagModeAlgorithm(TimeTagEditMode timeTagEditMode) TimeTagEditMode.Create => getCreateTimeTagEditModeAlgorithm(lyrics, bindableCreateTimeTagEditMode.Value, bindableCreateMovingCaretMode.Value), TimeTagEditMode.Recording => new TimeTagCaretPositionAlgorithm(lyrics) { Mode = bindableRecordingMovingCaretMode.Value }, TimeTagEditMode.Adjust => new NavigateCaretPositionAlgorithm(lyrics), - _ => throw new InvalidOperationException(nameof(timeTagEditMode)) + _ => throw new InvalidOperationException(nameof(timeTagEditMode)), }; static ICaretPositionAlgorithm getCreateTimeTagEditModeAlgorithm(Lyric[] lyrics, CreateTimeTagEditMode createTimeTagEditMode, MovingTimeTagCaretMode movingTimeTagCaretMode) => @@ -164,7 +164,7 @@ static ICaretPositionAlgorithm getCreateTimeTagEditModeAlgorithm(Lyric[] lyrics, { CreateTimeTagEditMode.Create => new TimeTagIndexCaretPositionAlgorithm(lyrics), CreateTimeTagEditMode.Modify => new TimeTagCaretPositionAlgorithm(lyrics) { Mode = movingTimeTagCaretMode }, - _ => throw new InvalidOperationException(nameof(createTimeTagEditMode)) + _ => throw new InvalidOperationException(nameof(createTimeTagEditMode)), }; } } @@ -209,7 +209,7 @@ public bool MoveCaret(MovingCaretAction action) MovingCaretAction.NextIndex => performMoveToNextIndex(algorithm, currentPosition), MovingCaretAction.FirstIndex => performMoveToFirstIndex(algorithm, currentPosition), MovingCaretAction.LastIndex => performMoveToLastIndex(algorithm, currentPosition), - _ => throw new InvalidEnumArgumentException(nameof(action)) + _ => throw new InvalidEnumArgumentException(nameof(action)), }; static ICaretPosition? performMoveToPreviousIndex(ICaretPositionAlgorithm algorithm, ICaretPosition caretPosition) => @@ -375,7 +375,7 @@ public void SyncSelectedHitObjectWithCaret() { TypingCaretPositionAlgorithm => true, CreateRubyTagCaretPositionAlgorithm => true, - _ => false + _ => false, }; private void postProcess() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricEditorSelectingAction.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricEditorSelectingAction.cs index 5aad2d945..50405efc8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricEditorSelectingAction.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricEditorSelectingAction.cs @@ -7,5 +7,5 @@ public enum LyricEditorSelectingAction { Apply, - Cancel + Cancel, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/LanguageEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/LanguageEditMode.cs index 0d3469612..2fe56d532 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/LanguageEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/LanguageEditMode.cs @@ -7,5 +7,5 @@ public enum LanguageEditMode { Generate, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/NoteEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/NoteEditMode.cs index 27509e0ec..06efca345 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/NoteEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/NoteEditMode.cs @@ -9,5 +9,5 @@ public enum NoteEditMode Edit, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/ReferenceLyricEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/ReferenceLyricEditMode.cs index 66e787bb9..26bfc212c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/ReferenceLyricEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/ReferenceLyricEditMode.cs @@ -7,5 +7,5 @@ public enum ReferenceLyricEditMode { Edit, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditMode.cs index 444e708c4..7e760bc48 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditMode.cs @@ -9,5 +9,5 @@ public enum RomajiTagEditMode Edit, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RubyTagEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RubyTagEditMode.cs index 81da2c830..2fee252fe 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RubyTagEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RubyTagEditMode.cs @@ -9,5 +9,5 @@ public enum RubyTagEditMode Edit, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TextingEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TextingEditMode.cs index 12f39da8e..bc1026857 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TextingEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TextingEditMode.cs @@ -9,5 +9,5 @@ public enum TextingEditMode Split, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TimeTagEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TimeTagEditMode.cs index 4573091e2..40ca22686 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TimeTagEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/TimeTagEditMode.cs @@ -9,5 +9,5 @@ public enum TimeTagEditMode Recording, - Adjust + Adjust, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Components/Timeline/PageSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Components/Timeline/PageSelectionBlueprint.cs index 5384e25ee..a53134ed0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Components/Timeline/PageSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Components/Timeline/PageSelectionBlueprint.cs @@ -95,7 +95,7 @@ private void load(OsuColour colours, IPageStateProvider pageStateProvider) Padding = new MarginPadding(3), Font = OsuFont.Default.With(size: 14, weight: FontWeight.SemiBold), Colour = colours.B5, - } + }, }; pagesVersion.BindTo(pageStateProvider.PageInfo.PagesVersion); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditor.cs index 47b87be5c..a34334f17 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditor.cs @@ -20,7 +20,7 @@ public PageEditor() { background = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, new PagesTimeLine { @@ -28,7 +28,7 @@ public PageEditor() Origin = Anchor.BottomCentre, RelativeSizeAxes = Axes.X, Height = 100, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditorEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditorEditMode.cs index dae735a3d..14f67b489 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditorEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageEditorEditMode.cs @@ -9,5 +9,5 @@ public enum PageEditorEditMode Edit, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageScreen.cs index 1244f8822..246649af2 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageScreen.cs @@ -75,8 +75,8 @@ private void load(EditorClock editorClock) }, new PageSettings(), }, - } - } + }, + }, }); } @@ -104,7 +104,7 @@ public FixedSectionsContainer() { Masking = true, RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = 55 } + Padding = new MarginPadding { Top = 55 }, }); } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageAutoGenerateSection.cs index 6a82a2377..2b734e62d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageAutoGenerateSection.cs @@ -26,7 +26,7 @@ protected override EditorSectionButton CreateGenerateButton() protected override DescriptionFormat CreateInvalidDescriptionFormat() => new() { - Text = "Seems have some time-related issues in the lyrics. Go to lyric editor to fix them." + Text = "Seems have some time-related issues in the lyrics. Go to lyric editor to fix them.", }; protected override ConfigButton CreateConfigButton() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorEditModeSection.cs index ee40c4aa0..bd4a12b0e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorEditModeSection.cs @@ -35,7 +35,7 @@ protected override Selection CreateSelection(PageEditorEditMode mode) => PageEditorEditMode.Generate => new Selection(), PageEditorEditMode.Edit => new Selection(), PageEditorEditMode.Verify => new PageEditorVerifySelection(), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(PageEditorEditMode mode) => @@ -44,7 +44,7 @@ protected override LocalisableString GetSelectionText(PageEditorEditMode mode) = PageEditorEditMode.Generate => "Generate", PageEditorEditMode.Edit => "Edit", PageEditorEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, PageEditorEditMode mode, bool active) => @@ -53,7 +53,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, PageEditorEditMo PageEditorEditMode.Generate => active ? colours.Blue : colours.BlueDarker, PageEditorEditMode.Edit => active ? colours.Red : colours.RedDarker, PageEditorEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(PageEditorEditMode mode) => @@ -62,7 +62,7 @@ protected override DescriptionFormat GetSelectionDescription(PageEditorEditMode PageEditorEditMode.Generate => "Generate the pages by lyric.", PageEditorEditMode.Edit => "Batch edit page in here.", PageEditorEditMode.Verify => "Check if have any page issues.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class PageEditorVerifySelection : VerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorIssueSection.cs index cbfe514c1..e853ad96a 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageEditorIssueSection.cs @@ -69,7 +69,7 @@ protected override Drawable[] CreateContent(Issue issue) Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new OsuSpriteText { @@ -81,7 +81,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageSettings.cs index a2a940578..b26242c37 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PageSettings.cs @@ -44,6 +44,6 @@ private void load(OverlayColourProvider colourProvider, IPageStateProvider pageS new PageEditorEditModeSection(), new PageEditorIssueSection(), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PagesSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PagesSection.cs index 0910f978f..62e5b2f19 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PagesSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/Settings/PagesSection.cs @@ -80,7 +80,7 @@ public CreateNewPageButton() double currentTime = clock.CurrentTime; beatmapPagesChangeHandler.Add(new Page { - Time = currentTime + Time = currentTime, }); }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/AvatarSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/AvatarSection.cs index ac669464f..7ffed9345 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/AvatarSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/AvatarSection.cs @@ -21,7 +21,7 @@ public AvatarSection(Singer singer) Label = "Colour", Description = "Select singer colour.", Current = singer.HueBindable, - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/MetadataSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/MetadataSection.cs index 399624950..9fdaa56d3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/MetadataSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/MetadataSection.cs @@ -20,25 +20,25 @@ public MetadataSection(Singer singer) { Label = "Singer", Current = singer.NameBindable, - TabbableContentContainer = this + TabbableContentContainer = this, }, new LabelledTextBox { Label = "Romaji name", Current = singer.RomajiNameBindable, - TabbableContentContainer = this + TabbableContentContainer = this, }, new LabelledTextBox { Label = "English name", Current = singer.EnglishNameBindable, - TabbableContentContainer = this + TabbableContentContainer = this, }, new LabelledTextBox { Label = "Description", Current = singer.DescriptionBindable, - TabbableContentContainer = this + TabbableContentContainer = this, }, }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/SingerEditPopover.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/SingerEditPopover.cs index a9b7ab7fd..28747d03e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/SingerEditPopover.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Detail/SingerEditPopover.cs @@ -29,8 +29,8 @@ public SingerEditPopover(Singer singer) { new AvatarSection(singer), new MetadataSection(singer), - } - } + }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs index dbb28a8d0..30f456927 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs @@ -49,8 +49,8 @@ public SingerAvatar(Singer singer) new DrawableSingerAvatar { RelativeSizeAxes = Axes.Both, - Singer = singer - } + Singer = singer, + }, }; } @@ -106,7 +106,7 @@ public FileChooserPopover(string[] handledExtensions, Bindable curren Child = new OsuFileSelector(currentFile.Value?.DirectoryName, handledExtensions) { RelativeSizeAxes = Axes.Both, - CurrentFile = { BindTarget = currentFile } + CurrentFile = { BindTarget = currentFile }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/CreateNewLyricPlacementRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/CreateNewLyricPlacementRow.cs index 555850fc9..dd4a9dc73 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/CreateNewLyricPlacementRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/CreateNewLyricPlacementRow.cs @@ -36,8 +36,8 @@ protected override Drawable CreateSingerInfo(Singer singer) Action = () => { beatmapSingersChangeHandler.Add(); - } - } + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/DefaultLyricPlacementRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/DefaultLyricPlacementRow.cs index cd2cfe97d..521c26dd6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/DefaultLyricPlacementRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/DefaultLyricPlacementRow.cs @@ -38,7 +38,7 @@ public DefaultLyricPlacementColumn() new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4Extensions.FromHex("333") + Colour = Color4Extensions.FromHex("333"), }, new Container { @@ -54,7 +54,7 @@ public DefaultLyricPlacementColumn() RelativeSizeAxes = Axes.Y, Height = 0.5f, Icon = FontAwesome.Solid.SearchPlus, - Action = () => changeZoom(1) + Action = () => changeZoom(1), }, new TimelineButton { @@ -63,10 +63,10 @@ public DefaultLyricPlacementColumn() RelativeSizeAxes = Axes.Y, Height = 0.5f, Icon = FontAwesome.Solid.SearchMinus, - Action = () => changeZoom(-1) + Action = () => changeZoom(-1), }, - } - } + }, + }, }, }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/LyricPlacementRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/LyricPlacementRow.cs index 5d0ccbfa4..4e20c6caf 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/LyricPlacementRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/LyricPlacementRow.cs @@ -53,9 +53,9 @@ private void load(OverlayColourProvider colourProvider) Colour = colourProvider.Dark1, }, CreateTimeLinePart(singer).With(x => { x.RelativeSizeAxes = Axes.Both; }), - } - } - } + }, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/SingerLyricPlacementRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/SingerLyricPlacementRow.cs index aea2365d0..230b82362 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/SingerLyricPlacementRow.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/SingerLyricPlacementRow.cs @@ -121,13 +121,13 @@ public DrawableSingerInfo(Singer singer) Name = "English name", Font = OsuFont.GetFont(weight: FontWeight.Bold, size: sub_text_size), RelativeSizeAxes = Axes.X, - } - } - } - } - } + }, + }, + }, + }, + }, }, - } + }, }; bindableOrder.BindValueChanged(_ => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerEditSection.cs index 16b15ff25..d7a302052 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerEditSection.cs @@ -22,7 +22,7 @@ private void load(IBeatmapSingersChangeHandler beatmapSingersChangeHandler) RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 100), - new Dimension() + new Dimension(), }, Content = new[] { @@ -32,7 +32,7 @@ private void load(IBeatmapSingersChangeHandler beatmapSingersChangeHandler) { Name = "Default", RelativeSizeAxes = Axes.Both, - } + }, }, new Drawable[] { @@ -41,9 +41,9 @@ private void load(IBeatmapSingersChangeHandler beatmapSingersChangeHandler) Name = "List of singer", RelativeSizeAxes = Axes.Both, DisplayBottomDrawable = true, - } - } - } + }, + }, + }, }; singerContainers.Items.BindTo(beatmapSingersChangeHandler.Singers); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableList.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableList.cs index 9f404c1f5..f009c7d86 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableList.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableList.cs @@ -42,8 +42,8 @@ protected override Drawable CreateBottomDrawable() Child = new CreateNewLyricPlacementColumn { RelativeSizeAxes = Axes.Both, - } - } + }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableListItem.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableListItem.cs index 5cbb91977..37ea496df 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableListItem.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerRearrangeableListItem.cs @@ -40,13 +40,13 @@ protected override Drawable CreateContent() dragAlert = new Box { RelativeSizeAxes = Axes.Both, - Alpha = 0 + Alpha = 0, }, new SingerLyricPlacementColumn(singer) { RelativeSizeAxes = Axes.Both, - } - } + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerScreen.cs index 8c38a4cdd..7ccd523ee 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerScreen.cs @@ -59,7 +59,7 @@ private void load(EditorBeatmap editorBeatmap, EditorClock editorClock) { RelativeSizeAxes = Axes.Both, }, - } + }, }); } @@ -84,7 +84,7 @@ public FixedSectionsContainer() { Masking = true, RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = 55 } + Padding = new MarginPadding { Top = 55 }, }); } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateEditSection.cs index 683e93ea5..e5856f3cd 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateEditSection.cs @@ -49,7 +49,7 @@ public TranslateEditSection() new Dimension(GridSizeMode.Absolute, column_spacing), new Dimension(GridSizeMode.Absolute, 400), new Dimension(GridSizeMode.Absolute, column_spacing), - new Dimension() + new Dimension(), }; GridContainer translateGrid; @@ -64,7 +64,7 @@ public TranslateEditSection() Name = "LanguageSelection", RowDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, ColumnDimensions = columnDimensions, RelativeSizeAxes = Axes.X, @@ -111,11 +111,11 @@ public TranslateEditSection() { Y = 5, }, - } - } - } + }, + }, + }, }, - } + }, }, new Container { @@ -128,7 +128,7 @@ public TranslateEditSection() Name = "Background", RowDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, ColumnDimensions = columnDimensions, RelativeSizeAxes = Axes.Both, @@ -149,17 +149,17 @@ public TranslateEditSection() { timeSectionBackground = new CornerBackground { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, null, lyricSectionBackground = new CornerBackground { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, null, null, }, - } + }, }, translateGrid = new GridContainer { @@ -167,9 +167,9 @@ public TranslateEditSection() ColumnDimensions = columnDimensions, RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - } - } - } + }, + }, + }, }, }; @@ -222,7 +222,7 @@ private Drawable createTimeDrawable(Lyric lyric) Origin = Anchor.CentreLeft, Margin = new MarginPadding { Left = row_inner_spacing }, Font = OsuFont.GetFont(size: 18, fixedWidth: true), - AllowMultiline = false + AllowMultiline = false, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateScreen.cs index 87a321b5e..9cf594792 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateScreen.cs @@ -40,7 +40,7 @@ private void load() RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, }, - } + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Issues/IssueIcon.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Issues/IssueIcon.cs index efeca7ae5..76a6db1d0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Issues/IssueIcon.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Issues/IssueIcon.cs @@ -47,7 +47,7 @@ static Drawable createIssueIcon(Issue issue) return new SpriteIcon { - Icon = GetIconByIssueTemplate(issue.Template) + Icon = GetIconByIssueTemplate(issue.Template), }; } } @@ -56,7 +56,7 @@ static Drawable createIssueIcon(Issue issue) issue switch { LyricTimeTagIssue lyricTimeTagIssue => new DrawableTextIndex { State = lyricTimeTagIssue.TimeTag.Index.State }, - _ => null + _ => null, }; internal static IconUsage GetIconByIssueTemplate(IssueTemplate issueTemplate) @@ -87,6 +87,6 @@ internal static IconUsage GetIconUsageByCheck(ICheck check) => CheckNoteReferenceLyric => FontAwesome.Solid.Link, CheckNoteText => FontAwesome.Solid.Link, CheckNoteTime => FontAwesome.Solid.Times, - _ => throw new ArgumentOutOfRangeException(nameof(check), check, null) + _ => throw new ArgumentOutOfRangeException(nameof(check), check, null), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionFormat.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionFormat.cs index 4ac17aa29..827774d67 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionFormat.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionFormat.cs @@ -20,6 +20,6 @@ public static implicit operator DescriptionFormat(string text) public static implicit operator DescriptionFormat(LocalisableString text) => new() { - Text = text + Text = text, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionTextFlowContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionTextFlowContainer.cs index b6e8d5e31..f622754ee 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionTextFlowContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/DescriptionTextFlowContainer.cs @@ -49,7 +49,7 @@ public DescriptionFormat Description public SpriteText CreateSpriteText() => new OsuSpriteText { - Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular) + Font = OsuFont.GetFont(size: 14, weight: FontWeight.Regular), }; private OsuMarkdownLinkText? processLinkText(string text, string? url) @@ -69,7 +69,7 @@ protected virtual OsuMarkdownLinkText GetLinkTextByDescriptionAction(IDescriptio { InputKeyDescriptionAction inputKey => new InputKeyText(inputKey), SwitchModeDescriptionAction switchMode => new SwitchMoteText(switchMode), - _ => throw new InvalidCastException() + _ => throw new InvalidCastException(), }; internal partial class DescriptionMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/InputKeyText.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/InputKeyText.cs index a8b413caf..66e497fb3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/InputKeyText.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Markdown/InputKeyText.cs @@ -106,7 +106,7 @@ public Popover GetPopover() { Width = 300, RelativeSizeAxes = Axes.None, - } + }, }; // because it's not possible to get the key change event, so at least update the key after popover closed. diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableLyricTimelineSelectionBlueprint.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableLyricTimelineSelectionBlueprint.cs index c755c5144..e7bbbacf7 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableLyricTimelineSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableLyricTimelineSelectionBlueprint.cs @@ -46,8 +46,8 @@ public EditableLyricTimelineSelectionBlueprint(Lyric item) RelativeSizeAxes = Axes.X, Text = item.Text, ShowTooltip = false, - } - } + }, + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimeline.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimeline.cs index 0fea67a5c..f1d845244 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimeline.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimeline.cs @@ -37,7 +37,7 @@ private void load() c.RelativeSizeAxes = Axes.X; c.Depth = float.MaxValue; c.Children = CreateBlueprintContainer().ToList(); - }) + }), }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimelineBlueprintContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimelineBlueprintContainer.cs index b14c25399..435e5cc04 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimelineBlueprintContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Timeline/EditableTimelineBlueprintContainer.cs @@ -100,7 +100,7 @@ private partial class EditableTimelineDragBox : DragBox protected override Drawable CreateBox() => new Box { RelativeSizeAxes = Axes.Y, - Alpha = 0.3f + Alpha = 0.3f, }; public override void HandleDrag(MouseButtonEvent e) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/UserInterface/LanguagesSelector.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/UserInterface/LanguagesSelector.cs index bc20ce9c0..d79e72b38 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/UserInterface/LanguagesSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/UserInterface/LanguagesSelector.cs @@ -61,7 +61,7 @@ public LanguagesSelector() { RelativeSizeAxes = Axes.X, Text = $"#{i} - {CultureInfoUtils.GetLanguageDisplayText(cultureInfo)}", - OnDeleteButtonClick = () => removeCultureInfo(cultureInfo) + OnDeleteButtonClick = () => removeCultureInfo(cultureInfo), }); } }); @@ -71,7 +71,7 @@ public LanguagesSelector() { RelativeSizeAxes = Axes.X, Height = 300, - LanguageSelected = addCultureInfo + LanguageSelected = addCultureInfo, }); } @@ -139,7 +139,7 @@ public SelectedLanguage() }, Size = new Vector2(delete_button_size), Action = () => OnDeleteButtonClick?.Invoke(), - } + }, }; } @@ -186,7 +186,7 @@ private void load(OverlayColourProvider? colourProvider) new Box { RelativeSizeAxes = Axes.Both, - Colour = colourProvider?.Background5 ?? Color4Extensions.FromHex(@"1c2125") + Colour = colourProvider?.Background5 ?? Color4Extensions.FromHex(@"1c2125"), }, new Container { @@ -195,9 +195,9 @@ private void load(OverlayColourProvider? colourProvider) Child = new LanguageSelector { RelativeSizeAxes = Axes.Both, - Current = current - } - } + Current = current, + }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/EditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/EditModeSection.cs index 2ba0caaf6..8a8f38619 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/EditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/EditModeSection.cs @@ -47,19 +47,19 @@ protected EditModeSection() AutoSizeAxes = Axes.Y, RowDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, Content = new[] { - selections = createSelections() - } + selections = createSelections(), + }, }, lyricEditorDescription = CreateDescriptionTextFlowContainer().With(x => { x.RelativeSizeAxes = Axes.X; x.AutoSizeAxes = Axes.Y; x.Padding = new MarginPadding { Horizontal = horizontal_padding }; - }) + }), }; // should wait until derived class BDL ready. @@ -190,7 +190,7 @@ public CountCircle() circle = new Circle { RelativeSizeAxes = Axes.Both, - Colour = Color4.Red + Colour = Color4.Red, }, countText = new OsuSpriteText { @@ -201,7 +201,7 @@ public CountCircle() Padding = new MarginPadding(5), Colour = Color4.White, UseFullGlyphHeight = true, - } + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/GeneratorConfigPopover.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/GeneratorConfigPopover.cs index 121da3a88..201e22d3e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/GeneratorConfigPopover.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/GeneratorConfigPopover.cs @@ -43,7 +43,7 @@ public GeneratorConfigPopover(KaraokeRulesetEditGeneratorSetting setting) Direction = FillDirection.Vertical, RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - } + }, }; } @@ -67,7 +67,7 @@ private static IEnumerable createConfigsSections(Generat { object value = x.Item2.GetValue(config)!; return createControl(value, x.Item1); - }).ToArray() + }).ToArray(), }; } } @@ -98,13 +98,13 @@ private static Drawable createControl(object value, ConfigSourceAttribute attrib { Label = attribute.Label, Description = attribute.Description, - Current = bBool + Current = bBool, }, Bindable bCultureInfos => new LanguagesSelector { - Current = bCultureInfos + Current = bCultureInfos, }, - _ => throw new InvalidOperationException($"{nameof(SettingSourceAttribute)} was attached to an unsupported type ({value})") + _ => throw new InvalidOperationException($"{nameof(SettingSourceAttribute)} was attached to an unsupported type ({value})"), }; } @@ -140,8 +140,8 @@ public GeneratorConfigSection() AutoSizeAxes = Axes.Y, Spacing = new Vector2(10), Direction = FillDirection.Vertical, - Margin = new MarginPadding { Top = 30 } - } + Margin = new MarginPadding { Top = 30 }, + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs index 00cca28ee..2dfc81b64 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs @@ -76,8 +76,8 @@ private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDi Child = screenContainer = new Container> { RelativeSizeAxes = Axes.Both, - Masking = true - } + Masking = true, + }, }, new Container { @@ -113,7 +113,7 @@ private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDi new Box { RelativeSizeAxes = Axes.Both, - Colour = colours.Gray2 + Colour = colours.Gray2, }, new Container { @@ -149,12 +149,12 @@ private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDi Child = new PlaybackControl { RelativeSizeAxes = Axes.Both }, }, }, - } + }, }, - } - } + }, + }, }, - } + }, }); Mode.BindValueChanged(onModeChanged, true); @@ -202,7 +202,7 @@ private void updateMenuItems(TScreenMode screenMode) { new EditorMenuItem("Save"), new EditorMenuItem("Back", MenuItemType.Standard, this.Exit), - } + }, }, }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/AssignLanguage/AssignLanguageNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/AssignLanguage/AssignLanguageNavigation.cs index ae399e8cd..1a4412496 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/AssignLanguage/AssignLanguageNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/AssignLanguage/AssignLanguageNavigation.cs @@ -38,7 +38,7 @@ protected override LocalisableString GetNavigationText(NavigationState value) => NavigationState.Working => $"Almost there, you can still click [{auto_assign_language}] to re-detect each lyric's language.", NavigationState.Done => "Cool! Seems all lyric has it's own language. Go to next step to generate ruby.", NavigationState.Error => "Oops, seems cause some error in here.", - _ => throw new ArgumentOutOfRangeException(nameof(value)) + _ => throw new ArgumentOutOfRangeException(nameof(value)), }; private partial class AssignLanguageTextFlowContainer : NavigationTextContainer diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/Components/DrawableDragFile.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/Components/DrawableDragFile.cs index f64f7be9a..2457d4b41 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/Components/DrawableDragFile.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/Components/DrawableDragFile.cs @@ -39,7 +39,7 @@ private void load(OsuColour colours) fileSelector = new OsuFileSelector(validFileExtensions: ImportLyricManager.LyricFormatExtensions) { RelativeSizeAxes = Axes.Both, - Width = 0.6f + Width = 0.6f, }, new Container { @@ -52,7 +52,7 @@ private void load(OsuColour colours) new Box { Colour = colours.GreySeaFoamDarker, - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, new Container { @@ -69,13 +69,13 @@ private void load(OsuColour colours) RelativeSizeAxes = Axes.X, Anchor = Anchor.Centre, Origin = Anchor.Centre, - TextAnchor = Anchor.Centre + TextAnchor = Anchor.Centre, }, ScrollContent = { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }, }, importButton = new RoundedButton @@ -94,10 +94,10 @@ private void load(OsuColour colours) return; Import?.Invoke(fileName); - } - } - } - } + }, + }, + }, + }, }; fileSelector.CurrentFile.BindValueChanged(fileChanged, true); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/DragFileStepScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/DragFileStepScreen.cs index c9451e062..b86fe506b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/DragFileStepScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/DragFileStepScreen.cs @@ -46,7 +46,7 @@ public DragFileStepScreen() { await Import(path).ConfigureAwait(false); }, TaskCreationOptions.LongRunning); - } + }, }; } @@ -187,7 +187,7 @@ private PopupDialog createUnknownExceptionDialog() { Icon = FontAwesome.Solid.Bug, HeaderText = @"Unknown error", - BodyText = @"Unknown error QAQa." + BodyText = @"Unknown error QAQa.", }; private PopupDialog createCompleteDialog() @@ -195,6 +195,6 @@ private PopupDialog createCompleteDialog() { Icon = FontAwesome.Regular.CheckCircle, HeaderText = @"Import success", - BodyText = "Lyrics has been imported." + BodyText = "Lyrics has been imported.", }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/EditLyric/EditLyricNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/EditLyric/EditLyricNavigation.cs index 1d6ac822d..d4207bd4c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/EditLyric/EditLyricNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/EditLyric/EditLyricNavigation.cs @@ -56,7 +56,7 @@ protected override LocalisableString GetNavigationText(NavigationState value) TextingEditMode.Typing => $"Cool! Try switching to [{split_mode}] if you want to cut or combine lyric.", TextingEditMode.Split => $"Cool! Try switching to [{typing_mode}] if you want to edit lyric.", TextingEditMode.Verify => $"Cool! Try switching to [{split_mode}] or [{typing_mode}] if you want to fix the issue.", - _ => throw new InvalidEnumArgumentException(nameof(mode)) + _ => throw new InvalidEnumArgumentException(nameof(mode)), }; case NavigationState.Error: diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRubyRomaji/GenerateRubyRomajiNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRubyRomaji/GenerateRubyRomajiNavigation.cs index 074b4c100..3b43e1001 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRubyRomaji/GenerateRubyRomajiNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRubyRomaji/GenerateRubyRomajiNavigation.cs @@ -47,7 +47,7 @@ protected override LocalisableString GetNavigationText(NavigationState value) => NavigationState.Working => $"Go to next step to generate time-tag. Messing around? Press [{auto_generate_ruby}] or [{auto_generate_romaji}] again.", NavigationState.Done => $"Go to next step to generate time-tag. Messing around? Press [{auto_generate_ruby}] or [{auto_generate_romaji}] again.", NavigationState.Error => "Oops, seems cause some error in here.", - _ => throw new ArgumentOutOfRangeException(nameof(value)) + _ => throw new ArgumentOutOfRangeException(nameof(value)), }; protected override bool AbleToNextStep(NavigationState value) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagNavigation.cs index e265ce80c..26aecf41b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagNavigation.cs @@ -41,7 +41,7 @@ protected override LocalisableString GetNavigationText(NavigationState value) => NavigationState.Working => $"Cool, you can reset your time-tag by pressing [{auto_generate_time_tag}]", NavigationState.Done => $"Cool, you can reset your time-tag by pressing [{auto_generate_time_tag}]", NavigationState.Error => "Oops, seems cause some error in here.", - _ => throw new ArgumentOutOfRangeException(nameof(value)) + _ => throw new ArgumentOutOfRangeException(nameof(value)), }; protected override bool AbleToNextStep(NavigationState value) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/Header.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/Header.cs index dc9e61524..cf8561048 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/Header.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/Header.cs @@ -55,8 +55,8 @@ public Header(ScreenStack stack) breadcrumbs = new HeaderBreadcrumbControl(stack) { Anchor = Anchor.BottomLeft, - Origin = Anchor.BottomLeft - } + Origin = Anchor.BottomLeft, + }, }, }, }; @@ -106,22 +106,22 @@ public LyricImporterHeaderTitle() Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: 24), - Text = "Import lyric" + Text = "Import lyric", }, dot = new OsuSpriteText { Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: 24), - Text = "·" + Text = "·", }, pageTitle = new OsuSpriteText { Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: 24), - } - } + }, + }, }, }; } @@ -172,7 +172,7 @@ protected override void SelectTab(TabItem tab) protected override TabItem CreateTabItem(IScreen value) => new HeaderBreadcrumbTabItem(value) { - AccentColour = AccentColour + AccentColour = AccentColour, }; private partial class HeaderBreadcrumbTabItem : BreadcrumbTabItem diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs index c34642497..5ee4d8dfe 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs @@ -66,11 +66,11 @@ public LyricImporter() { RelativeSizeAxes = Axes.Both, Padding = new MarginPadding { Top = Header.HEIGHT }, - Child = ScreenStack = new LyricImporterSubScreenStack { RelativeSizeAxes = Axes.Both } + Child = ScreenStack = new LyricImporterSubScreenStack { RelativeSizeAxes = Axes.Both }, }, new Header(ScreenStack), - } - } + }, + }, }; ScreenStack.Push(LyricImporterStep.ImportLyric); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreen.cs index 278a91670..98573c6d6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreen.cs @@ -46,8 +46,8 @@ protected LyricImporterStepScreen() Origin = Anchor.Centre, Width = 240, Text = $"{Title}, Click to next step.", - Action = Complete - } + Action = Complete, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithTopNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithTopNavigation.cs index 1a8a2178d..f376e68a3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithTopNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithTopNavigation.cs @@ -16,7 +16,7 @@ protected LyricImporterStepScreenWithTopNavigation() RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 40), - new Dimension() + new Dimension(), }, Content = new[] { @@ -27,8 +27,8 @@ protected LyricImporterStepScreenWithTopNavigation() new[] { CreateContent(), - } - } + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/TopNavigation.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/TopNavigation.cs index a9d720d20..53cbfdc3e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/TopNavigation.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/TopNavigation.cs @@ -74,8 +74,8 @@ protected TopNavigation(LyricImporterStepScreen screen) { CompleteClicked(); } - } - } + }, + }, }; } @@ -171,7 +171,7 @@ protected void AddLinkFactory(string name, string text, Action action) { Font = new FontUsage(size: 20), Text = text, - Action = action + Action = action, }); } @@ -202,5 +202,5 @@ public enum NavigationState Done, - Error + Error, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/IssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/IssueSection.cs index 404eea6a4..8fed11b7d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/IssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/IssueSection.cs @@ -49,7 +49,7 @@ protected IssueSection() }), issueNavigator = CreateIssueNavigator(), - issueTable = CreateIssueTable() + issueTable = CreateIssueTable(), }; Issues.BindCollectionChanged((_, _) => @@ -129,9 +129,9 @@ protected EmptyIssue() Text = "Click this area to re-check again.", Font = OsuFont.GetFont(size: 14), }, - } + }, }, - } + }, }; AddInternal(new HoverClickSounds(HoverSampleSet.Button)); @@ -195,7 +195,7 @@ protected IssueNavigator() Padding = new MarginPadding(10), Direction = FillDirection.Horizontal, Spacing = new Vector2(5), - Children = createCategory() + Children = createCategory(), }, BlockBox = new Box { @@ -210,8 +210,8 @@ protected IssueNavigator() Origin = Anchor.CentreRight, X = -5, Icon = FontAwesome.Solid.Redo, - } - } + }, + }, }; } @@ -220,7 +220,7 @@ private IssueCategory[] createCategory() { Type = type, Text = getTextByIssueType(type), - IssueColour = getColourByIssueType(type) + IssueColour = getColourByIssueType(type), }).ToArray(); private LocalisableString getTextByIssueType(IssueType issueType) => @@ -230,7 +230,7 @@ private LocalisableString getTextByIssueType(IssueType issueType) => IssueType.Warning => "Warning", IssueType.Error => "Internal error", IssueType.Negligible => "Suggestion", - _ => throw new ArgumentOutOfRangeException(nameof(issueType), issueType, null) + _ => throw new ArgumentOutOfRangeException(nameof(issueType), issueType, null), }; private Colour4 getColourByIssueType(IssueType issueType) => @@ -294,7 +294,7 @@ public IssueCategory() Spacing = new Vector2(5), Padding = new MarginPadding { - Horizontal = 5 + Horizontal = 5, }, Children = new[] { @@ -309,10 +309,10 @@ public IssueCategory() Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold), - } - } - } - } + }, + }, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/SectionTimingInfoItemsEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/SectionTimingInfoItemsEditor.cs index 1415209a0..f0b52a911 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/SectionTimingInfoItemsEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/SectionTimingInfoItemsEditor.cs @@ -63,7 +63,7 @@ protected DrawableTimingInfoItem(TItem item) { RemoveItem(item); }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/ClassicStageEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/ClassicStageEditor.cs index d6566b9e6..0351618df 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/ClassicStageEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/ClassicStageEditor.cs @@ -20,14 +20,14 @@ protected override GenericEditorScreen GenerateScr { ClassicStageEditorScreenMode.Stage => new StageScreen(), ClassicStageEditorScreenMode.Config => new ConfigScreen(), - _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode") + _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode"), }; protected override MenuItem[] GenerateMenuItems(ClassicStageEditorScreenMode screenMode) { return screenMode switch { - _ => Array.Empty() + _ => Array.Empty(), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs index 67a2cff01..2bed64ec8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs @@ -41,7 +41,7 @@ protected override Selection CreateSelection(StageEditorEditMode mode) => { StageEditorEditMode.Edit => new Selection(), StageEditorEditMode.Verify => new StageEditorVerifySelection(category), - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override LocalisableString GetSelectionText(StageEditorEditMode mode) => @@ -49,7 +49,7 @@ protected override LocalisableString GetSelectionText(StageEditorEditMode mode) { StageEditorEditMode.Edit => "Edit", StageEditorEditMode.Verify => "Verify", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override Color4 GetSelectionColour(OsuColour colours, StageEditorEditMode mode, bool active) => @@ -57,7 +57,7 @@ protected override Color4 GetSelectionColour(OsuColour colours, StageEditorEditM { StageEditorEditMode.Edit => active ? colours.Red : colours.RedDarker, StageEditorEditMode.Verify => active ? colours.Yellow : colours.YellowDarker, - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; protected override DescriptionFormat GetSelectionDescription(StageEditorEditMode mode) => @@ -65,7 +65,7 @@ protected override DescriptionFormat GetSelectionDescription(StageEditorEditMode { StageEditorEditMode.Edit => "Edit the stage property in here.", StageEditorEditMode.Verify => "Check if have any stage issues.", - _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) + _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; private partial class StageEditorVerifySelection : VerifySelection diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorIssueSection.cs index d01e7a331..095d572e5 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorIssueSection.cs @@ -97,7 +97,7 @@ protected override Drawable[] CreateContent(Issue issue) Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new OsuSpriteText { @@ -109,7 +109,7 @@ protected override Drawable[] CreateContent(Issue issue) { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } @@ -121,13 +121,13 @@ protected override Drawable[] CreateContent(Issue issue) Origin = Anchor.Centre, Size = new Vector2(10), Margin = new MarginPadding { Left = 10 }, - Issue = issue + Issue = issue, }, new TruncatingSpriteText { Text = issue.ToString(), RelativeSizeAxes = Axes.X, - Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium) + Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageSettings.cs index 22ced18a4..9ac77c2eb 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageSettings.cs @@ -39,7 +39,7 @@ private void load(OverlayColourProvider colourProvider, IStageEditorStateProvide StageEditorEditCategory.Layout => createSectionsForLayoutCategory(bindableMode.Value), StageEditorEditCategory.Timing => createSectionsForTimingCategory(bindableMode.Value), StageEditorEditCategory.Style => createSectionsForStyleCategory(bindableMode.Value), - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; private static IReadOnlyList createSectionsForLayoutCategory(StageEditorEditMode editMode) => editMode switch @@ -51,9 +51,9 @@ private void load(OverlayColourProvider colourProvider, IStageEditorStateProvide StageEditorEditMode.Verify => new Drawable[] { new StageEditorEditModeSection(StageEditorEditCategory.Layout), - new StageEditorIssueSection(StageEditorEditCategory.Layout) + new StageEditorIssueSection(StageEditorEditCategory.Layout), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; private static IReadOnlyList createSectionsForTimingCategory(StageEditorEditMode editMode) => editMode switch @@ -66,9 +66,9 @@ private void load(OverlayColourProvider colourProvider, IStageEditorStateProvide StageEditorEditMode.Verify => new Drawable[] { new StageEditorEditModeSection(StageEditorEditCategory.Timing), - new StageEditorIssueSection(StageEditorEditCategory.Timing) + new StageEditorIssueSection(StageEditorEditCategory.Timing), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; private static IReadOnlyList createSectionsForStyleCategory(StageEditorEditMode editMode) => editMode switch @@ -80,8 +80,8 @@ private void load(OverlayColourProvider colourProvider, IStageEditorStateProvide StageEditorEditMode.Verify => new Drawable[] { new StageEditorEditModeSection(StageEditorEditCategory.Style), - new StageEditorIssueSection(StageEditorEditCategory.Style) + new StageEditorIssueSection(StageEditorEditCategory.Style), }, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageCategoryScreenStack.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageCategoryScreenStack.cs index 04ed04297..8ecfc4f5c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageCategoryScreenStack.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageCategoryScreenStack.cs @@ -20,7 +20,7 @@ public StageCategoryScreenStack() AddInternal(background = new Box { RelativeSizeAxes = Axes.Both, - Depth = float.MaxValue + Depth = float.MaxValue, }); } @@ -36,7 +36,7 @@ private void load(OverlayColourProvider colourProvider) StageEditorEditCategory.Layout => null, StageEditorEditCategory.Timing => null, StageEditorEditCategory.Style => null, - _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode") + _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode"), }; protected override WorkspaceScreenStackTabControl CreateTabControl() => new StageCategoriesTabControl(); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditor.cs index 11b935afa..feac7cdfc 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditor.cs @@ -19,7 +19,7 @@ public StageEditor() { background = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, new StageCategoryScreenStack { @@ -27,7 +27,7 @@ public StageEditor() Origin = Anchor.BottomCentre, RelativeSizeAxes = Axes.X, Height = 250, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorEditMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorEditMode.cs index 66a4fafb4..3169ec207 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorEditMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorEditMode.cs @@ -7,5 +7,5 @@ public enum StageEditorEditMode { Edit, - Verify + Verify, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorVerifier.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorVerifier.cs index 5a9bed2ca..ef4cbc0ed 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorVerifier.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageEditorVerifier.cs @@ -18,7 +18,7 @@ protected override IEnumerable CreateChecks(StageEditorEditCategory type StageEditorEditCategory.Layout => new ICheck[] { new CheckBeatmapClassicStageInfo() }, StageEditorEditCategory.Timing => new ICheck[] { new CheckBeatmapClassicStageInfo() }, StageEditorEditCategory.Style => new ICheck[] { new CheckBeatmapClassicStageInfo() }, - _ => throw new ArgumentOutOfRangeException(nameof(type), type, null) + _ => throw new ArgumentOutOfRangeException(nameof(type), type, null), }; protected override StageEditorEditCategory ClassifyIssue(Issue issue) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageScreen.cs index ec07af3ab..892981528 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/StageScreen.cs @@ -70,7 +70,7 @@ public StageScreen() }, new StageSettings(), }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/WorkspaceScreenStack.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/WorkspaceScreenStack.cs index 4b01e4c0d..c682145fe 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/WorkspaceScreenStack.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/WorkspaceScreenStack.cs @@ -36,8 +36,8 @@ protected WorkspaceScreenStack() Child = screenContainer = new Container> { RelativeSizeAxes = Axes.Both, - Masking = true - } + Masking = true, + }, }, new Container { @@ -50,7 +50,7 @@ protected WorkspaceScreenStack() { x.RelativeSizeAxes = Axes.X; x.Height = 36; - }) + }), }, }, }; @@ -103,7 +103,7 @@ public WorkspaceScreenStackTabControl() protected override TabItem CreateTabItem(TItem value) => new WorkspaceScreenStackTabItem(value) { - AccentColour = AccentColour + AccentColour = AccentColour, }; private partial class WorkspaceScreenStackTabItem : OverlayTabItem @@ -117,7 +117,7 @@ public WorkspaceScreenStackTabItem(TItem value) IHasDescription hasDescription => hasDescription.GetDescription(), Enum e => e.GetLocalisableDescription(), LocalisableString l => l, - _ => value?.ToString() ?? string.Empty + _ => value?.ToString() ?? string.Empty, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Header.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Header.cs index 0adf071d9..27156fd90 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Header.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Header.cs @@ -59,7 +59,7 @@ public Header() Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, RelativeSizeAxes = Axes.X, - Scale = new Vector2(1.5f) + Scale = new Vector2(1.5f), }, }, }, @@ -111,22 +111,22 @@ public KaraokeConfigHeaderTitle() Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: 24), - Text = "Karaoke" + Text = "Karaoke", }, dot = new OsuSpriteText { Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: 24), - Text = "·" + Text = "·", }, pageTitle = new OsuSpriteText { Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, Font = OsuFont.GetFont(size: 24), - } - } + }, + }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettings.cs index 5bd8b0160..11419bb7e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettings.cs @@ -62,11 +62,11 @@ public KaraokeSettings() previewArea = new Container { RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = Header.HEIGHT, Left = KaraokeSettingsPanel.WIDTH } + Padding = new MarginPadding { Top = Header.HEIGHT, Left = KaraokeSettingsPanel.WIDTH }, }, - new KaraokeVersionManager().With(x => x.Show()) - } - } + new KaraokeVersionManager().With(x => x.Show()), + }, + }, }; // wait for a period until all children loaded. @@ -93,7 +93,7 @@ public KaraokeSettings() previewArea.Child = new DelayedLoadWrapper(preview) { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }; }, true); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsColourProvider.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsColourProvider.cs index 102507024..548180fea 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsColourProvider.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsColourProvider.cs @@ -31,7 +31,7 @@ private static float getBaseHue(SettingsSection section) StyleSection => 333 / 360f, // Pink ScoringSection => 45 / 360f, // Orange null => 320 / 360f, // Plum - _ => throw new ArgumentException($@"{section} colour scheme does not provide a hue value in {nameof(getBaseHue)}.") + _ => throw new ArgumentException($@"{section} colour scheme does not provide a hue value in {nameof(getBaseHue)}."), }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsPanel.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsPanel.cs index 613a5df36..080e9e5c1 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsPanel.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsPanel.cs @@ -30,7 +30,7 @@ public partial class KaraokeSettingsPanel : SettingsPanel { new ConfigSection(), new StyleSection(), - new ScoringSection() + new ScoringSection(), }; protected override Drawable CreateFooter() => new Container diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeVersionManager.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeVersionManager.cs index b4d49d616..b33c2ab1e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeVersionManager.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeVersionManager.cs @@ -48,17 +48,17 @@ private void load(OsuColour colours, TextureStore textures) new OsuSpriteText { Font = OsuFont.GetFont(weight: FontWeight.Bold), - Text = new KaraokeRuleset().ShortName + Text = new KaraokeRuleset().ShortName, }, new OsuSpriteText { Colour = DebugUtils.IsDebugBuild ? colours.Red : Color4.White, - Text = VersionUtils.DisplayVersion + Text = VersionUtils.DisplayVersion, }, - } + }, }, - } - } + }, + }, }; if (!VersionUtils.IsDeployedBuild) @@ -71,7 +71,7 @@ private void load(OsuColour colours, TextureStore textures) Origin = Anchor.TopCentre, Font = OsuFont.Numeric.With(size: 12), Colour = colours.Yellow, - Text = @"Development Build" + Text = @"Development Build", }, new Sprite { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/DefaultPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/DefaultPreview.cs index ef9aeeb77..c92bdc727 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/DefaultPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/DefaultPreview.cs @@ -51,7 +51,7 @@ public DefaultPreview() Text = "Select left size to adjust.", Font = OsuFont.GetFont(size: 20), }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs index 3e214dc03..0a143c00c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs @@ -48,7 +48,7 @@ public LyricPreview() { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }; lyricPlayfield.Add(lyric = createPreviewLyric()); @@ -116,14 +116,14 @@ private Lyric createPreviewLyric() { StartIndex = 0, EndIndex = 0, - Text = "か" + Text = "か", }, new RubyTag { StartIndex = 2, EndIndex = 2, - Text = "お" - } + Text = "お", + }, }, RomajiTags = new[] { @@ -131,7 +131,7 @@ private Lyric createPreviewLyric() { StartIndex = 0, EndIndex = 3, - Text = "karaoke" + Text = "karaoke", }, }, StartTime = 0, @@ -154,7 +154,7 @@ private IDictionary createPreviewTranslate(CultureInfo cult { "ja" or "Ja-jp" => "カラオケ", "zh-Hant" or "zh-TW" => "卡拉OK", - _ => "karaoke" + _ => "karaoke", }; return new Dictionary diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/NotePlayfieldPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/NotePlayfieldPreview.cs index ee64b62e7..712c2f6fd 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/NotePlayfieldPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/NotePlayfieldPreview.cs @@ -46,7 +46,7 @@ public NotePlayfieldPreview() { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }; } @@ -73,7 +73,7 @@ protected override void Update() { new(new TextIndex(0), startTime), new(new TextIndex(4), startTime + duration), - } + }, }; notePlayfield.Add(new Note @@ -87,7 +87,7 @@ protected override void Update() notePlayfield.Add(new BarLine { StartTime = startTime, - Major = true + Major = true, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/ShowCursorPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/ShowCursorPreview.cs index d2933b8fc..e1dc2360c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/ShowCursorPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/ShowCursorPreview.cs @@ -24,15 +24,15 @@ public ShowCursorPreview() cursor = new MenuCursorContainer.Cursor { Anchor = Anchor.Centre, - Origin = Anchor.Centre + Origin = Anchor.Centre, }, new OsuSpriteText { Anchor = Anchor.Centre, Origin = Anchor.Centre, Y = 30, - Text = "Wanna show this while gameplay?" - } + Text = "Wanna show this while gameplay?", + }, }; bindableShowCursor.BindValueChanged(e => diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Graphics/ManageFontPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Graphics/ManageFontPreview.cs index 200b11d82..7c9888145 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Graphics/ManageFontPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Graphics/ManageFontPreview.cs @@ -83,10 +83,10 @@ private void load(OsuColour colours) new GenerateRowContainer(GenerateDirection.RightToLeft), new GenerateRowContainer(GenerateDirection.LeftToRight), new GenerateRowContainer(GenerateDirection.RightToLeft), - } - } - } - } + }, + }, + }, + }, }; foreach (var row in textContainer.Children) @@ -281,8 +281,8 @@ public void GenerateEgg(string textureName, float scale, float yOffset) { Origin = Anchor.BottomCentre, Y = yOffset, - Texture = texture - } + Texture = texture, + }, }; Add(drawableEgg); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs index b9743c0ec..e3ce93eb0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs @@ -37,7 +37,7 @@ public MicrophoneDevicePreview() Origin = Anchor.Centre, HasDevice = hasDevice, DeviceName = deviceName, - } + }, }; }, true); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/SettingsSubsectionPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/SettingsSubsectionPreview.cs index e57d98a55..f7f974989 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/SettingsSubsectionPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/SettingsSubsectionPreview.cs @@ -49,8 +49,8 @@ protected SettingsSubsectionPreview() content = new Container { RelativeSizeAxes = Axes.Both, - } - } + }, + }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/UnderConstructionPreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/UnderConstructionPreview.cs index 4c3389a3f..194b631fd 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/UnderConstructionPreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/UnderConstructionPreview.cs @@ -58,7 +58,7 @@ public UnderConstructionPreview() Text = "please check back a bit later.", Font = OsuFont.GetFont(size: 14), }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ConfigSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ConfigSection.cs index 7c1589a5c..bec74e3de 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ConfigSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ConfigSection.cs @@ -14,7 +14,7 @@ public partial class ConfigSection : KaraokeSettingsSection public override Drawable CreateIcon() => new SpriteIcon { - Icon = FontAwesome.Solid.Cog + Icon = FontAwesome.Solid.Cog, }; public ConfigSection() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/GeneralSettings.cs index 67589c2ea..6ffd82378 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/GeneralSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/GeneralSettings.cs @@ -24,7 +24,7 @@ private void load() new SettingsCheckbox { LabelText = "Show cursor while playing", - Current = Config.GetBindable(KaraokeRulesetSetting.ShowCursor) + Current = Config.GetBindable(KaraokeRulesetSetting.ShowCursor), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/LyricSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/LyricSettings.cs index 72c4fe71b..7fb1bae8a 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/LyricSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/LyricSettings.cs @@ -24,12 +24,12 @@ private void load() new SettingsCheckbox { LabelText = "Display ruby", - Current = Config.GetBindable(KaraokeRulesetSetting.DisplayRuby) + Current = Config.GetBindable(KaraokeRulesetSetting.DisplayRuby), }, new SettingsCheckbox { LabelText = "Display romaji", - Current = Config.GetBindable(KaraokeRulesetSetting.DisplayRomaji) + Current = Config.GetBindable(KaraokeRulesetSetting.DisplayRomaji), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/NoteSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/NoteSettings.cs index e7e2b424d..968131935 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/NoteSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/NoteSettings.cs @@ -27,17 +27,17 @@ private void load() new SettingsEnumDropdown { LabelText = "Scrolling direction", - Current = Config.GetBindable(KaraokeRulesetSetting.ScrollDirection) + Current = Config.GetBindable(KaraokeRulesetSetting.ScrollDirection), }, new SettingsSlider { LabelText = "Scroll speed", - Current = Config.GetBindable(KaraokeRulesetSetting.ScrollTime) + Current = Config.GetBindable(KaraokeRulesetSetting.ScrollTime), }, new SettingsCheckbox { LabelText = "Display ruby text", - Current = Config.GetBindable(KaraokeRulesetSetting.DisplayNoteRubyText) + Current = Config.GetBindable(KaraokeRulesetSetting.DisplayNoteRubyText), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/PracticeSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/PracticeSettings.cs index e647e9571..dd756f328 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/PracticeSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/PracticeSettings.cs @@ -23,7 +23,7 @@ private void load() new SettingsSlider { LabelText = KaraokeSettingsSubsectionStrings.PracticePreemptTime, - Current = Config.GetBindable(KaraokeRulesetSetting.PracticePreemptTime) + Current = Config.GetBindable(KaraokeRulesetSetting.PracticePreemptTime), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/ScoringSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/ScoringSettings.cs index 40b026e9c..a5571b8ad 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/ScoringSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/ScoringSettings.cs @@ -23,32 +23,32 @@ private void load() new SettingsCheckbox { LabelText = "Override pitch at gameplay", - Current = Config.GetBindable(KaraokeRulesetSetting.OverridePitchAtGameplay) + Current = Config.GetBindable(KaraokeRulesetSetting.OverridePitchAtGameplay), }, new SettingsSlider { LabelText = "Pitch", - Current = Config.GetBindable(KaraokeRulesetSetting.Pitch) + Current = Config.GetBindable(KaraokeRulesetSetting.Pitch), }, new SettingsCheckbox { LabelText = "Override vocal pitch at gameplay", - Current = Config.GetBindable(KaraokeRulesetSetting.OverrideVocalPitchAtGameplay) + Current = Config.GetBindable(KaraokeRulesetSetting.OverrideVocalPitchAtGameplay), }, new SettingsSlider { LabelText = "Vocal pitch", - Current = Config.GetBindable(KaraokeRulesetSetting.VocalPitch) + Current = Config.GetBindable(KaraokeRulesetSetting.VocalPitch), }, new SettingsCheckbox { LabelText = "Override scoring pitch at gameplay", - Current = Config.GetBindable(KaraokeRulesetSetting.OverrideScoringPitchAtGameplay) + Current = Config.GetBindable(KaraokeRulesetSetting.OverrideScoringPitchAtGameplay), }, new SettingsSlider { LabelText = "scoring pitch", - Current = Config.GetBindable(KaraokeRulesetSetting.ScoringPitch) + Current = Config.GetBindable(KaraokeRulesetSetting.ScoringPitch), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslateSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslateSettings.cs index dcea58001..e55f31265 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslateSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslateSettings.cs @@ -26,13 +26,13 @@ private void load() new SettingsCheckbox { LabelText = "Translate", - Current = Config.GetBindable(KaraokeRulesetSetting.UseTranslate) + Current = Config.GetBindable(KaraokeRulesetSetting.UseTranslate), }, new SettingsLanguage { LabelText = "Prefer language", TooltipText = "Select prefer translate language.", - Current = Config.GetBindable(KaraokeRulesetSetting.PreferLanguage) + Current = Config.GetBindable(KaraokeRulesetSetting.PreferLanguage), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs index dcd781730..cc3204eff 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs @@ -26,12 +26,12 @@ private void load() new SettingsFont { LabelText = "Default main font", - Current = Config.GetBindable(KaraokeRulesetSetting.MainFont) + Current = Config.GetBindable(KaraokeRulesetSetting.MainFont), }, new SettingsFont { LabelText = "Default ruby font", - Current = Config.GetBindable(KaraokeRulesetSetting.RubyFont) + Current = Config.GetBindable(KaraokeRulesetSetting.RubyFont), }, new SettingsSlider { @@ -42,7 +42,7 @@ private void load() new SettingsFont { LabelText = "Default romaji font", - Current = Config.GetBindable(KaraokeRulesetSetting.RomajiFont) + Current = Config.GetBindable(KaraokeRulesetSetting.RomajiFont), }, new SettingsSlider { @@ -54,19 +54,19 @@ private void load() { LabelText = "Force use default lyric font.", TooltipText = "Force use default font even has customize font in skin or beatmap.", - Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultFont) + Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultFont), }, new SettingsFont { LabelText = "Translate font", - Current = Config.GetBindable(KaraokeRulesetSetting.TranslateFont) + Current = Config.GetBindable(KaraokeRulesetSetting.TranslateFont), }, new SettingsCheckbox { LabelText = "Force use default translate font.", TooltipText = "Force use default font even has customize font in skin or beatmap.", - Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultTranslateFont) - } + Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultTranslateFont), + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/ManageFontSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/ManageFontSettings.cs index 25043395a..e4e2a22ea 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/ManageFontSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/ManageFontSettings.cs @@ -32,8 +32,8 @@ private void load(Storage storage) new SettingsButton { Text = "Import file", - TooltipText = "If some font is placed into folder but not import, press here to try again." - } + TooltipText = "If some font is placed into folder but not import, press here to try again.", + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/NoteFontSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/NoteFontSettings.cs index bb9b6cc4c..c859099b3 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/NoteFontSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/NoteFontSettings.cs @@ -22,14 +22,14 @@ private void load() new SettingsFont { LabelText = "Note font", - Current = Config.GetBindable(KaraokeRulesetSetting.NoteFont) + Current = Config.GetBindable(KaraokeRulesetSetting.NoteFont), }, new SettingsCheckbox { LabelText = "Force use default note font.", TooltipText = "Override any custom font in skin or beatmap.", - Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultNoteFont) - } + Current = Config.GetBindable(KaraokeRulesetSetting.ForceUseDefaultNoteFont), + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/TransparentSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/TransparentSettings.cs index 01545fce2..61bca93e4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/TransparentSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/TransparentSettings.cs @@ -23,14 +23,14 @@ private void load() LabelText = "Lyric playfield alpha", Current = Config.GetBindable(KaraokeRulesetSetting.LyricAlpha), KeyboardStep = 0.01f, - DisplayAsPercentage = true + DisplayAsPercentage = true, }, new SettingsSlider { LabelText = "Note playfield alpha", Current = Config.GetBindable(KaraokeRulesetSetting.NoteAlpha), KeyboardStep = 0.01f, - DisplayAsPercentage = true + DisplayAsPercentage = true, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Input/MicrophoneSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Input/MicrophoneSettings.cs index bcc09f074..f927f0e48 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Input/MicrophoneSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Input/MicrophoneSettings.cs @@ -24,7 +24,7 @@ private void load() new SettingsMicrophoneDeviceDropdown { LabelText = "Microphone devices", - Current = Config.GetBindable(KaraokeRulesetSetting.MicrophoneDevice) + Current = Config.GetBindable(KaraokeRulesetSetting.MicrophoneDevice), }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ScoringSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ScoringSection.cs index 8fb02e66b..4dddc488b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ScoringSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ScoringSection.cs @@ -15,7 +15,7 @@ public partial class ScoringSection : KaraokeSettingsSection public override Drawable CreateIcon() => new SpriteIcon { - Icon = FontAwesome.Solid.Gamepad + Icon = FontAwesome.Solid.Gamepad, }; public ScoringSection() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/StyleSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/StyleSection.cs index 206ef41e6..c158702c4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/StyleSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/StyleSection.cs @@ -14,7 +14,7 @@ public partial class StyleSection : KaraokeSettingsSection public override Drawable CreateIcon() => new SpriteIcon { - Icon = FontAwesome.Solid.PaintBrush + Icon = FontAwesome.Solid.PaintBrush, }; public StyleSection() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsFont.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsFont.cs index aa52df0ed..18afba027 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsFont.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsFont.cs @@ -77,7 +77,7 @@ public FontSelectionButton() AutoSizeAxes = Axes.Y, RowDimensions = new[] { - new Dimension(GridSizeMode.AutoSize) + new Dimension(GridSizeMode.AutoSize), }, Content = new[] { @@ -88,7 +88,7 @@ public FontSelectionButton() RelativeSizeAxes = Axes.X, Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS }, Height = height, - Action = this.ShowPopover + Action = this.ShowPopover, }, null, decreaseFontSizeButton = new SettingsButton @@ -105,7 +105,7 @@ public FontSelectionButton() return; current.Value = current.Value.With(size: nextSize); - } + }, }, null, increaseFontSizeButton = new SettingsButton @@ -122,10 +122,10 @@ public FontSelectionButton() return; current.Value = current.Value.With(size: nextSize); - } - } + }, + }, }, - } + }, }; Current.BindValueChanged(e => @@ -154,7 +154,7 @@ public FontSelectorPopover(Bindable bindableFontUsage) { Width = 1000, Height = 600, - Current = bindableFontUsage + Current = bindableFontUsage, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs index 1675c790a..ac6b7dc20 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/IntervalSection.cs @@ -29,8 +29,8 @@ public IntervalSection() MinValue = 0, MaxValue = 30, Value = 10, - Default = 10 - } + Default = 10, + }, }, rubyIntervalSliderBar = new LabelledRealTimeSliderBar { @@ -41,8 +41,8 @@ public IntervalSection() MinValue = 0, MaxValue = 30, Value = 10, - Default = 10 - } + Default = 10, + }, }, romajiIntervalSliderBar = new LabelledRealTimeSliderBar { @@ -53,9 +53,9 @@ public IntervalSection() MinValue = 0, MaxValue = 30, Value = 10, - Default = 10 - } - } + Default = 10, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/PositionSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/PositionSection.cs index d7dc28e75..e29ea1fe4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/PositionSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/PositionSection.cs @@ -24,7 +24,7 @@ public PositionSection() { Label = "Smart horizon", Description = "Smart horizon section", - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs index 4f8e6efda..f2c240642 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Config/RubyRomajiSection.cs @@ -43,8 +43,8 @@ public RubyRomajiSection() MinValue = 0, MaxValue = 30, Value = 10, - Default = 10 - } + Default = 10, + }, }, romajiMarginSliderBar = new LabelledRealTimeSliderBar { @@ -55,9 +55,9 @@ public RubyRomajiSection() MinValue = 0, MaxValue = 30, Value = 10, - Default = 10 - } - } + Default = 10, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditor.cs index e5cebd4bf..0232cd676 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditor.cs @@ -29,7 +29,7 @@ protected override GenericEditorScreen GenerateScre { KaraokeSkinEditorScreenMode.Config => new ConfigScreen(skin), KaraokeSkinEditorScreenMode.Style => new StyleScreen(skin), - _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode") + _ => throw new InvalidOperationException("Editor menu bar switched to an unsupported mode"), }; protected override MenuItem[] GenerateMenuItems(KaraokeSkinEditorScreenMode screenMode) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditorScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditorScreen.cs index 1ba983fed..e3bd4523f 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditorScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/KaraokeSkinEditorScreen.cs @@ -59,9 +59,9 @@ private void load(OverlayColourProvider colourProvider) RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Children = CreateSelectionContainer(), - } - } - } + }, + }, + }, }, new Container { @@ -87,17 +87,17 @@ private void load(OverlayColourProvider colourProvider) RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Children = CreatePropertiesContainer(), - } - } - } + }, + }, + }, }, new Container { RelativeSizeAxes = Axes.Both, Padding = new MarginPadding { Left = left_column_width, Right = right_column_width }, Child = CreatePreviewArea(), - } - } + }, + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricColorSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricColorSection.cs index d012fb70c..31406875d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricColorSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricColorSection.cs @@ -29,7 +29,7 @@ public LyricColorSection() { Label = "Color", Description = "Select color.", - } + }, }; } @@ -51,5 +51,5 @@ public enum ColorArea Back_Border, - Back_Shadow + Back_Shadow, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricFontSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricFontSection.cs index 7ac73f38f..8b6d58848 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricFontSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricFontSection.cs @@ -42,8 +42,8 @@ public LyricFontSection() { Value = 30, MinValue = 10, - MaxValue = 70 - } + MaxValue = 70, + }, }, borderSliderBar = new LabelledRealTimeSliderBar { @@ -53,9 +53,9 @@ public LyricFontSection() { Value = 10, MinValue = 0, - MaxValue = 20 - } - } + MaxValue = 20, + }, + }, }; } @@ -71,5 +71,5 @@ public enum Font F002, - F003 + F003, } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricShadowSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricShadowSection.cs index eaadbf14a..018904199 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricShadowSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricShadowSection.cs @@ -36,8 +36,8 @@ public LyricShadowSection() { Value = 10, MinValue = 0, - MaxValue = 20 - } + MaxValue = 20, + }, }, shadowYSliderBar = new LabelledRealTimeSliderBar { @@ -47,9 +47,9 @@ public LyricShadowSection() { Value = 10, MinValue = 0, - MaxValue = 20 - } - } + MaxValue = 20, + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricStylePreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricStylePreview.cs index 50f80aef4..746122035 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricStylePreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/LyricStylePreview.cs @@ -29,7 +29,7 @@ private void load(OverlayColourProvider colourProvider, StyleManager manager) RelativeSizeAxes = Axes.Both, Colour = colourProvider.Background1, }, - new PreviewDrawableLyricLine(createDefaultLyricLine()) + new PreviewDrawableLyricLine(createDefaultLyricLine()), }; } @@ -57,14 +57,14 @@ private Lyric createDefaultLyricLine() { StartIndex = 0, EndIndex = 0, - Text = "か" + Text = "か", }, new RubyTag { StartIndex = 2, EndIndex = 2, - Text = "お" - } + Text = "お", + }, }, RomajiTags = new[] { @@ -72,15 +72,15 @@ private Lyric createDefaultLyricLine() { StartIndex = 1, EndIndex = 1, - Text = "ra" + Text = "ra", }, new RomajiTag { StartIndex = 3, EndIndex = 3, - Text = "ke" - } - } + Text = "ke", + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteColorSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteColorSection.cs index fa77b4c7d..c9963f891 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteColorSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteColorSection.cs @@ -29,7 +29,7 @@ public NoteColorSection() { Label = "Blink color", Description = "Select color.", - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteFontSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteFontSection.cs index e2fc965a8..dc1741c7d 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteFontSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteFontSection.cs @@ -30,7 +30,7 @@ public NoteFontSection() { Label = "Bold", Description = "Select bold or not.", - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteStylePreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteStylePreview.cs index 8f17e4338..fe3d1d1a8 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteStylePreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/NoteStylePreview.cs @@ -53,8 +53,8 @@ private void load(OverlayColourProvider colourProvider, StyleManager manager) new PreviewDrawableNoteArea { Anchor = Anchor.Centre, - Origin = Anchor.Centre - } + Origin = Anchor.Centre, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/StyleScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/StyleScreen.cs index 34ba8d13b..dd5625193 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/StyleScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Skin/Style/StyleScreen.cs @@ -45,7 +45,7 @@ protected override Container CreatePreviewArea() Anchor = Anchor.Centre, Origin = Anchor.Centre, Size = new Vector2(0.95f), - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }; /* @@ -67,5 +67,5 @@ public enum Style Lyric, [Description("Note")] - Note + Note, } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Default/DefaultBodyPiece.cs b/osu.Game.Rulesets.Karaoke/Skinning/Default/DefaultBodyPiece.cs index a5ca38d47..02cc70515 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Default/DefaultBodyPiece.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Default/DefaultBodyPiece.cs @@ -45,12 +45,12 @@ private void load(DrawableHitObject drawableObject) { Background = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, Foreground = new Box { - RelativeSizeAxes = Axes.Both - } + RelativeSizeAxes = Axes.Both, + }, }; var note = (DrawableNote)drawableObject; diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs index 9f5836275..945ddf5dd 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricFontInfo.cs @@ -26,7 +26,7 @@ public class LyricFontInfo : IKaraokeSkinElement RomajiMargin = 4, MainTextFont = new FontUsage("Torus", 48, "Bold"), RubyTextFont = new FontUsage("Torus", 20, "Bold"), - RomajiTextFont = new FontUsage("Torus", 20, "Bold") + RomajiTextFont = new FontUsage("Torus", 20, "Bold"), }; public int ID { get; set; } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricLayout.cs b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricLayout.cs index 5e7a48925..2061a0d2d 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricLayout.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricLayout.cs @@ -46,7 +46,7 @@ public void ApplyTo(Drawable d) Left = Alignment.HasFlagFast(Anchor.x0) ? HorizontalMargin : 0, Right = Alignment.HasFlagFast(Anchor.x2) ? HorizontalMargin : 0, Top = Alignment.HasFlagFast(Anchor.y0) ? VerticalMargin : 0, - Bottom = Alignment.HasFlagFast(Anchor.y2) ? VerticalMargin : 0 + Bottom = Alignment.HasFlagFast(Anchor.y2) ? VerticalMargin : 0, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricStyle.cs b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricStyle.cs index 72d43ceec..18d13425e 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricStyle.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Elements/LyricStyle.cs @@ -28,15 +28,15 @@ public class LyricStyle : IKaraokeSkinElement new OutlineShader { Radius = 3, - OutlineColour = Color4Extensions.FromHex("#CCA532") + OutlineColour = Color4Extensions.FromHex("#CCA532"), }, new ShadowShader { ShadowColour = Color4Extensions.FromHex("#6B5B2D"), - ShadowOffset = new Vector2(3) - } - } - } + ShadowOffset = new Vector2(3), + }, + }, + }, }, RightLyricTextShaders = new ICustomizedShader[] { @@ -48,16 +48,16 @@ public class LyricStyle : IKaraokeSkinElement new OutlineShader { Radius = 3, - OutlineColour = Color4Extensions.FromHex("#5932CC") + OutlineColour = Color4Extensions.FromHex("#5932CC"), }, new ShadowShader { ShadowColour = Color4Extensions.FromHex("#3D2D6B"), - ShadowOffset = new Vector2(3) - } - } - } - } + ShadowOffset = new Vector2(3), + }, + }, + }, + }, }; public int ID { get; set; } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Fonts/BitmapFontCompressor.cs b/osu.Game.Rulesets.Karaoke/Skinning/Fonts/BitmapFontCompressor.cs index eb7c15661..096d32220 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Fonts/BitmapFontCompressor.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Fonts/BitmapFontCompressor.cs @@ -23,7 +23,7 @@ public static BitmapFont Compress(BitmapFont bitmapFont, char[] chars) Common = copyObject(bitmapFont.Common), Pages = GeneratePages(bitmapFont.Pages, characters.Values.ToArray()), Characters = characters, - KerningPairs = GenerateKerningPairs(bitmapFont.KerningPairs, chars) + KerningPairs = GenerateKerningPairs(bitmapFont.KerningPairs, chars), }; } @@ -118,7 +118,7 @@ internal static IDictionary GenerateCharacters(BitmapFontInfo or // assign next position for drawing. currentTopLeftPosition = currentTopLeftPosition with { - X = currentTopLeftPosition.X + character.Width + spacing.X + X = currentTopLeftPosition.X + character.Width + spacing.X, }; } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Fonts/FontManager.cs b/osu.Game.Rulesets.Karaoke/Skinning/Fonts/FontManager.cs index b9d10ac7e..e863771e5 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Fonts/FontManager.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Fonts/FontManager.cs @@ -187,7 +187,7 @@ private void removeFontFromList(string path, FontFormat fontFormat) { FontFormat.Fnt => getFntGlyphStore(fontName), FontFormat.Ttf => getTtfGlyphStore(fontName), - FontFormat.Internal or _ => throw new ArgumentOutOfRangeException(nameof(fontFormat)) + FontFormat.Internal or _ => throw new ArgumentOutOfRangeException(nameof(fontFormat)), }; } @@ -220,7 +220,7 @@ private static string getPathByFontType(FontFormat type) => { FontFormat.Fnt => "fnt", FontFormat.Ttf => "ttf", - FontFormat.Internal or _ => throw new ArgumentOutOfRangeException(nameof(type)) + FontFormat.Internal or _ => throw new ArgumentOutOfRangeException(nameof(type)), }; private static string getExtensionByFontType(FontFormat type) => @@ -228,7 +228,7 @@ private static string getExtensionByFontType(FontFormat type) => { FontFormat.Fnt => "zipfnt", FontFormat.Ttf => "ttf", - FontFormat.Internal or _ => throw new ArgumentOutOfRangeException(nameof(type)) + FontFormat.Internal or _ => throw new ArgumentOutOfRangeException(nameof(type)), }; private static FontFormat getFontTypeByExtension(string extension) => diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeBeatmapSkin.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeBeatmapSkin.cs index c357920a3..d15bca7ae 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeBeatmapSkin.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeBeatmapSkin.cs @@ -64,7 +64,7 @@ static string getFileNameByType(ElementType elementType) ElementType.LyricLayout => "lyric-layouts", ElementType.LyricStyle => "lyric-styles", ElementType.NoteStyle => "note-styles", - _ => throw new InvalidEnumArgumentException(nameof(elementType)) + _ => throw new InvalidEnumArgumentException(nameof(elementType)), }; }); } @@ -101,7 +101,7 @@ static string getFileNameByType(ElementType elementType) KaraokeIndexLookup.Layout => SkinUtils.As(getSelectionFromElementType(ElementType.LyricLayout)), KaraokeIndexLookup.Style => SkinUtils.As(getSelectionFromElementType(ElementType.LyricStyle)), KaraokeIndexLookup.Note => SkinUtils.As(getSelectionFromElementType(ElementType.NoteStyle)), - _ => throw new InvalidEnumArgumentException(nameof(indexLookup)) + _ => throw new InvalidEnumArgumentException(nameof(indexLookup)), }; case KaraokeSkinConfigurationLookup skinConfigurationLookup: diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkin.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkin.cs index 39f2fc9d6..7f1b147c2 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkin.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkin.cs @@ -131,7 +131,7 @@ public KaraokeSkin(SkinInfo skin, IStorageResourceProvider? resources, IResource { ElementType.LyricStyle or ElementType.LyricFontInfo or ElementType.NoteStyle => SkinUtils.As(new Bindable((TValue)DefaultElement[type])), ElementType.LyricLayout => null, - _ => throw new InvalidEnumArgumentException(nameof(type)) + _ => throw new InvalidEnumArgumentException(nameof(type)), }; } @@ -165,7 +165,7 @@ public KaraokeSkin(SkinInfo skin, IStorageResourceProvider? resources, IResource { ElementType.LyricStyle or ElementType.LyricFontInfo or ElementType.NoteStyle => DefaultElement[type], ElementType.LyricLayout => null, - _ => throw new InvalidEnumArgumentException(nameof(type)) + _ => throw new InvalidEnumArgumentException(nameof(type)), }; private class DefaultSkinFormat diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkinConfigurationLookup.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkinConfigurationLookup.cs index debcbfe5b..c2b380a8d 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkinConfigurationLookup.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeSkinConfigurationLookup.cs @@ -42,5 +42,5 @@ public enum LegacyKaraokeSkinNoteLayer { Border, Foreground, - Background + Background, } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs index bb8d041fc..217943968 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs @@ -49,7 +49,7 @@ public KaraokeLegacySkinTransformer(ISkin skin, IBeatmap beatmap) KaraokeSkinComponents.JudgementLine => new LegacyJudgementLine(), KaraokeSkinComponents.Note => new LegacyNotePiece(), KaraokeSkinComponents.HitExplosion => new LegacyHitExplosion(), - _ => throw new InvalidEnumArgumentException(nameof(karaokeComponent.Component)) + _ => throw new InvalidEnumArgumentException(nameof(karaokeComponent.Component)), }; default: diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyColumnBackground.cs index 1eb579a94..70b1758f7 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyColumnBackground.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyColumnBackground.cs @@ -48,13 +48,13 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo) new Box { RelativeSizeAxes = Axes.Both, - Colour = Color4.Black + Colour = Color4.Black, }, new Box { RelativeSizeAxes = Axes.X, Height = leftLineWidth, - Alpha = hasLeftLine ? 1 : 0 + Alpha = hasLeftLine ? 1 : 0, }, new Box { @@ -62,7 +62,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo) Origin = Anchor.BottomRight, RelativeSizeAxes = Axes.X, Height = rightLineWidth, - Alpha = hasRightLine ? 1 : 0 + Alpha = hasRightLine ? 1 : 0, }, lightContainer = new Container { @@ -76,9 +76,9 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo) Texture = skin.GetTexture(lightImage), RelativeSizeAxes = Axes.Y, Height = 1, - Alpha = 0 - } - } + Alpha = 0, + }, + }, }; direction.BindTo(scrollingInfo.Direction); diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyJudgementLine.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyJudgementLine.cs index a4f0b0b67..26ade938d 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyJudgementLine.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyJudgementLine.cs @@ -40,7 +40,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo) Anchor = Anchor.TopCentre, Origin = Anchor.Centre, Name = "Judgement line head", - Texture = getTextureFromLookup(skin, LegacyKaraokeSkinConfigurationLookups.JudgementLineHeadImage) + Texture = getTextureFromLookup(skin, LegacyKaraokeSkinConfigurationLookups.JudgementLineHeadImage), }, judgementLineBodySprite = new Sprite { @@ -51,15 +51,15 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo) Size = Vector2.One, FillMode = FillMode.Stretch, Depth = 1, - Texture = getTextureFromLookup(skin, LegacyKaraokeSkinConfigurationLookups.JudgementLineBodyImage) + Texture = getTextureFromLookup(skin, LegacyKaraokeSkinConfigurationLookups.JudgementLineBodyImage), }, new Sprite { Anchor = Anchor.BottomCentre, Origin = Anchor.Centre, Name = "Judgement line tail", - Texture = getTextureFromLookup(skin, LegacyKaraokeSkinConfigurationLookups.JudgementLineTailImage) - } + Texture = getTextureFromLookup(skin, LegacyKaraokeSkinConfigurationLookups.JudgementLineTailImage), + }, }; direction.BindTo(scrollingInfo.Direction); @@ -98,7 +98,7 @@ private static string getTextureNameFromLookup(LegacyKaraokeSkinConfigurationLoo LegacyKaraokeSkinConfigurationLookups.JudgementLineBodyImage => "body", LegacyKaraokeSkinConfigurationLookups.JudgementLineHeadImage => "head", LegacyKaraokeSkinConfigurationLookups.JudgementLineTailImage => "tail", - _ => throw new ArgumentOutOfRangeException(nameof(lookup)) + _ => throw new ArgumentOutOfRangeException(nameof(lookup)), }; return $"karaoke-judgement-line-{suffix}"; diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyNotePiece.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyNotePiece.cs index 5ac14232b..5e04d7795 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyNotePiece.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyNotePiece.cs @@ -56,7 +56,7 @@ private void load(DrawableHitObject drawableObject, ISkinSource skin, IScrolling { background = createLayer("Background layer", skin, LegacyKaraokeSkinNoteLayer.Background), foreground = createLayer("Foreground layer", skin, LegacyKaraokeSkinNoteLayer.Foreground), - border = createLayer("Border layer", skin, LegacyKaraokeSkinNoteLayer.Border) + border = createLayer("Border layer", skin, LegacyKaraokeSkinNoteLayer.Border), }; var note = (DrawableNote)drawableObject; @@ -173,7 +173,7 @@ private LayerContainer createLayer(string name, ISkin skin, LegacyKaraokeSkinNot d.Anchor = Anchor.CentreRight; d.Origin = Anchor.Centre; }), - } + }, }; private static Sprite? getSpriteFromLookup(ISkin skin, LegacyKaraokeSkinConfigurationLookups lookup, LegacyKaraokeSkinNoteLayer layer) @@ -216,14 +216,14 @@ private static string getTextureNameFromLookup(LegacyKaraokeSkinConfigurationLoo LegacyKaraokeSkinConfigurationLookups.NoteBodyImage => "body", LegacyKaraokeSkinConfigurationLookups.NoteHeadImage => "head", LegacyKaraokeSkinConfigurationLookups.NoteTailImage => "tail", - _ => throw new ArgumentOutOfRangeException(nameof(lookup)) + _ => throw new ArgumentOutOfRangeException(nameof(lookup)), }; string layerSuffix = layer switch { LegacyKaraokeSkinNoteLayer.Border => "border", LegacyKaraokeSkinNoteLayer.Background => "background", - _ => string.Empty + _ => string.Empty, }; return $"karaoke-note-{layerSuffix}-{suffix}"; diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyStageBackground.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyStageBackground.cs index 9606cc7ee..87c507ca2 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyStageBackground.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyStageBackground.cs @@ -28,7 +28,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo) { Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight, - Texture = getTexture(skin) + Texture = getTexture(skin), }; direction.BindTo(scrollingInfo.Direction); diff --git a/osu.Game.Rulesets.Karaoke/Statistics/BeatmapMetadataGraph.cs b/osu.Game.Rulesets.Karaoke/Statistics/BeatmapMetadataGraph.cs index a7c7a3b88..74c8ff572 100644 --- a/osu.Game.Rulesets.Karaoke/Statistics/BeatmapMetadataGraph.cs +++ b/osu.Game.Rulesets.Karaoke/Statistics/BeatmapMetadataGraph.cs @@ -57,20 +57,20 @@ public BeatmapMetadataGraph(IBeatmap beatmap) { new TextMetadataSection("Description") { - Text = beatmapInfo?.DifficultyName ?? string.Empty + Text = beatmapInfo?.DifficultyName ?? string.Empty, }, new TextMetadataSection("Source") { - Text = beatmapInfo?.Metadata.Source ?? string.Empty + Text = beatmapInfo?.Metadata.Source ?? string.Empty, }, new TextMetadataSection("Tags") { - Text = beatmapInfo?.Metadata.Tags ?? string.Empty + Text = beatmapInfo?.Metadata.Tags ?? string.Empty, }, new SingerMetadataSection("Singer") { - Singers = karaokeBeatmap?.SingerInfo.GetAllSingers().ToArray() ?? Array.Empty() - } + Singers = karaokeBeatmap?.SingerInfo.GetAllSingers().ToArray() ?? Array.Empty(), + }, }, }, }, @@ -141,7 +141,7 @@ private void setTextAsync(string text) RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Colour = Color4.White.Opacity(0.75f), - Text = text + Text = text, }); } } @@ -186,7 +186,7 @@ private void setSingerAsync(IEnumerable singers) { textFlow.Add(new SingerSpriteText { - Singer = singer + Singer = singer, }); } } @@ -202,8 +202,8 @@ public SingerSpriteText() { osuSpriteText = new OsuSpriteText { - Font = OsuFont.GetFont(size: 14) - } + Font = OsuFont.GetFont(size: 14), + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Statistics/NotScorableGraph.cs b/osu.Game.Rulesets.Karaoke/Statistics/NotScorableGraph.cs index 3fd7a7321..f47a0ff5f 100644 --- a/osu.Game.Rulesets.Karaoke/Statistics/NotScorableGraph.cs +++ b/osu.Game.Rulesets.Karaoke/Statistics/NotScorableGraph.cs @@ -30,8 +30,8 @@ public NotScorableGraph() Anchor = Anchor.Centre, Origin = Anchor.Centre, Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 20), - Text = "Sorry, this beatmap is not scorable." - } + Text = "Sorry, this beatmap is not scorable.", + }, }; } } diff --git a/osu.Game.Rulesets.Karaoke/Statistics/ScoringResultGraph.cs b/osu.Game.Rulesets.Karaoke/Statistics/ScoringResultGraph.cs index 1e0b3aaa2..e2032c01a 100644 --- a/osu.Game.Rulesets.Karaoke/Statistics/ScoringResultGraph.cs +++ b/osu.Game.Rulesets.Karaoke/Statistics/ScoringResultGraph.cs @@ -51,7 +51,7 @@ public ScoringResultGraph(ScoreInfo score, IBeatmap beatmap) RelativeSizeAxes = Axes.Both, Spacing = new Vector2(5), }, - noteGraph = new NoteGraph(score) + noteGraph = new NoteGraph(score), }, }, }; @@ -89,8 +89,8 @@ public LyricPreview(IEnumerable lyrics) { c.Selected = false; c.Action = () => triggerLyric(x); - })).ToList() - } + })).ToList(), + }, }; SelectedLyric.BindValueChanged(value => @@ -146,7 +146,7 @@ public ClickableLyric(Lyric lyric) { background = new Box { - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, icon = CreateIcon(), drawableLyric = CreateLyric(lyric), @@ -158,7 +158,7 @@ public ClickableLyric(Lyric lyric) Font = new FontUsage(size: 25), RubyFont = new FontUsage(size: 10), RomajiFont = new FontUsage(size: 10), - Margin = new MarginPadding { Left = 25 } + Margin = new MarginPadding { Left = 25 }, }; protected virtual Drawable CreateIcon() => new SpriteIcon @@ -167,7 +167,7 @@ public ClickableLyric(Lyric lyric) Origin = Anchor.CentreLeft, Size = new Vector2(15), Icon = FontAwesome.Solid.Play, - Margin = new MarginPadding { Left = 5 } + Margin = new MarginPadding { Left = 5 }, }; private bool selected; @@ -225,7 +225,7 @@ protected override DrawableLyricSpriteText CreateLyric(Lyric lyric) Font = new FontUsage(size: 15), RubyFont = new FontUsage(size: 7), RomajiFont = new FontUsage(size: 7), - Margin = new MarginPadding { Left = 5 } + Margin = new MarginPadding { Left = 5 }, }; protected override Drawable CreateIcon() diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/BeatmapCoverInfo.cs b/osu.Game.Rulesets.Karaoke/UI/Components/BeatmapCoverInfo.cs index bba3c8c53..4868a3a34 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Components/BeatmapCoverInfo.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Components/BeatmapCoverInfo.cs @@ -82,7 +82,7 @@ private void load(IBindable beatmap, OsuColour colours) d.AddText("mapped by ", t => t.Colour = colours.GrayB); d.AddUserLink(metadata.Author); }), - } + }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/DefaultJudgementLine.cs b/osu.Game.Rulesets.Karaoke/UI/Components/DefaultJudgementLine.cs index 589ed7792..8ea9b8b20 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Components/DefaultJudgementLine.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Components/DefaultJudgementLine.cs @@ -38,8 +38,8 @@ public DefaultJudgementLine() Anchor = Anchor.TopCentre, Origin = Anchor.BottomCentre, Size = new Vector2(triangle_width, triangle_height), - Scale = new Vector2(1, -1) - } + Scale = new Vector2(1, -1), + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/ScoringMarker.cs b/osu.Game.Rulesets.Karaoke/UI/Components/ScoringMarker.cs index 9b50216d8..dbe98d4ef 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Components/ScoringMarker.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Components/ScoringMarker.cs @@ -23,8 +23,8 @@ public ScoringMarker() new Triangle { Size = new Vector2(triangle_width, triangle_height), - Rotation = 90 - } + Rotation = 90, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/ScoringStatus.cs b/osu.Game.Rulesets.Karaoke/UI/Components/ScoringStatus.cs index bc687b5cb..ff1b85072 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Components/ScoringStatus.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Components/ScoringStatus.cs @@ -42,8 +42,8 @@ public ScoringStatus(ScoringStatusMode statusMode) messageText = new OsuMarkdownTextFlowContainer { RelativeSizeAxes = Axes.None, - AutoSizeAxes = Axes.Both - } + AutoSizeAxes = Axes.Both, + }, }; } @@ -88,7 +88,7 @@ private static LocalisableString getScoringStatusText(ScoringStatusMode statusMo ScoringStatusMode.Edit => "Edit mode.", ScoringStatusMode.Scoring => "Scoring...", ScoringStatusMode.NotInitialized => "Seems microphone device is not ready.", - _ => "Weird... Should not goes to here either :oops:" + _ => "Weird... Should not goes to here either :oops:", }; } } diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/VoiceVisualization.cs b/osu.Game.Rulesets.Karaoke/UI/Components/VoiceVisualization.cs index 7ad1cc632..ce8a6defb 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Components/VoiceVisualization.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Components/VoiceVisualization.cs @@ -129,7 +129,7 @@ private void computeLifetime(ScoringPath path) { ScrollingDirection.Left => path.OriginPosition.X, ScrollingDirection.Right => path.DrawWidth - path.OriginPosition.X, - _ => 0.0f + _ => 0.0f, }; path.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(startTime, originAdjustment, timeRange.Value, scrollLength); diff --git a/osu.Game.Rulesets.Karaoke/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Karaoke/UI/DefaultHitExplosion.cs index bc00ed1f2..c15e51355 100644 --- a/osu.Game.Rulesets.Karaoke/UI/DefaultHitExplosion.cs +++ b/osu.Game.Rulesets.Karaoke/UI/DefaultHitExplosion.cs @@ -112,7 +112,7 @@ public DefaultHitExplosion(Color4 objectColour, bool isSmall = false) Roundness = roundness, Radius = 40, }, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/HUD/GeneralSettingOverlay.cs b/osu.Game.Rulesets.Karaoke/UI/HUD/GeneralSettingOverlay.cs index 64fa60066..92b894994 100644 --- a/osu.Game.Rulesets.Karaoke/UI/HUD/GeneralSettingOverlay.cs +++ b/osu.Game.Rulesets.Karaoke/UI/HUD/GeneralSettingOverlay.cs @@ -32,23 +32,23 @@ public GeneralSettingOverlay() { Expanded = { - Value = false - } + Value = false, + }, }, new PitchSettings { Expanded = { - Value = false - } + Value = false, + }, }, new RubyRomajiSettings { Expanded = { - Value = false - } - } + Value = false, + }, + }, }; } @@ -57,7 +57,7 @@ public GeneralSettingOverlay() Name = "Toggle setting button", Text = "Settings", TooltipText = "Open/Close setting", - Action = ToggleVisibility + Action = ToggleVisibility, }; // should be able to get the key event. @@ -134,8 +134,8 @@ private void load(IBindable beatmap, KaraokeSessionStatics sessi { Expanded = { - Value = false - } + Value = false, + }, }); } diff --git a/osu.Game.Rulesets.Karaoke/UI/HUD/PracticeOverlay.cs b/osu.Game.Rulesets.Karaoke/UI/HUD/PracticeOverlay.cs index c98042e04..881c3b7cb 100644 --- a/osu.Game.Rulesets.Karaoke/UI/HUD/PracticeOverlay.cs +++ b/osu.Game.Rulesets.Karaoke/UI/HUD/PracticeOverlay.cs @@ -18,10 +18,10 @@ public PracticeOverlay() { Expanded = { - Value = true + Value = true, }, - Width = 400 - } + Width = 400, + }, }; } @@ -30,6 +30,6 @@ public PracticeOverlay() Name = "Toggle Practice", Text = "Practice", TooltipText = "Open/Close practice overlay", - Action = ToggleVisibility + Action = ToggleVisibility, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/HUD/SettingButtonsDisplay.cs b/osu.Game.Rulesets.Karaoke/UI/HUD/SettingButtonsDisplay.cs index 3c3edd796..6264a85c9 100644 --- a/osu.Game.Rulesets.Karaoke/UI/HUD/SettingButtonsDisplay.cs +++ b/osu.Game.Rulesets.Karaoke/UI/HUD/SettingButtonsDisplay.cs @@ -48,7 +48,7 @@ public SettingButtonsDisplay() Spacing = new Vector2(10), Margin = new MarginPadding(10), Direction = FillDirection.Vertical, - AlwaysPresent = true + AlwaysPresent = true, }, }; } @@ -85,8 +85,8 @@ private void load(OsuColour colours, HUDOverlay hud, Player player) { var button = overlay.CreateToggleButton(); triggerButtons.Add(button); - } - } + }, + }, }); }); diff --git a/osu.Game.Rulesets.Karaoke/UI/HUD/SettingOverlay.cs b/osu.Game.Rulesets.Karaoke/UI/HUD/SettingOverlay.cs index 63b6aef1e..ac2045f43 100644 --- a/osu.Game.Rulesets.Karaoke/UI/HUD/SettingOverlay.cs +++ b/osu.Game.Rulesets.Karaoke/UI/HUD/SettingOverlay.cs @@ -57,8 +57,8 @@ protected SettingOverlay() Direction = FillDirection.Vertical, Spacing = new Vector2(SETTING_SPACING), Margin = new MarginPadding(SETTING_MARGIN), - } - } + }, + }, }; } @@ -135,7 +135,7 @@ private float getHideXPosition() => { OverlayDirection.Left => -DrawWidth, OverlayDirection.Right => DrawWidth, - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(), }; public SettingButton CreateToggleButton() @@ -151,5 +151,5 @@ public enum OverlayDirection { Left, - Right + Right, } diff --git a/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfield.cs b/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfield.cs index 9fa12317a..8080a2efc 100644 --- a/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfield.cs +++ b/osu.Game.Rulesets.Karaoke/UI/KaraokePlayfield.cs @@ -152,7 +152,7 @@ public override bool Remove(DrawableHitObject h) => { DrawableLyric => LyricPlayfield.Remove(h), DrawableNote => NotePlayfield.Remove(h), - _ => base.Remove(h) + _ => base.Remove(h), }; #endregion diff --git a/osu.Game.Rulesets.Karaoke/UI/KaraokeScrollingDirection.cs b/osu.Game.Rulesets.Karaoke/UI/KaraokeScrollingDirection.cs index 2af26ed73..4d94d13a6 100644 --- a/osu.Game.Rulesets.Karaoke/UI/KaraokeScrollingDirection.cs +++ b/osu.Game.Rulesets.Karaoke/UI/KaraokeScrollingDirection.cs @@ -8,5 +8,5 @@ namespace osu.Game.Rulesets.Karaoke.UI; public enum KaraokeScrollingDirection { Left = ScrollingDirection.Left, - Right = ScrollingDirection.Right + Right = ScrollingDirection.Right, } diff --git a/osu.Game.Rulesets.Karaoke/UI/KaraokeSettingsSubsection.cs b/osu.Game.Rulesets.Karaoke/UI/KaraokeSettingsSubsection.cs index a5f8dad17..221e29d7d 100644 --- a/osu.Game.Rulesets.Karaoke/UI/KaraokeSettingsSubsection.cs +++ b/osu.Game.Rulesets.Karaoke/UI/KaraokeSettingsSubsection.cs @@ -44,40 +44,40 @@ private void load(IPerformFromScreenRunner performer) ClassicDefault = KaraokeScrollingDirection.Left, LabelText = KaraokeSettingsSubsectionStrings.ScrollingDirection, TooltipText = KaraokeSettingsSubsectionStrings.ScrollingDirectionTooltip, - Current = config.GetBindable(KaraokeRulesetSetting.ScrollDirection) + Current = config.GetBindable(KaraokeRulesetSetting.ScrollDirection), }, new SettingsSlider { LabelText = KaraokeSettingsSubsectionStrings.ScrollSpeed, - Current = config.GetBindable(KaraokeRulesetSetting.ScrollTime) + Current = config.GetBindable(KaraokeRulesetSetting.ScrollTime), }, // Gameplay new SettingsCheckbox { LabelText = KaraokeSettingsSubsectionStrings.ShowCursorWhilePlaying, TooltipText = KaraokeSettingsSubsectionStrings.ShowCursorWhilePlayingTooltip, - Current = config.GetBindable(KaraokeRulesetSetting.ShowCursor) + Current = config.GetBindable(KaraokeRulesetSetting.ShowCursor), }, // Translate new SettingsCheckbox { LabelText = KaraokeSettingsSubsectionStrings.Translate, TooltipText = KaraokeSettingsSubsectionStrings.TranslateTooltip, - Current = config.GetBindable(KaraokeRulesetSetting.UseTranslate) + Current = config.GetBindable(KaraokeRulesetSetting.UseTranslate), }, // Device new SettingsMicrophoneDeviceDropdown { ClassicDefault = string.Empty, LabelText = KaraokeSettingsSubsectionStrings.MicrophoneDevice, - Current = config.GetBindable(KaraokeRulesetSetting.MicrophoneDevice) + Current = config.GetBindable(KaraokeRulesetSetting.MicrophoneDevice), }, // Practice new DangerousSettingsButton { Text = KaraokeSettingsSubsectionStrings.OpenRulesetSettings, TooltipText = KaraokeSettingsSubsectionStrings.OpenRulesetSettingsTooltip, - Action = () => performer.PerformFromScreen(menu => menu.Push(new KaraokeSettings())) + Action = () => performer.PerformFromScreen(menu => menu.Push(new KaraokeSettings())), }, new SettingsButton { @@ -102,8 +102,8 @@ private void load(IPerformFromScreenRunner performer) { // maybe this overlay has been moved into internal. } - } - } + }, + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/NotePlayfield.cs b/osu.Game.Rulesets.Karaoke/UI/NotePlayfield.cs index 50e2ae589..de979a485 100644 --- a/osu.Game.Rulesets.Karaoke/UI/NotePlayfield.cs +++ b/osu.Game.Rulesets.Karaoke/UI/NotePlayfield.cs @@ -61,7 +61,7 @@ public NotePlayfield(int columns) new SkinnableDrawable(new KaraokeSkinComponentLookup(KaraokeSkinComponents.StageBackground)) { Depth = 2, - RelativeSizeAxes = Axes.Both + RelativeSizeAxes = Axes.Both, }, new Box { @@ -69,13 +69,13 @@ public NotePlayfield(int columns) Name = "Background", RelativeSizeAxes = Axes.Both, Colour = Color4.Black, - Alpha = 0.5f + Alpha = 0.5f, }, centerLine = new CenterLine { Anchor = Anchor.Centre, Origin = Anchor.Centre, - } + }, }); HitObjectLayer.Add(judgementArea = new Container @@ -89,7 +89,7 @@ public NotePlayfield(int columns) Anchor = Anchor.CentreLeft, Origin = Anchor.CentreLeft, AutoSizeAxes = Axes.Both, - BypassAutoSizeAxes = Axes.Both + BypassAutoSizeAxes = Axes.Both, }, judgementLine = new SkinnableDrawable(new KaraokeSkinComponentLookup(KaraokeSkinComponents.JudgementLine), _ => new DefaultJudgementLine()) { @@ -99,9 +99,9 @@ public NotePlayfield(int columns) }, scoringMarker = new ScoringMarker { - Alpha = 0 - } - } + Alpha = 0, + }, + }, }); HitObjectArea.AddRange(new Drawable[] @@ -111,7 +111,7 @@ public NotePlayfield(int columns) { Name = "Replay scoring Visualization", RelativeSizeAxes = Axes.Both, - Alpha = 0.6f + Alpha = 0.6f, }, realTimeScoringVisualization = new RealTimeScoringVisualization { @@ -190,7 +190,7 @@ internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Y = notePositionInfo.Calculator.YPositionAt(note.HitObject.Tone + 2) + Y = notePositionInfo.Calculator.YPositionAt(note.HitObject.Tone + 2), }); // Add hit explosion @@ -200,7 +200,7 @@ internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result var explosion = new SkinnableDrawable(new KaraokeSkinComponentLookup(KaraokeSkinComponents.HitExplosion), _ => new DefaultHitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableNote)) { - Y = notePositionInfo.Calculator.YPositionAt(note.HitObject) + Y = notePositionInfo.Calculator.YPositionAt(note.HitObject), }; // todo : should be added into hitObjectArea.Explosions diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/ClickablePlayerSliderBar.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/ClickablePlayerSliderBar.cs index a58bc5c83..83a8768ac 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/ClickablePlayerSliderBar.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/ClickablePlayerSliderBar.cs @@ -22,7 +22,7 @@ public partial class ClickablePlayerSliderBar : SettingsSlider protected override Drawable CreateControl() => new ClickableSliderBar { Margin = new MarginPadding { Top = 5, Bottom = 5 }, - RelativeSizeAxes = Axes.X + RelativeSizeAxes = Axes.X, }; public ClickablePlayerSliderBar() @@ -56,7 +56,7 @@ public ClickableSliderBar() Height = BUTTON_SIZE, Text = "-", TooltipText = "Decrease", - Action = () => Current.Value -= (int)KeyboardStep + Action = () => Current.Value -= (int)KeyboardStep, }); Add(increaseButton = new ToolTipButton @@ -68,7 +68,7 @@ public ClickableSliderBar() Height = BUTTON_SIZE, Text = "+", TooltipText = "Increase", - Action = () => Current.Value += (int)KeyboardStep + Action = () => Current.Value += (int)KeyboardStep, }); } diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/LyricsPreview.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/LyricsPreview.cs index b075c48eb..20c8fe4ba 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/LyricsPreview.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/LyricsPreview.cs @@ -40,8 +40,8 @@ public LyricsPreview() AutoSizeAxes = Axes.Y, RelativeSizeAxes = Axes.X, Direction = FillDirection.Vertical, - Spacing = new Vector2(15) - } + Spacing = new Vector2(15), + }, }; singingLyrics.BindValueChanged(value => @@ -127,7 +127,7 @@ public ClickableLyric(Lyric lyric) Font = new FontUsage(size: 25), RubyFont = new FontUsage(size: 10), RomajiFont = new FontUsage(size: 10), - Margin = new MarginPadding { Left = 25 } + Margin = new MarginPadding { Left = 25 }, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs index 2940a0efe..b23dcdd47 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs @@ -22,19 +22,19 @@ public PitchSettings() { new OsuSpriteText { - Text = "Pitch:" + Text = "Pitch:", }, pitchSliderBar = new ClickablePlayerSliderBar(), new OsuSpriteText { - Text = "Vocal pitch:" + Text = "Vocal pitch:", }, vocalPitchSliderBar = new ClickablePlayerSliderBar(), new OsuSpriteText { - Text = "Scoring pitch:" + Text = "Scoring pitch:", }, - scoringPitchSliderBar = new ClickablePlayerSliderBar() + scoringPitchSliderBar = new ClickablePlayerSliderBar(), }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs index 982ce8896..1c2c4ea50 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs @@ -22,7 +22,7 @@ public PlaybackSettings() { new OsuSpriteText { - Text = "Playback:" + Text = "Playback:", }, playBackSliderBar = new ClickablePlayerSliderBar(), }; diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs index d8b1a953b..b5d4e3c6c 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs @@ -22,18 +22,18 @@ public PracticeSettings() { new OsuSpriteText { - Text = "Practice preempt time:" + Text = "Practice preempt time:", }, preemptTimeSliderBar = new PlayerSliderBar(), new OsuSpriteText { - Text = "Lyric:" + Text = "Lyric:", }, new LyricsPreview { Height = 580, RelativeSizeAxes = Axes.X, - } + }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs index 258794d8b..32868dc1d 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs @@ -20,11 +20,11 @@ public RubyRomajiSettings() { displayRubyCheckBox = new PlayerCheckbox { - LabelText = "Display ruby" + LabelText = "Display ruby", }, displayRomajiCheckBox = new PlayerCheckbox { - LabelText = "Display romaji" + LabelText = "Display romaji", }, }; } diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs index 247a9015c..a77f4e57a 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs @@ -27,11 +27,11 @@ public TranslateSettings() { translateCheckBox = new PlayerCheckbox { - LabelText = "Translate" + LabelText = "Translate", }, translateText = new OsuSpriteText { - Text = "Translate language" + Text = "Translate language", }, translateDropDown = new OsuDropdown { diff --git a/osu.Game.Rulesets.Karaoke/UI/Position/NotePositionCalculator.cs b/osu.Game.Rulesets.Karaoke/UI/Position/NotePositionCalculator.cs index 347f73631..ac5232cfe 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Position/NotePositionCalculator.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Position/NotePositionCalculator.cs @@ -38,7 +38,7 @@ public class NotePositionCalculator public Tone MaxTone => new() { - Scale = columns / 2 + Scale = columns / 2, }; public Tone MinTone => -MaxTone; diff --git a/osu.Game.Rulesets.Karaoke/UI/Scrolling/ScrollingNotePlayfield.cs b/osu.Game.Rulesets.Karaoke/UI/Scrolling/ScrollingNotePlayfield.cs index 913abfe7f..dbe635680 100644 --- a/osu.Game.Rulesets.Karaoke/UI/Scrolling/ScrollingNotePlayfield.cs +++ b/osu.Game.Rulesets.Karaoke/UI/Scrolling/ScrollingNotePlayfield.cs @@ -68,10 +68,10 @@ protected ScrollingNotePlayfield(int columns) AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical, Padding = new MarginPadding { Top = COLUMN_SPACING, Bottom = COLUMN_SPACING }, - Spacing = new Vector2(0, COLUMN_SPACING) + Spacing = new Vector2(0, COLUMN_SPACING), }, // center line - } + }, }, HitObjectLayer = new Container { @@ -90,14 +90,14 @@ protected ScrollingNotePlayfield(int columns) { Name = "Hit objects", RelativeSizeAxes = Axes.Both, - Child = HitObjectContainer + Child = HitObjectContainer, }, // scoring visualization - } - } + }, + }, }, }, - } + }, }, // other things like microphone status }; @@ -106,7 +106,7 @@ protected ScrollingNotePlayfield(int columns) { var column = new DefaultColumnBackground(i) { - IsSpecial = i % 2 == 0 + IsSpecial = i % 2 == 0, }; columnFlow.Add(column); diff --git a/osu.Game.Rulesets.Karaoke/Utils/TextIndexUtils.cs b/osu.Game.Rulesets.Karaoke/Utils/TextIndexUtils.cs index 8d576d0ad..5c98c3ff4 100644 --- a/osu.Game.Rulesets.Karaoke/Utils/TextIndexUtils.cs +++ b/osu.Game.Rulesets.Karaoke/Utils/TextIndexUtils.cs @@ -57,7 +57,7 @@ public static T GetValueByState(TextIndex.IndexState state, T startValue, T e { TextIndex.IndexState.Start => startValue, TextIndex.IndexState.End => endValue, - _ => throw new ArgumentOutOfRangeException(nameof(state)) + _ => throw new ArgumentOutOfRangeException(nameof(state)), }; public static T GetValueByState(TextIndex index, Func startValue, Func endValue) => @@ -68,7 +68,7 @@ public static T GetValueByState(TextIndex.IndexState state, Func startValu { TextIndex.IndexState.Start => startValue(), TextIndex.IndexState.End => endValue(), - _ => throw new ArgumentOutOfRangeException(nameof(state)) + _ => throw new ArgumentOutOfRangeException(nameof(state)), }; ///