Enable .NET analyzers

* fix issues

Author: lahma

YamlDotNet/Core/AnchorName.cs

@@ -26,7 +26,7 @@ namespace YamlDotNet.Core
 {
     public struct AnchorName : IEquatable<AnchorName>
     {
-        public static readonly AnchorName Empty = default;
+        public static readonly AnchorName Empty;
 
         // https://yaml.org/spec/1.2/spec.html#id2785586
         private static readonly Regex AnchorPattern = new Regex(@"^[^\[\]\{\},]+$", StandardRegexOptions.Compiled);

YamlDotNet/Core/CharacterAnalyzer.cs

@@ -161,7 +161,7 @@ public bool Check(string expectedCharacters, int offset = 0)
             Debug.Assert(expectedCharacters.Length > 1, "Use Check(char, int) instead.");
 
             var character = Buffer.Peek(offset);
-            return expectedCharacters.IndexOf(character) != -1;
+            return expectedCharacters.Contains(character);
         }
     }
 }

YamlDotNet/Core/Emitter.cs

@@ -537,7 +537,7 @@ private bool ValueIsRepresentableInOutputEncoding(string value)
             }
         }
 
-        private bool IsUnicode(Encoding encoding)
+        private static bool IsUnicode(Encoding encoding)
         {
             return encoding is UTF8Encoding ||
                    encoding is UnicodeEncoding ||
@@ -726,7 +726,7 @@ private void EmitDocumentStart(ParsingEvent evt, bool isFirst)
 
                 if (documentStart.Version != null)
                 {
-                    AnalyzeVersionDirective(documentStart.Version);
+                    Emitter.AnalyzeVersionDirective(documentStart.Version);
 
                     var documentVersion = documentStart.Version.Version;
                     isImplicit = false;
@@ -792,7 +792,7 @@ private void EmitDocumentStart(ParsingEvent evt, bool isFirst)
             }
         }
 
-        private TagDirectiveCollection NonDefaultTagsAmong(IEnumerable<TagDirective>? tagCollection)
+        private static TagDirectiveCollection NonDefaultTagsAmong(IEnumerable<TagDirective>? tagCollection)
         {
             var directives = new TagDirectiveCollection();
             if (tagCollection == null)
@@ -811,7 +811,7 @@ private TagDirectiveCollection NonDefaultTagsAmong(IEnumerable<TagDirective>? ta
             return directives;
         }
 
-        private void AnalyzeVersionDirective(VersionDirective versionDirective)
+        private static void AnalyzeVersionDirective(VersionDirective versionDirective)
         {
             if (versionDirective.Version.Major != Constants.MajorVersion || versionDirective.Version.Minor > Constants.MinorVersion)
             {
@@ -1714,7 +1714,7 @@ private bool CheckSimpleKey()
             switch (events.Peek().Type)
             {
                 case EventType.Alias:
-                    length = AnchorNameLength(anchorData.Anchor);
+                    length = Emitter.AnchorNameLength(anchorData.Anchor);
                     break;
 
                 case EventType.Scalar:
@@ -1724,7 +1724,7 @@ private bool CheckSimpleKey()
                     }
 
                     length =
-                        AnchorNameLength(anchorData.Anchor) +
+                        Emitter.AnchorNameLength(anchorData.Anchor) +
                             SafeStringLength(tagData.Handle) +
                             SafeStringLength(tagData.Suffix) +
                             SafeStringLength(scalarData.Value);
@@ -1736,7 +1736,7 @@ private bool CheckSimpleKey()
                         return false;
                     }
                     length =
-                        AnchorNameLength(anchorData.Anchor) +
+                        Emitter.AnchorNameLength(anchorData.Anchor) +
                             SafeStringLength(tagData.Handle) +
                             SafeStringLength(tagData.Suffix);
                     break;
@@ -1747,7 +1747,7 @@ private bool CheckSimpleKey()
                         return false;
                     }
                     length =
-                        AnchorNameLength(anchorData.Anchor) +
+                        Emitter.AnchorNameLength(anchorData.Anchor) +
                             SafeStringLength(tagData.Handle) +
                             SafeStringLength(tagData.Suffix);
                     break;
@@ -1759,14 +1759,14 @@ private bool CheckSimpleKey()
             return length <= maxSimpleKeyLength;
         }
 
-        private int AnchorNameLength(AnchorName value)
+        private static int AnchorNameLength(AnchorName value)
         {
             return value.IsEmpty ? 0 : value.Value.Length;
         }
 
-        private int SafeStringLength(string? value)
+        private static int SafeStringLength(string? value)
         {
-            return value == null ? 0 : value.Length;
+            return value?.Length ?? 0;
         }
 
         private bool CheckEmptySequence() => CheckEmptyStructure<SequenceStart, SequenceEnd>();
