LT-22430: Yellow Box Error in Try A Word

Src/LexText/LexTextControls/FeatureStructureTreeView.cs

@@ -26,6 +26,8 @@ public enum ImageKind
 		private System.Windows.Forms.ImageList imageList1;
 		private System.ComponentModel.IContainer components = null;
 
+		public bool IncludePreserveExistingValues { get; internal set; }
+
 		public FeatureStructureTreeView(System.ComponentModel.IContainer container)
 		{
 			///
@@ -109,6 +111,10 @@ public void Sort(TreeNodeCollection col)
 							(int)ImageKind.radio, (int)ImageKind.radio, 0,
 							FeatureTreeNodeInfo.NodeKind.Other);
 						InsertNode(noneOfTheAboveNode, childNode);
+						if (!HasChosenCheckBox(childNode))
+						{
+							HandleCheckBoxNodes(null, noneOfTheAboveNode);
+						}
 					}
 				}
 			}
@@ -139,10 +145,13 @@ private void AddNode(IFsFeatDefn defn, FeatureTreeNode parentNode)
 					{
 						AddNode(val, newNode);
 					}
-					FeatureTreeNode unknownNode = new FeatureTreeNode(LexTextControls.ksPreserveExistingValues,
-						(int)ImageKind.radio, (int)ImageKind.radio, 0, FeatureTreeNodeInfo.NodeKind.SymFeatValue);
-					InsertNode(unknownNode, newNode);
-					HandleCheckBoxNodes(null, unknownNode);
+					if (IncludePreserveExistingValues)
+					{
+						FeatureTreeNode unknownNode = new FeatureTreeNode(LexTextControls.ksPreserveExistingValues,
+							(int)ImageKind.radio, (int)ImageKind.radio, 0, FeatureTreeNodeInfo.NodeKind.SymFeatValue);
+						InsertNode(unknownNode, newNode);
+						HandleCheckBoxNodes(null, unknownNode);
+					}
 				}
 			}
 			var complex = defn as IFsComplexFeature;
@@ -311,6 +320,21 @@ private bool IsTerminalNode(TreeNode tn)
 //				}
 //			}
 //		}
