Make blinking Placeholder's Nucleus and ForeColor customizable in both CaretStates

CSharpMath.CoreTests/MockTests.cs

@@ -2,7 +2,6 @@
 using Xunit;
 using TGlyph = System.Char;
 using CSharpMath.Display;
-using System.Linq;
 
 namespace CSharpMath.CoreTests {
   // purpose of this class is to make sure our mocks behave as expected.
@@ -17,7 +16,6 @@ public void TestGlyphBoundsWithoutM() {
       var width = provider.GetTypographicWidth(font, glyphRun);
       Approximately.Equal(width, 25,  0.01);
     }
-
     [Fact]
     public void TestGlyphBoundsWithM() {
       string america = "America";

CSharpMath.Editor.Tests/CaretTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using CSharpMath.Atom;
 using CSharpMath.CoreTests.FrontEnd;
@@ -33,18 +32,18 @@ public async Task Test() {
       var outer = Assert.IsType<Atom.Atoms.Placeholder>(Assert.Single(keyboard.MathList));
       var inner = Assert.IsType<Atom.Atoms.Placeholder>(Assert.Single(outer.Superscript));
       Assert.Equal(MathKeyboardCaretState.ShownThroughPlaceholder, keyboard.CaretState);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, outer.Nucleus);
-      Assert.Equal(CustomizablePlaceholder.ActiveNucleusDefault, inner.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, outer.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.ActiveNucleus, inner.Nucleus);
 
       await Task.Delay((int)MathKeyboard<TestFont, char>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
       Assert.Equal(MathKeyboardCaretState.TemporarilyHidden, keyboard.CaretState);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, outer.Nucleus);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, inner.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, outer.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, inner.Nucleus);
 
       await Task.Delay((int)MathKeyboard<TestFont, char>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
       Assert.Equal(MathKeyboardCaretState.ShownThroughPlaceholder, keyboard.CaretState);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, outer.Nucleus);
-      Assert.Equal(CustomizablePlaceholder.ActiveNucleusDefault, inner.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, outer.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.ActiveNucleus, inner.Nucleus);
     }
   }
   public class CaretMovesWithPlaceholder {
@@ -59,20 +58,20 @@ public async Task Test() {
       var outer = Assert.IsType<Atom.Atoms.Placeholder>(Assert.Single(keyboard.MathList));
       var inner = Assert.IsType<Atom.Atoms.Placeholder>(Assert.Single(outer.Subscript));
       Assert.Equal(MathKeyboardCaretState.ShownThroughPlaceholder, keyboard.CaretState);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, outer.Nucleus);
-      Assert.Equal(CustomizablePlaceholder.ActiveNucleusDefault, inner.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, outer.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.ActiveNucleus, inner.Nucleus);
 
       await Task.Delay((int)MathKeyboard<TestFont, char>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
       Assert.Equal(MathKeyboardCaretState.TemporarilyHidden, keyboard.CaretState);
       keyboard.KeyPress(MathKeyboardInput.Left);
       Assert.Equal(MathKeyboardCaretState.ShownThroughPlaceholder, keyboard.CaretState);
-      Assert.Equal(CustomizablePlaceholder.ActiveNucleusDefault, outer.Nucleus);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, inner.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.ActiveNucleus, outer.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, inner.Nucleus);
 
       Assert.Equal(MathKeyboardCaretState.ShownThroughPlaceholder, keyboard.CaretState);
       keyboard.KeyPress(MathKeyboardInput.Right);
-      Assert.Equal(CustomizablePlaceholder.RestingNucleusDefault, outer.Nucleus);
-      Assert.Equal(CustomizablePlaceholder.ActiveNucleusDefault, inner.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, outer.Nucleus);
+      Assert.Equal(DefaultPlaceholderSettings.ActiveNucleus, inner.Nucleus);
     }
   }
   public class CaretStaysHidden {
@@ -177,19 +176,51 @@ public async Task Test() {
       Assert.Equal(MathKeyboardCaretState.Shown, keyboard.CaretState);
     }
   }