@@ -1894,7 +1894,7 @@ private static string UrlEncode(string text)
                 var buffer = bufferBuilder.Builder;
                 foreach (var toEncode in Encoding.UTF8.GetBytes(match.Value))
                 {
-                    buffer.AppendFormat("%{0:X02}", toEncode);
+                    buffer.AppendFormat(CultureInfo.InvariantCulture, "%{0:X02}", toEncode);
                 }
                 return buffer.ToString();
             });

YamlDotNet/Core/EmitterSettings.cs

@@ -43,7 +43,7 @@ public sealed class EmitterSettings
         /// <summary>
         /// If true, write the output in canonical form.
         /// </summary>
-        public bool IsCanonical { get; } = false;
+        public bool IsCanonical { get; }
 
         /// <summary>
         /// If true, write output without anchor names.
@@ -61,7 +61,7 @@ public sealed class EmitterSettings
         /// <summary>
         /// Indent sequences. The default is to not indent.
         /// </summary>
-        public bool IndentSequences { get; } = false;
+        public bool IndentSequences { get; }
 
         public static readonly EmitterSettings Default = new EmitterSettings();
 

YamlDotNet/Core/InsertionQueue.cs

@@ -39,7 +39,7 @@ public sealed class InsertionQueue<T> : IEnumerable<T>
         private int readPtr;
         private int writePtr;
         private int mask;
-        private int count = 0;
+        private int count;
 
         public InsertionQueue(int initialCapacity = DefaultInitialCapacity)
         {

YamlDotNet/Core/Mark.cs

@@ -122,5 +122,35 @@ public int CompareTo(Mark other)
             }
             return cmp;
         }
+
+        public static bool operator ==(Mark left, Mark right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(Mark left, Mark right)
+        {
+            return !(left == right);
+        }
+
+        public static bool operator <(Mark left, Mark right)
+        {
+            return left.CompareTo(right) < 0;
+        }
+
+        public static bool operator <=(Mark left, Mark right)
+        {
+            return left.CompareTo(right) <= 0;
+        }
+
+        public static bool operator >(Mark left, Mark right)
+        {
+            return left.CompareTo(right) > 0;
+        }
+
+        public static bool operator >=(Mark left, Mark right)
+        {
+            return left.CompareTo(right) >= 0;
+        }
     }
 }

YamlDotNet/Core/MergingParser.cs

@@ -117,7 +117,7 @@ private bool HandleMergeSequence(LinkedListNode<ParsingEvent> sequenceStart, Lin
             return false;
         }
 
-        private bool IsMergeToken(LinkedListNode<ParsingEvent> node)
+        private static bool IsMergeToken(LinkedListNode<ParsingEvent> node)
         {
             return node.Value is Scalar merge && merge.Value == "<<";
         }
@@ -220,7 +220,7 @@ public IEnumerable<LinkedListNode<ParsingEvent>> FromAnchor(AnchorName anchor)
 
             IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-            private IEnumerable<LinkedListNode<ParsingEvent>> Enumerate(LinkedListNode<ParsingEvent>? node)
