Avoid chaining Where and First/FirstOrDefault

monkeymanboy · Dec 20, 2023 · f888888 · f888888
1 parent 1d2f526
commit f888888
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/BeatSaberMarkupLanguage/Components/ButtonArtworkImage.cs b/BeatSaberMarkupLanguage/Components/ButtonArtworkImage.cs
@@ -13,7 +13,7 @@ public void SetArtwork(string path)
         {
             if (image == null)
             {
-                image = GetComponentsInChildren<Image>().Where(x => x.name == "BGArtwork").FirstOrDefault();
+                image = GetComponentsInChildren<Image>().FirstOrDefault(x => x.name == "BGArtwork");
             }
 
             if (image == null)

diff --git a/BeatSaberMarkupLanguage/FontManager.cs b/BeatSaberMarkupLanguage/FontManager.cs
@@ -327,7 +327,7 @@ private static bool TryGetFontInfoByFamily(string family, out FontInfo info, str
             {
                 if (fontInfoLookup.TryGetValue(family, out List<FontInfo> fonts))
                 {
-                    info = fonts.Where(p => p?.Info.Subfamily == subfamily).FirstOrDefault();
+                    info = fonts.FirstOrDefault(p => p?.Info.Subfamily == subfamily);
                     if (info == null)
                     {
                         if (!fallbackIfNoSubfamily)

diff --git a/BeatSaberMarkupLanguage/GameplaySetup/GameplaySetup.cs b/BeatSaberMarkupLanguage/GameplaySetup/GameplaySetup.cs
@@ -88,7 +88,7 @@ public void SetTabVisibility(string name, bool isVisible)
                 return;
             }
 
-            GameplaySetupMenu menu = _menus.OfType<GameplaySetupMenu>().Where(x => x.name == name).FirstOrDefault();
+            GameplaySetupMenu menu = _menus.OfType<GameplaySetupMenu>().FirstOrDefault(x => x.name == name);
             menu?.SetVisible(isVisible);
         }
 

diff --git a/BeatSaberMarkupLanguage/OpenType/OpenTypeFont.cs b/BeatSaberMarkupLanguage/OpenType/OpenTypeFont.cs
@@ -29,7 +29,7 @@ public OpenTypeFont(OffsetTable offsets, OpenTypeFontReader reader, bool lazyLoa
             offsetTable = offsets;
             tables = reader.ReadTableRecords(offsetTable);
             nameTableRecord = tables.Select(t => new TableRecord?(t))
-                .Where(t => t.Value.TableTag == OpenTypeTag.NAME).FirstOrDefault();
+                .FirstOrDefault(t => t.Value.TableTag == OpenTypeTag.NAME);
 
             if (lazyLoad)
             {

diff --git a/BeatSaberMarkupLanguage/Tags/LoadingIndicatorTag.cs b/BeatSaberMarkupLanguage/Tags/LoadingIndicatorTag.cs
@@ -15,7 +15,7 @@ public override GameObject CreateObject(Transform parent)
         {
             if (loadingTemplate == null)
             {
-                loadingTemplate = Resources.FindObjectsOfTypeAll<ImageView>().Where(x => x.gameObject.name == "LoadingIndicator").First().gameObject;
+                loadingTemplate = Resources.FindObjectsOfTypeAll<ImageView>().First(x => x.gameObject.name == "LoadingIndicator").gameObject;
             }
 
             GameObject loadingIndicator = Object.Instantiate(loadingTemplate, parent, false);

diff --git a/BeatSaberMarkupLanguage/Tags/ModalColorPickerTag.cs b/BeatSaberMarkupLanguage/Tags/ModalColorPickerTag.cs
@@ -38,7 +38,7 @@ public override GameObject CreateObject(Transform parent)
 
             if (currentColorTemplate == null)
             {
-                currentColorTemplate = Resources.FindObjectsOfTypeAll<ImageView>().Where(iv => iv.transform.parent != null).First(iv => iv.gameObject.name == "SaberColorA" && iv.transform.parent.name == "ColorSchemeView");
+                currentColorTemplate = Resources.FindObjectsOfTypeAll<ImageView>().First(iv => iv.transform.parent != null && iv.gameObject.name == "SaberColorA" && iv.transform.parent.name == "ColorSchemeView");
             }
 
             RGBPanelController rgbController = Object.Instantiate(rgbTemplate, gameObject.transform, false);

diff --git a/BeatSaberMarkupLanguage/Tags/PageButtonTag.cs b/BeatSaberMarkupLanguage/Tags/PageButtonTag.cs
@@ -41,7 +41,7 @@ public override GameObject CreateObject(Transform parent)
             (button.transform as RectTransform).pivot = new Vector2(.5f, .5f);
 
             ButtonIconImage btnIcon = button.gameObject.AddComponent<ButtonIconImage>();
-            btnIcon.image = button.gameObject.GetComponentsInChildren<Image>(true).Where(x => x.gameObject.name == "Icon").FirstOrDefault();
+            btnIcon.image = button.gameObject.GetComponentsInChildren<Image>(true).FirstOrDefault(x => x.gameObject.name == "Icon");
 
             button.gameObject.SetActive(true);
             return button.gameObject;

diff --git a/BeatSaberMarkupLanguage/Tags/Settings/ColorSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/ColorSettingTag.cs
@@ -62,7 +62,7 @@ public override GameObject CreateObject(Transform parent)
 
             if (colorImage == null)
             {
-                colorImage = Resources.FindObjectsOfTypeAll<Image>().Where(i => i.sprite != null).First(i => i.gameObject.name == "ColorImage" && i.sprite.name == "NoteCircle");
+                colorImage = Resources.FindObjectsOfTypeAll<Image>().First(i => i.sprite != null && i.gameObject.name == "ColorImage" && i.sprite.name == "NoteCircle");
             }
 
             Image instance = Object.Instantiate(colorImage, valuePick, false);

diff --git a/BeatSaberMarkupLanguage/Tags/Settings/DropdownListSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/DropdownListSettingTag.cs
@@ -20,7 +20,7 @@ public override void Setup()
         {
             if (dropdownTemplate == null)
             {
-                dropdownTemplate = Resources.FindObjectsOfTypeAll<SimpleTextDropdown>().Where(td => td.transform.parent != null).First(td => td.transform.parent.name == "NormalLevels").transform.parent.gameObject;
+                dropdownTemplate = Resources.FindObjectsOfTypeAll<SimpleTextDropdown>().First(td => td.transform.parent != null && td.transform.parent.name == "NormalLevels").transform.parent.gameObject;
             }
 
             safePrefab = Object.Instantiate(dropdownTemplate);

diff --git a/BeatSaberMarkupLanguage/Tags/TabSelectorTag.cs b/BeatSaberMarkupLanguage/Tags/TabSelectorTag.cs
@@ -15,7 +15,7 @@ public override GameObject CreateObject(Transform parent)
         {
             if (segmentControlTemplate == null)
             {
-                segmentControlTemplate = Resources.FindObjectsOfTypeAll<TextSegmentedControl>().Where(x => x.transform.parent.name == "PlayerStatisticsViewController" && x._container != null).FirstOrDefault();
+                segmentControlTemplate = Resources.FindObjectsOfTypeAll<TextSegmentedControl>().FirstOrDefault(x => x.transform.parent.name == "PlayerStatisticsViewController" && x._container != null);
             }
 
             TextSegmentedControl textSegmentedControl = DiContainer.InstantiatePrefabForComponent<TextSegmentedControl>(segmentControlTemplate, parent);

diff --git a/BeatSaberMarkupLanguage/Utilities.cs b/BeatSaberMarkupLanguage/Utilities.cs
@@ -28,7 +28,7 @@ public static Sprite EditIcon
             {
                 if (editIcon == null)
                 {
-                    editIcon = Resources.FindObjectsOfTypeAll<Image>().Where(x => x.sprite != null).First(x => x.sprite.name == "EditIcon").sprite;
+                    editIcon = Resources.FindObjectsOfTypeAll<Image>().First(x => x.sprite != null && x.sprite.name == "EditIcon").sprite;
                 }
 
                 return editIcon;
@@ -541,7 +541,7 @@ public static Sprite WhitePixel
                 {
                     if (!whitePixel)
                     {
-                        whitePixel = Resources.FindObjectsOfTypeAll<Image>().Where(i => i.sprite != null).First(i => i.sprite.name == "WhitePixel").sprite;
+                        whitePixel = Resources.FindObjectsOfTypeAll<Image>().First(i => i.sprite != null && i.sprite.name == "WhitePixel").sprite;
                     }
 
                     return whitePixel;
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ public void SetTabVisibility(string name, bool isVisible) @@
                     return;
                 }
-                GameplaySetupMenu menu = _menus.OfType<GameplaySetupMenu>().Where(x => x.name == name).FirstOrDefault();
+                GameplaySetupMenu menu = _menus.OfType<GameplaySetupMenu>().FirstOrDefault(x => x.name == name);
                 menu?.SetVisible(isVisible);
             }
@@ Expand Down @@