replace _standalone and _encoding with readonly struct

Author: mikeebowen

Diff for: src/DocumentFormat.OpenXml.Framework/OpenXmlPartReader.cs

@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Xml;
 
 namespace DocumentFormat.OpenXml
@@ -26,14 +27,10 @@ public class OpenXmlPartReader : OpenXmlReader
         private readonly List<KeyValuePair<string, string>> _nsDecls = new List<KeyValuePair<string, string>>();
         private readonly Stack<OpenXmlElement> _elementStack = new Stack<OpenXmlElement>();
 
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private readonly string? _encoding;
-
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        private readonly bool? _standalone;
-
         private ElementState _elementState;
 
+        private OpenXmlPartReaderState? _openXmlPartReaderState;
+
         /// <summary>
         /// Initializes a new instance of the OpenXmlPartReader class using the supplied OpenXmlPart class.
         /// </summary>
@@ -100,7 +97,8 @@ public OpenXmlPartReader(Stream partStream, IFeatureCollection features, OpenXml
 
             _resolver = features.GetRequired<IOpenXmlNamespaceResolver>();
             _rootElements = features.GetRequired<IRootElementFeature>();
-            _xmlReader = CreateReader(partStream, options.CloseStream, options.MaxCharactersInPart, ignoreWhitespace: options.IgnoreWhitespace, out _standalone, out _encoding);
+            _xmlReader = CreateReader(partStream, options.CloseStream, options.MaxCharactersInPart, ignoreWhitespace: options.IgnoreWhitespace, out bool? standalone, out string? encoding);
+            _openXmlPartReaderState = new OpenXmlPartReaderState(standalone, encoding);
         }
 
         /// <summary>
@@ -114,7 +112,8 @@ public override string? Encoding
             get
             {
                 ThrowIfObjectDisposed();
-                return _encoding;
+
+                return _openXmlPartReaderState?.Encoding;
             }
         }
 
@@ -129,7 +128,7 @@ public override bool? StandaloneXml
 
                 // default is true for standalone
                 // <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-                return _standalone;
+                return _openXmlPartReaderState?.StandaloneXml;
             }
         }
 

Diff for: src/DocumentFormat.OpenXml.Framework/OpenXmlPartReaderState.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace DocumentFormat.OpenXml;
+
+internal readonly struct OpenXmlPartReaderState
+{
+    internal OpenXmlPartReaderState(bool? standalone, string? encoding)
+    {
+        StandaloneXml = standalone;
+        Encoding = encoding;
+    }
+
+    internal string? Encoding { get; }
+
+    internal bool? StandaloneXml { get; }
+}