Rollback of null handling in RowAtom.

ForNeVeR · Aug 15, 2020 · ff1bbfa · ff1bbfa
1 parent b6582a3
commit ff1bbfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/WpfMath/Atoms/RowAtom.cs b/src/WpfMath/Atoms/RowAtom.cs
@@ -34,12 +34,12 @@ static RowAtom()
             ligatureKernChangeSet.Set((int)TexAtomType.Punctuation, true);
         }
 
-        public RowAtom(SourceSpan? source, Atom baseAtom)
+        public RowAtom(SourceSpan? source, Atom? baseAtom)
             : this(
                 source,
                 baseAtom is RowAtom
                     ? (IEnumerable<Atom>) ((RowAtom) baseAtom).Elements
-                    : new[] { baseAtom })
+                    : new[] { baseAtom! }) // Nullable: Seems to require some sort of non-null assertion to make the analyzer happy
         {
         }
 
@@ -56,9 +56,10 @@ private RowAtom(SourceSpan? source, DummyAtom? previousAtom, ReadOnlyCollection<
             this.Elements = elements;
         }
 
-        internal RowAtom(SourceSpan? source, IEnumerable<Atom> elements)
+        internal RowAtom(SourceSpan? source, IEnumerable<Atom?> elements)
             : base(source) =>
-            this.Elements = elements.ToList().AsReadOnly();
+            this.Elements = elements.Where(x => x != null).ToList().AsReadOnly()!;
+            // TODO[F]: Fix this with C# 8 migration: there shouldn't be nullable atoms in this collection
 
         public DummyAtom? PreviousAtom { get; }
 

diff --git a/src/WpfMath/Atoms/StyledAtom.cs b/src/WpfMath/Atoms/StyledAtom.cs
@@ -9,7 +9,7 @@ internal class StyledAtom : Atom, IRow
         public StyledAtom(SourceSpan? source, Atom? atom, Brush? backgroundColor, Brush? foregroundColor)
             : base(source)
         {
-            this.RowAtom = new RowAtom(source, atom!); // Nullable TODO: This definitely needs null checking and is currently wrong
+            this.RowAtom = new RowAtom(source, atom);
             this.Background = backgroundColor;
             this.Foreground = foregroundColor;
         }