@joebigelow / wix-1 / commits / 558dd1a4

Minor code cleanup

Rob Mensching committed Mar 2, 2022 at 13:53 UTC 558dd1a421d53ebb9ca3171bcccc39eb58dfec70
1 file changed +4 -8
src/wix/WixToolset.Core/Preprocessor.cs
+4 -8
@@ -402,8 +402,7 @@ namespace WixToolset.Core
402 switch (reader.NodeType)
403 {
404 case XmlNodeType.XmlDeclaration:
405 - var document = currentContainer as XDocument;
406 - if (null != document)
405 + if (currentContainer is XDocument document)
406 {
407 document.Declaration = new XDeclaration(null, null, null);
408 while (reader.MoveToNextAttribute())
@@ -705,15 +704,13 @@ namespace WixToolset.Core
704 }
705
706 // get the offset of this xml fragment (for some reason its always off by 1)
708 - var lineInfoReader = reader as IXmlLineInfo;
709 - if (null != lineInfoReader)
707 + if (reader is IXmlLineInfo lineInfoReader)
708 {
709 offset += lineInfoReader.LineNumber - 1;
710 }
711
714 - var textReader = reader as XmlTextReader;
712 // dump the xml to a string (maintaining whitespace if possible)
716 - if (null != textReader)
713 + if (reader is XmlTextReader textReader)
714 {
715 textReader.WhitespaceHandling = WhitespaceHandling.All;
716 }
@@ -1344,8 +1341,7 @@ namespace WixToolset.Core
1341 /// <param name="offset">This is the artificial offset of the line numbers from the reader. Used for the foreach processing.</param>
1342 private void UpdateCurrentLineNumber(ProcessingState state, XmlReader reader, int offset)
1343 {
1347 - var lineInfoReader = reader as IXmlLineInfo;
1348 - if (null != lineInfoReader)
1344 + if (reader is IXmlLineInfo lineInfoReader)
1345 {
1346 var newLine = lineInfoReader.LineNumber + offset;
1347