+            private static IEnumerable<LinkedListNode<ParsingEvent>> Enumerate(LinkedListNode<ParsingEvent>? node)
             {
                 while (node != null)
                 {

YamlDotNet/Core/Parser.cs

@@ -204,7 +204,7 @@ private void Skip()
         /// stream   ::= STREAM-START implicit_document? explicit_document* STREAM-END
         ///              ************
         /// </summary>
-        private ParsingEvent ParseStreamStart()
+        private Events.StreamStart ParseStreamStart()
         {
             var current = GetCurrentToken();
 
@@ -419,7 +419,7 @@ private ParsingEvent ParseDocumentContent()
         /// <summary>
         /// Generate an empty scalar event.
         /// </summary>
-        private static ParsingEvent ProcessEmptyScalar(in Mark position)
+        private static Events.Scalar ProcessEmptyScalar(in Mark position)
         {
             return new Events.Scalar(AnchorName.Empty, TagName.Empty, string.Empty, ScalarStyle.Plain, true, false, position, position);
         }
@@ -634,7 +634,7 @@ private ParsingEvent ParseNode(bool isBlock, bool isIndentlessSequence)
         ///                                                                *************
         /// </summary>
 
-        private ParsingEvent ParseDocumentEnd()
+        private Events.DocumentEnd ParseDocumentEnd()
         {
             var current = GetCurrentToken() ?? throw new SemanticErrorException("Reached the end of the stream while parsing a document end");
 
@@ -956,7 +956,7 @@ private ParsingEvent ParseFlowSequenceEntryMappingValue()
         /// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
         ///                                                                      *
         /// </summary>
-        private ParsingEvent ParseFlowSequenceEntryMappingEnd()
+        private Events.MappingEnd ParseFlowSequenceEntryMappingEnd()
         {
             state = ParserState.FlowSequenceEntry;
             var current = GetCurrentToken();

YamlDotNet/Core/Scanner.cs

@@ -68,8 +68,8 @@ public class Scanner : IScanner
         private bool streamEndProduced;
         private bool plainScalarFollowedByComment;
         private int flowSequenceStartLine;
-        private bool flowCollectionFetched = false;
-        private bool startFlowCollectionFetched = false;
+        private bool flowCollectionFetched;
+        private bool startFlowCollectionFetched;
         private int indent = -1;
         private bool flowScalarFetched;
         private bool simpleKeyAllowed;
@@ -78,7 +78,7 @@ public class Scanner : IScanner
         private bool tokenAvailable;
         private Token? previous;
         private Anchor? previousAnchor;
-        private Scalar? lastScalar = null;
+        private Scalar? lastScalar;
 
         private bool IsDocumentStart() =>
             !analyzer.EndOfInput &&
@@ -1282,7 +1282,9 @@ private void FetchAnchor(bool isAlias)
             tokens.Enqueue(ScanAnchor(isAlias));
         }
 
+#pragma warning disable CA1859
         private Token ScanAnchor(bool isAlias)
+#pragma warning restore CA1859
         {
             // Eat the indicator character.
 
@@ -1369,8 +1371,7 @@ private void FetchTag()
         /// <summary>
         /// Scan a TAG token.
         /// </summary>
-
-        Token ScanTag()
+        private Tag ScanTag()
         {
             var start = cursor.Mark();
 
@@ -1478,8 +1479,7 @@ private void FetchBlockScalar(bool isLiteral)
         /// <summary>
         /// Scan a block scalar.
         /// </summary>
-
-        Token ScanBlockScalar(bool isLiteral)
+        private Scalar ScanBlockScalar(bool isLiteral)
         {
             using var valueBuilder = StringBuilderPool.Rent();
             var value = valueBuilder.Builder;
@@ -1629,13 +1629,13 @@ Token ScanBlockScalar(bool isLiteral)
                 }
                 else
                 {
-                    value.Append(leadingBreak.ToString());
+                    value.Append(leadingBreak);
                     leadingBreak.Length = 0;
                 }
 
                 // Append the remaining line breaks.
 
-                value.Append(trailingBreaks.ToString());
+                value.Append(trailingBreaks);
                 trailingBreaks.Length = 0;
 
                 // Is it a leading whitespace?
@@ -2064,20 +2064,20 @@ private Scalar ScanFlowScalar(bool isSingleQuoted)
                         }
                         else
                         {
-                            value.Append(trailingBreaks.ToString());
+                            value.Append(trailingBreaks);
                         }
                     }
                     else
                     {
-                        value.Append(leadingBreak.ToString());
-                        value.Append(trailingBreaks.ToString());
+                        value.Append(leadingBreak);
+                        value.Append(trailingBreaks);
                     }
                     leadingBreak.Length = 0;
                     trailingBreaks.Length = 0;
                 }
                 else
                 {
-                    value.Append(whitespaces.ToString());
+                    value.Append(whitespaces);
                     whitespaces.Length = 0;
                 }
             }
@@ -2220,7 +2220,7 @@ private Scalar ScanPlainScalar(ref bool isMultiline)
                     }
                     if (flowLevel > 0 && cursor.LineOffset < currentIndent)
                     {
-                        throw new Exception();
+                        throw new InvalidOperationException();
                     }
                     // Copy the character.
 
@@ -2382,7 +2382,7 @@ private void SkipWhitespaces()
         ///      %YAML   1.1     # a comment \n
         ///           ^^^^^^
         /// </summary>
-        private Token ScanVersionDirectiveValue(in Mark start)
+        private VersionDirective ScanVersionDirectiveValue(in Mark start)
         {
             SkipWhitespaces();
 
@@ -2413,7 +2413,7 @@ private Token ScanVersionDirectiveValue(in Mark start)
         ///      %TAG    !yaml!  tag:yaml.org,2002:  \n
         ///          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         /// </summary>
-        private Token ScanTagDirectiveValue(in Mark start)
+        private TagDirective ScanTagDirectiveValue(in Mark start)
         {
             SkipWhitespaces();
 
@@ -2499,15 +2499,15 @@ private string ScanTagUri(string? head, Mark start)
             }
 
             var result = tag.ToString();
-            if (result.EndsWith(","))
+            if (result.EndsWith(','))
             {
                 throw new SyntaxErrorException(cursor.Mark(), cursor.Mark(), "Unexpected comma at end of tag");
             }
 
             return result;
         }
 
-        private static readonly byte[] EmptyBytes = new byte[0];
+        private static readonly byte[] EmptyBytes = Array.Empty<byte>();
 
         /// <summary>
         /// Decode an URI-escape sequence corresponding to a single UTF-8 character.

YamlDotNet/Core/TagName.cs

@@ -25,7 +25,7 @@ namespace YamlDotNet.Core
 {
     public readonly struct TagName : IEquatable<TagName>
     {
-        public static readonly TagName Empty = default;
+        public static readonly TagName Empty;
 
         private readonly string? value;