+  public class DefaultPlaceholderSettings {
+    public const string ActiveNucleus = "■";
+    public const string RestingNucleus = "□";
+    public static readonly System.Drawing.Color? ActiveColor = null;
+    public static readonly System.Drawing.Color? RestingColor = null;
+  }
+  [CollectionDefinition(nameof(NonParallelPlaceholderTests), DisableParallelization = true)]
+  public class NonParallelPlaceholderTests { }
   [Collection(nameof(NonParallelPlaceholderTests))]
-  public class CustomizablePlaceholder {
-    public const string ActiveNucleusDefault = "\u25A0";
-    public const string RestingNucleusDefault = "\u25A1";
-    public static readonly System.Drawing.Color? RestingColorDefault = null;
-    public static readonly System.Drawing.Color? ActiveColorDefault = null;
+  public class DefaultPlaceholder {
     [Fact]
-    public async void CustomizedPlaceholderBlinks() {
+    public void LaTeXSettingsPlaceholderIsNewInstance() {
+      Assert.False(LaTeXSettings.Placeholder == LaTeXSettings.Placeholder);
+      // Double check, also verify that its contents are 'fresh':
+      LaTeXSettings.Placeholder.Nucleus = "x";
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, LaTeXSettings.Placeholder.Nucleus);
+      LaTeXSettings.Placeholder.Color = System.Drawing.Color.Green;
+      Assert.Equal(DefaultPlaceholderSettings.RestingColor, LaTeXSettings.Placeholder.Color);
+    }
+    [Fact]
+    public void DefaultPlaceholderAppearance() {
+      Assert.Null(LaTeXSettings.PlaceholderActiveColor);
+      Assert.Null(LaTeXSettings.PlaceholderRestingColor);
+      Assert.Equal(DefaultPlaceholderSettings.ActiveNucleus, LaTeXSettings.PlaceholderActiveNucleus);
+      Assert.Equal(DefaultPlaceholderSettings.RestingNucleus, LaTeXSettings.PlaceholderRestingNucleus);
+      Assert.Equal(LaTeXSettings.PlaceholderRestingNucleus, LaTeXSettings.Placeholder.Nucleus);
+      Assert.Equal(LaTeXSettings.PlaceholderRestingColor, LaTeXSettings.Placeholder.Color);
+    }
+  }
+  [Collection(nameof(NonParallelPlaceholderTests))]
+  public class CustomizablePlaceholder : IDisposable {
+    public CustomizablePlaceholder() {
       LaTeXSettings.PlaceholderActiveNucleus = "😀";
       LaTeXSettings.PlaceholderRestingNucleus = "😐";
       LaTeXSettings.PlaceholderActiveColor = System.Drawing.Color.Green;
       LaTeXSettings.PlaceholderRestingColor = System.Drawing.Color.Blue;
-
+    }
+    public void Dispose() {
+      LaTeXSettings.PlaceholderActiveNucleus = DefaultPlaceholderSettings.ActiveNucleus;
+      LaTeXSettings.PlaceholderRestingNucleus = DefaultPlaceholderSettings.RestingNucleus;
+      LaTeXSettings.PlaceholderActiveColor = DefaultPlaceholderSettings.ActiveColor;
+      LaTeXSettings.PlaceholderRestingColor = DefaultPlaceholderSettings.RestingColor;
+    }
+    [Fact]
+    public async void CustomizedPlaceholderBlinks() {
       var keyboard = new MathKeyboard<TestFont, char>(TestTypesettingContexts.Instance, new TestFont()) {
         CaretState = MathKeyboardCaretState.Shown
       };
@@ -217,15 +248,9 @@ public async void CustomizedPlaceholderBlinks() {
       Assert.Equal(System.Drawing.Color.Blue, outer.Color);
       Assert.Equal("😀", inner.Nucleus);
       Assert.Equal(System.Drawing.Color.Green, inner.Color);
-
-      RestorePlaceholderDefaultSettings();
     }
     [Fact]
     public void AllCustomizablePlaceholderPropertiesAreResetOnCaretVisible() {
-      LaTeXSettings.PlaceholderActiveNucleus = "😀";
-      LaTeXSettings.PlaceholderRestingNucleus = "😐";
-      LaTeXSettings.PlaceholderActiveColor = System.Drawing.Color.Green;
-      LaTeXSettings.PlaceholderRestingColor = System.Drawing.Color.Blue;
       var keyboard = new MathKeyboard<TestFont, char>(TestTypesettingContexts.Instance, new TestFont()) {
         CaretState = MathKeyboardCaretState.Shown
       };
@@ -241,43 +266,11 @@ public void AllCustomizablePlaceholderPropertiesAreResetOnCaretVisible() {
       Assert.Equal(LaTeXSettings.PlaceholderRestingColor, outer.Color);
       Assert.Equal(LaTeXSettings.PlaceholderRestingNucleus, inner.Nucleus);
       Assert.Equal(LaTeXSettings.PlaceholderRestingColor, inner.Color);
-      RestorePlaceholderDefaultSettings();
-    }
-    [Fact]
-    public void LaTeXSettings_Placeholder_IsNewInstance() {
-      Assert.False(LaTeXSettings.Placeholder == LaTeXSettings.Placeholder);
-      // Double check, also verify that its contents are 'fresh':
-      LaTeXSettings.Placeholder.Nucleus = "x";
-      Assert.Equal(RestingNucleusDefault, LaTeXSettings.Placeholder.Nucleus);
-      LaTeXSettings.Placeholder.Color = System.Drawing.Color.Green;
-      Assert.Equal(RestingColorDefault, LaTeXSettings.Placeholder.Color);
-    }
-    [Fact]
-    public void DefaultPlaceholderAppearance() {
-      Assert.Null(LaTeXSettings.PlaceholderActiveColor);
-      Assert.Null(LaTeXSettings.PlaceholderRestingColor);
-      Assert.Equal(ActiveNucleusDefault, LaTeXSettings.PlaceholderActiveNucleus);
-      Assert.Equal(RestingNucleusDefault, LaTeXSettings.PlaceholderRestingNucleus);
-      Assert.Equal(LaTeXSettings.PlaceholderRestingNucleus, LaTeXSettings.Placeholder.Nucleus);
-      Assert.Equal(LaTeXSettings.PlaceholderRestingColor, LaTeXSettings.Placeholder.Color);
     }
     [Fact]
     public void CustomizedPlaceholderGetter() {
-      LaTeXSettings.PlaceholderActiveNucleus = "😀";
-      LaTeXSettings.PlaceholderRestingNucleus = "😐";
-      LaTeXSettings.PlaceholderActiveColor = System.Drawing.Color.Green;
-      LaTeXSettings.PlaceholderRestingColor = System.Drawing.Color.Blue;
       Assert.Equal("😐", LaTeXSettings.Placeholder.Nucleus);
       Assert.Equal(System.Drawing.Color.Blue, LaTeXSettings.Placeholder.Color);
-      RestorePlaceholderDefaultSettings();
-    }
-    private void RestorePlaceholderDefaultSettings() {
-      LaTeXSettings.PlaceholderActiveNucleus = ActiveNucleusDefault;
-      LaTeXSettings.PlaceholderRestingNucleus = RestingNucleusDefault;
-      LaTeXSettings.PlaceholderActiveColor = ActiveColorDefault;
-      LaTeXSettings.PlaceholderRestingColor = RestingColorDefault;
     }
   }
-  [CollectionDefinition(nameof(NonParallelPlaceholderTests), DisableParallelization = true)]
-  public class NonParallelPlaceholderTests { }
 }

CSharpMath/Display/AttributedGlyphRun.cs

@@ -10,7 +10,7 @@ namespace CSharpMath.Display {
   public class AttributedGlyphRun<TFont, TGlyph> where TFont : FrontEnd.IFont<TGlyph> {
     public AttributedGlyphRun(string text, IEnumerable<TGlyph> glyphs, TFont font, bool isPlaceHolder = false, Color? color = null) {
       Text = new StringBuilder(text);
-      GlyphInfos = glyphs.Select(g => new GlyphInfo<TGlyph>(g) { Foreground = color}).ToList();
+      GlyphInfos = glyphs.Select(g => new GlyphInfo<TGlyph>(g) { Foreground = color }).ToList();
       Font = font;
       Placeholder = isPlaceHolder;
     }