Clear cached stack before use, and cleanup

Author: FenPhoenix

AL_Common/RTF/RtfDisplayedReadmeParser.cs

@@ -195,7 +195,7 @@ private RtfError DispatchSpecialKeyword(SpecialType specialType, Symbol symbol,
                 break;
             default:
                 HandleSpecialTypeFont(_ctx, specialType, param);
-                return RtfError.OK;
+                break;
         }
 
         return RtfError.OK;

AL_Common/RTF/RtfToTextConverter.cs

@@ -1859,7 +1859,7 @@ private RtfError DispatchSpecialKeyword(SpecialType specialType, Symbol symbol,
             }
             default:
                 HandleSpecialTypeFont(_ctx, specialType, param);
-                return RtfError.OK;
+                break;
         }
 
         return RtfError.OK;
@@ -2875,7 +2875,6 @@ private ListFast<char> GetCharFromCodePage(int codePage, uint codePoint)
             {
                 _charGeneralBuffer.Count = GetEncodingFromCachedList(codePage)
                     .GetChars(_byteBuffer4, 0, 4, _charGeneralBuffer.ItemsArray, 0);
-                return _charGeneralBuffer;
             }
             else
             {
@@ -2884,20 +2883,19 @@ private ListFast<char> GetCharFromCodePage(int codePage, uint codePoint)
                 {
                     _charGeneralBuffer.Count = enc
                         .GetChars(_byteBuffer4, 0, 4, _charGeneralBuffer.ItemsArray, 0);
-                    return _charGeneralBuffer;
                 }
                 else
                 {
                     SetListFastToUnknownChar(_charGeneralBuffer);
-                    return _charGeneralBuffer;
                 }
             }
         }
         catch
         {
             SetListFastToUnknownChar(_charGeneralBuffer);
-            return _charGeneralBuffer;
         }
+
+        return _charGeneralBuffer;
     }
 
     #endregion
@@ -2946,26 +2944,18 @@ private void PutChars_FieldInst(ListFast<char> ch, int count)
     /// <param name="codePage"></param>
     /// <returns></returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private Encoding GetEncodingFromCachedList(int codePage)
+    private Encoding GetEncodingFromCachedList(int codePage) => codePage switch
     {
-        switch (codePage)
-        {
-            case _windows1252:
-                return _windows1252Encoding;
-            case 1250:
-                return _windows1250Encoding;
-            case 1251:
-                return _windows1251Encoding;
-            case _shiftJisWin:
-                return _shiftJisWinEncoding;
-            default:
-                return _encodings.TryGetValue(codePage, out Encoding result)
-                    ? result
-                    // NOTE: This can throw, but all calls to this are wrapped in try-catch blocks.
-                    // TODO: But weird that we don't put the try-catch here and just return null...?
-                    : _encodings.AddAndReturn(codePage, Encoding.GetEncoding(codePage));
-        }
-    }
+        _windows1252 => _windows1252Encoding,
+        1250 => _windows1250Encoding,
+        1251 => _windows1251Encoding,
+        _shiftJisWin => _shiftJisWinEncoding,
+        _ => _encodings.TryGetValue(codePage, out Encoding result)
+            ? result
+            // NOTE: This can throw, but all calls to this are wrapped in try-catch blocks.
+            // TODO: But weird that we don't put the try-catch here and just return null...?
+            : _encodings.AddAndReturn(codePage, Encoding.GetEncoding(codePage)),
+    };
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private (bool Success, bool CodePageWas42, Encoding? Encoding, FontEntry? FontEntry)

AngelLoader/Filtering.cs