+
+		private bool HasChosenCheckBox(FeatureTreeNode parent)
+		{
+			FeatureTreeNode sibling = (FeatureTreeNode)parent.FirstNode;
+			while (sibling != null)
+			{
+				if (sibling.Chosen)
+				{
+					return true;
+				}
+				sibling = (FeatureTreeNode)sibling.NextNode;
+			}
+			return false;
+		}
+
 		private void HandleCheckBoxNodes(TreeView tv, FeatureTreeNode tn)
 		{
 			//UndoLastSelectedNode();

Src/LexText/LexTextControls/InflectionFeaturePopupTreeManager.cs

@@ -86,7 +86,7 @@ protected override void m_treeCombo_AfterSelect(object sender, TreeViewEventArgs
 					// Whatever happens below, we don't want to actually leave the "More..." node selected!
 					// This is at least required if the user selects "Cancel" from the dialog below.
 					pt.Hide();
-					using (MsaInflectionFeatureListDlg dlg = new MsaInflectionFeatureListDlg())
+					using (MsaInflectionFeatureListDlg dlg = new MsaInflectionFeatureListDlg(true))
 					{
 						HvoTreeNode parentNode = selectedNode.Parent as HvoTreeNode;
 						int hvoPos = parentNode.Hvo;

Src/LexText/LexTextControls/LexTextControlsTests/MsaInflectionFeatureListDlgTests.cs

@@ -124,7 +124,7 @@ public void PopulateTreeFromFeatureSystem()
 
 				Assert.That(tv.Nodes.Count, Is.EqualTo(2), "Count of top level nodes in tree view");
 				TreeNodeCollection col = tv.Nodes[0].Nodes;
-				Assert.That(col.Count, Is.EqualTo(4), "Count of first level nodes in tree view");
+				Assert.That(col.Count, Is.EqualTo(3), "Count of first level nodes in tree view");
 			}
 		}
 
@@ -177,7 +177,7 @@ private void LoadFeatureValuesIntoTreeview(FeatureStructureTreeView tv, IFsFeatS
 			{
 				TreeNodeCollection col2 = node.Nodes;
 				if (node.Text == "gender")
-					Assert.That(col2.Count, Is.EqualTo(3), "Count of second level nodes in tree view");
+					Assert.That(col2.Count, Is.EqualTo(2), "Count of second level nodes in tree view");
 				if (node.Text == "person")
 					Assert.That(col2.Count, Is.EqualTo(1), "Count of second level nodes in tree view");
 			}
@@ -196,7 +196,7 @@ private FeatureStructureTreeView SetUpSampleData(out IFsFeatStruc featStruct)
 			foreach (TreeNode node in col)
 			{
 				TreeNodeCollection col2 = node.Nodes;
-				Assert.That(col2.Count, Is.EqualTo(3), "Count of second level nodes in tree view");
+				Assert.That(col2.Count, Is.EqualTo(2), "Count of second level nodes in tree view");
 				if (node.PrevNode == null)
 					node.Checked = true;
 			}

Src/LexText/LexTextControls/MsaInflectionFeatureListDlg.cs

@@ -50,14 +50,15 @@ public class MsaInflectionFeatureListDlg : Form
 		private const string m_helpTopic = "khtpChoose-lexiconEdit-InflFeats";
 		private HelpProvider helpProvider;
 
-		public MsaInflectionFeatureListDlg()
+		public MsaInflectionFeatureListDlg(bool includePreserveExistingValues = false)
 		{
 			//
 			// Required for Windows Form Designer support
 			//
 			InitializeComponent();
 			AccessibleName = GetType().Name;
 			pictureBox1.Image = m_imageListPictures.Images[0];
+			m_tvMsaFeatureList.IncludePreserveExistingValues = includePreserveExistingValues;
 		}
 
 		#region OnLoad

Src/LexText/ParserCore/HCLoader.cs

@@ -2506,16 +2506,22 @@ private FeatureStruct LoadFeatureStruct(IFsFeatStruc fs, FeatureSystem featSys)
 					var closedValue = value as IFsClosedValue;
 					if (closedValue != null)
 					{
-						var hcFeature = featSys.GetFeature<SymbolicFeature>("feat" + closedValue.FeatureRA.Hvo);
-						// TODO: should we display something to the user if a FS has an invalid value?
-						if (hcFeature.PossibleSymbols.TryGet("sym" + closedValue.ValueRA.Hvo, out var symbol))
-							hcFS.AddValue(hcFeature, symbol);
+						if (closedValue.ValueRA != null)
+						{
+							var hcFeature = featSys.GetFeature<SymbolicFeature>("feat" + closedValue.FeatureRA.Hvo);
+							// TODO: should we display something to the user if a FS has an invalid value?
+							if (hcFeature.PossibleSymbols.TryGet("sym" + closedValue.ValueRA.Hvo, out var symbol))
+								hcFS.AddValue(hcFeature, symbol);
+						}
 					}
 					else
 					{
 						var complexValue = (IFsComplexValue)value;
-						var hcFeature = featSys.GetFeature<ComplexFeature>("feat" + complexValue.FeatureRA.Hvo);
-						hcFS.AddValue(hcFeature, LoadFeatureStruct((IFsFeatStruc)complexValue.ValueOA, featSys));
+						if (complexValue.ValueOA != null)
+						{
+							var hcFeature = featSys.GetFeature<ComplexFeature>("feat" + complexValue.FeatureRA.Hvo);
+							hcFS.AddValue(hcFeature, LoadFeatureStruct((IFsFeatStruc)complexValue.ValueOA, featSys));
+						}
 					}
 				}
 			}