Fixes LT-22241: User disapproved analyses in Parsing Dev Mode (#433)

jtmaxwell3 · web-flow · commit 143f9d0998cf · 2025-08-07T13:27:34.000-07:00
diff --git a/Build/mkall.targets b/Build/mkall.targets
@@ -234,7 +234,7 @@
 		<ChorusNugetVersion>5.2.0-beta0003</ChorusNugetVersion>
 		<PalasoNugetVersion>15.0.0-beta0117</PalasoNugetVersion>
 		<ParatextNugetVersion>9.4.0.1-beta</ParatextNugetVersion>
-		<LcmNugetVersion>11.0.0-beta0129</LcmNugetVersion>
+		<LcmNugetVersion>11.0.0-beta0130</LcmNugetVersion>
 		<IcuNugetVersion>70.1.123</IcuNugetVersion>
 		<HermitCrabNugetVersion>3.6.6</HermitCrabNugetVersion>
 		<IPCFrameworkVersion>1.1.1-beta0001</IPCFrameworkVersion>
diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config
@@ -50,15 +50,15 @@
   <package id="SIL.Core" version="8.1.0-beta0035"  targetFramework="net461" />
   <package id="SIL.DesktopAnalytics" version="4.0.0" targetFramework="net461" />
   <package id="SIL.FLExBridge.IPCFramework" version="1.1.1-beta0001"  targetFramework="net461" />
-  <package id="SIL.LCModel.Build.Tasks" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.Core.Tests" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.Core" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.FixData" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.Tests" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.Tools" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.Utils.Tests" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel.Utils" version="11.0.0-beta0129"  targetFramework="net461" />
-  <package id="SIL.LCModel" version="11.0.0-beta0129"  targetFramework="net461" />
+  <package id="SIL.LCModel.Build.Tasks" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.Core.Tests" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.Core" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.FixData" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.Tests" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.Tools" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.Utils.Tests" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel.Utils" version="11.0.0-beta0130"  targetFramework="net461" />
+  <package id="SIL.LCModel" version="11.0.0-beta0130"  targetFramework="net461" />
   <package id="SIL.Lexicon" version="15.0.0-beta0117"  targetFramework="net462" />
   <package id="SIL.libpalaso.l10ns" version="6.0.0" targetFramework="net461" />
   <package id="SIL.Lift" version="15.0.0-beta0117"  targetFramework="net462" />
diff --git a/Src/LexText/Interlinear/ChooseAnalysisHandler.cs b/Src/LexText/Interlinear/ChooseAnalysisHandler.cs
@@ -288,8 +288,8 @@ public void SetupCombo()
 			{
 				Opinions o = wa.GetAgentOpinion(
 					m_cache.LangProject.DefaultUserAgent);
-				// skip any analysis the user has disapproved.
-				if (o != Opinions.disapproves)
+				// skip any analysis the user has disapproved unless we are in parsing dev mode.
+				if (IsParsingDevMode() || o != Opinions.disapproves)
 				{
 					AddAnalysisItems(wa);
 					AddSeparatorLine();
diff --git a/Src/LexText/Interlinear/FocusBoxController.cs b/Src/LexText/Interlinear/FocusBoxController.cs
@@ -130,7 +130,7 @@ private void ChangeOrCreateSandbox(AnalysisOccurrence selected)
 			//if this sandbox is presenting a wordform with multiple possible analyses then set the
 			//bg color indicator
 			if (selected.Analysis.Wordform != null &&
-				SandboxBase.GetHasMultipleRelevantAnalyses(selected.Analysis.Wordform))
+				SandboxBase.GetHasMultipleRelevantAnalyses(selected.Analysis.Wordform, IsParsingDevMode()))
 			{
 				color = InterlinVc.MultipleApprovedGuessColor;
 			}
@@ -154,6 +154,13 @@ private void ChangeOrCreateSandbox(AnalysisOccurrence selected)
 			SetSandboxSize();
 		}
 
+		internal bool IsParsingDevMode()
+		{
+			if (InterlinDoc?.GetMaster() == null)
+				return false;
+			return InterlinDoc.GetMaster().IsParsingDevMode();
+		}
+
 		internal virtual IAnalysisControlInternal CreateNewSandbox(AnalysisOccurrence selected)
 		{
 			Sandbox sandbox = new Sandbox(selected.Analysis.Cache, m_mediator, m_propertyTable, m_stylesheet,
diff --git a/Src/LexText/Interlinear/InterlinVc.cs b/Src/LexText/Interlinear/InterlinVc.cs
@@ -1832,7 +1832,7 @@ private void DisplayWord(int choiceIndex, IAnalysis wag)
 						if (word != null)
 						{
 							//test if there are multiple analyses that a user might choose from
-							if (SandboxBase.GetHasMultipleRelevantAnalyses(word))
+							if (SandboxBase.GetHasMultipleRelevantAnalyses(word, m_this.IsParsingDevMode()))
 							{
 								m_this.SetGuessing(m_vwenv, MultipleApprovedGuessColor); //There are multiple options, set the color
 							}
diff --git a/Src/LexText/Interlinear/SandboxBase.ComboHandlers.cs b/Src/LexText/Interlinear/SandboxBase.ComboHandlers.cs
@@ -117,13 +117,9 @@ internal InterlinComboHandler(SandboxBase sandbox)
 
 			internal bool IsParsingDevMode()
 			{
-				if (m_sandbox.InterlinDoc?.GetMaster() == null)
-					return false;
-				return m_sandbox.InterlinDoc.GetMaster().IsParsingDevMode();
+				return m_sandbox.IsParsingDevMode();
 			}
 
-
-
 			// only for testing
 			internal void SetSandboxForTesting(SandboxBase sandbox)
 			{
@@ -1032,8 +1028,8 @@ private void AddAnalysesOf(IWfiWordform wordform, bool fBaseWordIsPhrase)
 				{
 					Opinions o = wa.GetAgentOpinion(
 						m_caches.MainCache.LangProject.DefaultUserAgent);
-					if (o == Opinions.disapproves)
-						continue;	// skip any analysis the user has disapproved.
+					if (o == Opinions.disapproves && !IsParsingDevMode())
+						continue;	// skip any analysis the user has disapproved unless we are in parsing dev mode.
 					int cmorphs = wa.MorphBundlesOS.Count;
 					if (cmorphs == 0)
 						continue;
diff --git a/Src/LexText/Interlinear/SandboxBase.cs b/Src/LexText/Interlinear/SandboxBase.cs
@@ -1211,7 +1211,7 @@ private bool LoadRealDataIntoSec1(int hvoSbWord, bool fLookForDefaults, bool fAd
 						if ((m_occurrenceSelected == null ||
 							m_occurrenceSelected.Analysis == null ||
 							m_occurrenceSelected.Analysis.Wordform != null) &&
-							GetHasMultipleRelevantAnalyses(CurrentAnalysisTree.Wordform))
+							GetHasMultipleRelevantAnalyses(CurrentAnalysisTree.Wordform, IsParsingDevMode()))
 						{
 							MultipleAnalysisColor = InterlinVc.MultipleApprovedGuessColor;
 						}
@@ -1633,10 +1633,12 @@ public static bool IsLexicalPattern(IMultiUnicode multiString)
 			return false;
 		}
 
-		public static bool GetHasMultipleRelevantAnalyses(IWfiWordform analysis)
+		public static bool GetHasMultipleRelevantAnalyses(IWfiWordform wordform, bool isParsingDevMode)
 		{
-			int humanCount = analysis.HumanApprovedAnalyses.Count();
-			int machineCount = analysis.HumanNoOpinionParses.Count();
+			if (isParsingDevMode)
+				return wordform.AnalysesOC.Count > 1;
+			int humanCount = wordform.HumanApprovedAnalyses.Count();
+			int machineCount = wordform.HumanNoOpinionParses.Count();
 			return humanCount + machineCount > 1;
 		}
 
@@ -1649,6 +1651,13 @@ private static bool IsAnalysisHumanApproved(LcmCache cache, IWfiAnalysis analysi
 							  select ae).FirstOrDefault() != null;
 		}
 
+		internal bool IsParsingDevMode()
+		{
+			if (InterlinDoc?.GetMaster() == null)
+				return false;
+			return InterlinDoc.GetMaster().IsParsingDevMode();
+		}
+
 		/// <summary>
 		/// Select the indicated icon of the word.
 		/// </summary>

Original file line number	Diff line number	Diff line change
`@@ -288,8 +288,8 @@ public void SetupCombo()`
`288`	`288`	`{`
`289`	`289`	`Opinions o = wa.GetAgentOpinion(`
`290`	`290`	`m_cache.LangProject.DefaultUserAgent);`
`291`		`- // skip any analysis the user has disapproved.`
`292`		`- if (o != Opinions.disapproves)`
	`291`	`+ // skip any analysis the user has disapproved unless we are in parsing dev mode.`
	`292`	`+ if (IsParsingDevMode() \|\| o != Opinions.disapproves)`
`293`	`293`	`{`
`294`	`294`	`AddAnalysisItems(wa);`
`295`	`295`	`AddSeparatorLine();`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private void ChangeOrCreateSandbox(AnalysisOccurrence selected)`
`130`	`130`	`//if this sandbox is presenting a wordform with multiple possible analyses then set the`
`131`	`131`	`//bg color indicator`
`132`	`132`	`if (selected.Analysis.Wordform != null &&`
`133`		`- SandboxBase.GetHasMultipleRelevantAnalyses(selected.Analysis.Wordform))`
	`133`	`+ SandboxBase.GetHasMultipleRelevantAnalyses(selected.Analysis.Wordform, IsParsingDevMode()))`
`134`	`134`	`{`
`135`	`135`	`color = InterlinVc.MultipleApprovedGuessColor;`
`136`	`136`	`}`
`@@ -154,6 +154,13 @@ private void ChangeOrCreateSandbox(AnalysisOccurrence selected)`
`154`	`154`	`SetSandboxSize();`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ internal bool IsParsingDevMode()`
	`158`	`+ {`
	`159`	`+ if (InterlinDoc?.GetMaster() == null)`
	`160`	`+ return false;`
	`161`	`+ return InterlinDoc.GetMaster().IsParsingDevMode();`
	`162`	`+ }`
	`163`	`+`
`157`	`164`	`internal virtual IAnalysisControlInternal CreateNewSandbox(AnalysisOccurrence selected)`
`158`	`165`	`{`
`159`	`166`	`Sandbox sandbox = new Sandbox(selected.Analysis.Cache, m_mediator, m_propertyTable, m_stylesheet,`
Original file line number	Diff line number	Diff line change
`@@ -1832,7 +1832,7 @@ private void DisplayWord(int choiceIndex, IAnalysis wag)`
`1832`	`1832`	`if (word != null)`
`1833`	`1833`	`{`
`1834`	`1834`	`//test if there are multiple analyses that a user might choose from`
`1835`		`- if (SandboxBase.GetHasMultipleRelevantAnalyses(word))`
	`1835`	`+ if (SandboxBase.GetHasMultipleRelevantAnalyses(word, m_this.IsParsingDevMode()))`
`1836`	`1836`	`{`
`1837`	`1837`	`m_this.SetGuessing(m_vwenv, MultipleApprovedGuessColor); //There are multiple options, set the color`
`1838`	`1838`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,13 +117,9 @@ internal InterlinComboHandler(SandboxBase sandbox)`
`117`	`117`
`118`	`118`	`internal bool IsParsingDevMode()`
`119`	`119`	`{`
`120`		`- if (m_sandbox.InterlinDoc?.GetMaster() == null)`
`121`		`- return false;`
`122`		`- return m_sandbox.InterlinDoc.GetMaster().IsParsingDevMode();`
	`120`	`+ return m_sandbox.IsParsingDevMode();`
`123`	`121`	`}`
`124`	`122`
`125`		`-`
`126`		`-`
`127`	`123`	`// only for testing`
`128`	`124`	`internal void SetSandboxForTesting(SandboxBase sandbox)`
`129`	`125`	`{`
`@@ -1032,8 +1028,8 @@ private void AddAnalysesOf(IWfiWordform wordform, bool fBaseWordIsPhrase)`
`1032`	`1028`	`{`
`1033`	`1029`	`Opinions o = wa.GetAgentOpinion(`
`1034`	`1030`	`m_caches.MainCache.LangProject.DefaultUserAgent);`
`1035`		`- if (o == Opinions.disapproves)`
`1036`		`- continue; // skip any analysis the user has disapproved.`
	`1031`	`+ if (o == Opinions.disapproves && !IsParsingDevMode())`
	`1032`	`+ continue; // skip any analysis the user has disapproved unless we are in parsing dev mode.`
`1037`	`1033`	`int cmorphs = wa.MorphBundlesOS.Count;`
`1038`	`1034`	`if (cmorphs == 0)`
`1039`	`1035`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -1211,7 +1211,7 @@ private bool LoadRealDataIntoSec1(int hvoSbWord, bool fLookForDefaults, bool fAd`
`1211`	`1211`	`if ((m_occurrenceSelected == null \|\|`
`1212`	`1212`	`m_occurrenceSelected.Analysis == null \|\|`
`1213`	`1213`	`m_occurrenceSelected.Analysis.Wordform != null) &&`
`1214`		`- GetHasMultipleRelevantAnalyses(CurrentAnalysisTree.Wordform))`
	`1214`	`+ GetHasMultipleRelevantAnalyses(CurrentAnalysisTree.Wordform, IsParsingDevMode()))`
`1215`	`1215`	`{`
`1216`	`1216`	`MultipleAnalysisColor = InterlinVc.MultipleApprovedGuessColor;`
`1217`	`1217`	`}`
`@@ -1633,10 +1633,12 @@ public static bool IsLexicalPattern(IMultiUnicode multiString)`
`1633`	`1633`	`return false;`
`1634`	`1634`	`}`
`1635`	`1635`
`1636`		`- public static bool GetHasMultipleRelevantAnalyses(IWfiWordform analysis)`
	`1636`	`+ public static bool GetHasMultipleRelevantAnalyses(IWfiWordform wordform, bool isParsingDevMode)`
`1637`	`1637`	`{`
`1638`		`- int humanCount = analysis.HumanApprovedAnalyses.Count();`
`1639`		`- int machineCount = analysis.HumanNoOpinionParses.Count();`
	`1638`	`+ if (isParsingDevMode)`
	`1639`	`+ return wordform.AnalysesOC.Count > 1;`
	`1640`	`+ int humanCount = wordform.HumanApprovedAnalyses.Count();`
	`1641`	`+ int machineCount = wordform.HumanNoOpinionParses.Count();`
`1640`	`1642`	`return humanCount + machineCount > 1;`
`1641`	`1643`	`}`
`1642`	`1644`
`@@ -1649,6 +1651,13 @@ private static bool IsAnalysisHumanApproved(LcmCache cache, IWfiAnalysis analysi`
`1649`	`1651`	`select ae).FirstOrDefault() != null;`
`1650`	`1652`	`}`
`1651`	`1653`
	`1654`	`+ internal bool IsParsingDevMode()`
	`1655`	`+ {`
	`1656`	`+ if (InterlinDoc?.GetMaster() == null)`
	`1657`	`+ return false;`
	`1658`	`+ return InterlinDoc.GetMaster().IsParsingDevMode();`
	`1659`	`+ }`
	`1660`	`+`
`1652`	`1661`	`/// <summary>`
`1653`	`1662`	`/// Select the indicated icon of the word.`
`1654`	`1663`	`/// </summary>`