Expose CorrectHomographNumbers publicly on ILexEntry

Author: myieye

src/SIL.LCModel/DomainImpl/OverridesLing_Lex.cs

@@ -2044,6 +2044,20 @@ public List<ILexEntry> CollectHomographs(string sForm, int hvoExclude)
 			return result;
 		}
 
+		/// <summary>See <see cref="ILexEntry.CorrectHomographNumbers"/>.</summary>
+		public bool CorrectHomographNumbers()
+		{
+			if (HomographFormKey == Strings.ksQuestions)
+			{
+				if (HomographNumber == 0) return true;
+				HomographNumber = 0;
+				return false;
+			}
+			var homographs = Services.GetInstance<ILexEntryRepository>()
+				.CollectHomographs(HomographFormKey, PrimaryMorphType);
+			return LexDb.CorrectHomographNumbers(homographs);
+		}
+
 		partial void LexemeFormOASideEffects(IMoForm oldObjValue, IMoForm newObjValue)
 		{
 			string oldVal = oldObjValue == null ? "" : oldObjValue.Form.VernacularDefaultWritingSystem.Text;

src/SIL.LCModel/InterfaceAdditions.cs

@@ -1288,6 +1288,14 @@ string HomographFormKey
 			get;
 		}
 
+		/// <summary>
+		/// Validate and, if needed, correct homograph numbers for this entry's homograph set.
+		/// Caller should create the unit of work.
+		/// Primarily wraps <see cref="ILexEntry.CorrectHomographNumbers"/>.
+		/// </summary>
+		/// <returns>true if homographs were already valid, false if they had to be renumbered.</returns>
+		bool CorrectHomographNumbers();
+
 		/// <summary/>
 		ITsString HeadWord
 		{

tests/SIL.LCModel.Tests/DomainImpl/LingTests.cs

@@ -267,6 +267,42 @@ public void HomographValidationWorks()
 			}
 		}
 
+		/// <summary>
+		/// Exercises the entry-level wrapper
+		/// (Algorithm behaviour is covered by HomographValidationWorks.)
+		/// </summary>
+		[Test]
+		public void CorrectHomographNumbers_OnEntry_RenumbersInvalidSet()
+		{
+			const string sLexForm = "entryCorrectHnTest";
+			var e1 = MakeEntry(sLexForm);
+			var e2 = MakeEntry(sLexForm);
+			var e3 = MakeEntry(sLexForm);
+
+			e1.HomographNumber = 2;
+			e2.HomographNumber = 2;
+			e3.HomographNumber = 0;
+
+			Assert.IsFalse(e1.CorrectHomographNumbers(), "Invalid set should be renumbered.");
+			CollectionAssert.AreEquivalent(new[] { 1, 2, 3 },
+				new[] { e1.HomographNumber, e2.HomographNumber, e3.HomographNumber });
+			Assert.IsTrue(e1.CorrectHomographNumbers(), "Already-valid set: no change.");
+		}
+
+		/// <summary>
+		/// Empty-form branch added on top of LexDb.CorrectHomographNumbers.
+		/// </summary>
+		[Test]
+		public void CorrectHomographNumbers_OnEntryWithEmptyForm_ForcesZero()
+		{
+			var entry = MakeEntry("");
+			Assert.AreEqual(Strings.ksQuestions, entry.HomographFormKey);
+			entry.HomographNumber = 7;
+
+			Assert.IsFalse(entry.CorrectHomographNumbers());
+			Assert.AreEqual(0, entry.HomographNumber);
+		}
+
 		private ILexEntry MakeEntry(string sLexForm)
 		{
 			var lme = Cache.ServiceLocator.GetInstance<ILexEntryFactory>().Create();