@@ -400,7 +400,7 @@ internal static (FanMission? TitleExactMatch, FanMission? AuthorExactMatch)
 
                 if (ratingIsSet)
                 {
-                    if ((fm.Rating < filterRatingFrom || fm.Rating > filterRatingTo))
+                    if (fm.Rating < filterRatingFrom || fm.Rating > filterRatingTo)
                     {
                         shownInFilter = false;
                     }
@@ -414,11 +414,11 @@ internal static (FanMission? TitleExactMatch, FanMission? AuthorExactMatch)
 
                 if (releaseDateFilterSet)
                 {
-                    if ((fm.ReleaseDate.DateTime == null ||
-                         (filterReleaseDateFrom != null &&
-                          fm.ReleaseDate.DateTime.Value.Date.CompareTo(filterReleaseDateFrom.Value.Date) < 0) ||
-                         (filterReleaseDateTo != null &&
-                          fm.ReleaseDate.DateTime.Value.Date.CompareTo(filterReleaseDateTo.Value.Date) > 0)))
+                    if (fm.ReleaseDate.DateTime == null ||
+                        (filterReleaseDateFrom != null &&
+                         fm.ReleaseDate.DateTime.Value.Date.CompareTo(filterReleaseDateFrom.Value.Date) < 0) ||
+                        (filterReleaseDateTo != null &&
+                         fm.ReleaseDate.DateTime.Value.Date.CompareTo(filterReleaseDateTo.Value.Date) > 0))
                     {
                         shownInFilter = false;
                     }
@@ -432,11 +432,11 @@ internal static (FanMission? TitleExactMatch, FanMission? AuthorExactMatch)
 
                 if (lastPlayedFilterSet)
                 {
-                    if ((fm.LastPlayed.DateTime == null ||
-                         (filterLastPlayedFrom != null &&
-                          fm.LastPlayed.DateTime.Value.Date.CompareTo(filterLastPlayedFrom.Value.Date) < 0) ||
-                         (filterLastPlayedTo != null &&
-                          fm.LastPlayed.DateTime.Value.Date.CompareTo(filterLastPlayedTo.Value.Date) > 0)))
+                    if (fm.LastPlayed.DateTime == null ||
+                        (filterLastPlayedFrom != null &&
+                         fm.LastPlayed.DateTime.Value.Date.CompareTo(filterLastPlayedFrom.Value.Date) < 0) ||
+                        (filterLastPlayedTo != null &&
+                         fm.LastPlayed.DateTime.Value.Date.CompareTo(filterLastPlayedTo.Value.Date) > 0))
                     {
                         shownInFilter = false;
                     }
@@ -453,10 +453,10 @@ internal static (FanMission? TitleExactMatch, FanMission? AuthorExactMatch)
                     uint fmFinished = fm.FinishedOn;
                     bool fmFinishedOnUnknown = fm.FinishedOnUnknown;
 
-                    if ((((fmFinished > 0 || fmFinishedOnUnknown) &&
-                          !viewFilter.Finished.HasFlagFast(FinishedState.Finished)) ||
-                         (fmFinished == 0 && !fmFinishedOnUnknown &&
-                          !viewFilter.Finished.HasFlagFast(FinishedState.Unfinished))))
+                    if (((fmFinished > 0 || fmFinishedOnUnknown) &&
+                         !viewFilter.Finished.HasFlagFast(FinishedState.Finished)) ||
+                        (fmFinished == 0 && !fmFinishedOnUnknown &&
+                         !viewFilter.Finished.HasFlagFast(FinishedState.Unfinished)))
                     {
                         shownInFilter = false;
                     }

AngelLoader/Ini/IniCommon.cs

@@ -578,7 +578,7 @@ private static bool SegmentEquals(this string first, int start, int end, string
         }
 
         int secondLen = second.Length;
-        if ((end - start) < secondLen - 1) return false;
+        if (end - start < secondLen - 1) return false;
 
         int i = start;
         int i2 = 0;

FMScanner/Scanner.cs

@@ -1137,9 +1137,11 @@ private void ScanFM(
                                 ? FMFormat.Rar
                                 : FMFormat.NotInArchive;
 
+            // ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
             _archive?.Dispose();
             _rarArchive?.Dispose();
             _rarStream?.Dispose();
+            // ReSharper restore ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
 
             if (_fmFormat > FMFormat.NotInArchive)
             {
@@ -5138,7 +5140,7 @@ ident string location into account.
         */
 
         // Just check the bare ss2 fingerprinted value, because if we're here then we already know it's required
-        if ((_ss2Fingerprinted || SS2MisFilesPresent(_usedMisFiles, _ctx.FMFiles_SS2MisFiles)))
+        if (_ss2Fingerprinted || SS2MisFilesPresent(_usedMisFiles, _ctx.FMFiles_SS2MisFiles))
         {
             using Stream stream =
                 _solidGamFileToUse != null

FMScanner/ScannerUtility.cs

@@ -335,6 +335,8 @@ internal static string RemoveSurroundingParentheses(this string value, StackFast
     {
         if (value.IsEmpty() || value[0] != '(' || value[^1] != ')') return value;
 
+        stack.ClearFast();
+
         ReadOnlySpan<char> valueSpan = value.AsSpan();
 
         bool surroundedByParens = false;

FenGen/Utility/MiscUtils.cs

@@ -461,7 +461,7 @@ internal static string GetStringParamValue(AttributeSyntax attrSyntax, int argIn
             if (ins.Identifier.ToString() == "nameof")
             {
                 SyntaxNode? argSyntax = ies.ChildNodes().FirstOrDefault(static x => x is ArgumentListSyntax);
-                if (argSyntax is ArgumentListSyntax als && als.Arguments.Count == 1)
+                if (argSyntax is ArgumentListSyntax { Arguments.Count: 1 } als)
                 {
                     return als.Arguments[0].Expression.ToString();
                 }