From b012a3f061b656d7bb5b2dd71be40aad04d5f756 Mon Sep 17 00:00:00 2001
From: John T Maxwell III <maxwellparc@gmail.com>
Date: Thu, 14 Nov 2024 08:25:34 -0800
Subject: [PATCH] Fixes LT-21934: FLEx freezes when clicking "Close" if parser
 is running (#205)

Co-authored-by: Jake Oliver <jeoliver97@gmail.com>
---
 Src/LexText/ParserCore/ParseFiler.cs           |  3 ---
 .../ParserCore/ParserCoreStrings.Designer.cs   | 18 +++++++++---------
 Src/LexText/ParserCore/ParserCoreStrings.resx  |  6 +++---
 Src/LexText/ParserCore/ParserWorker.cs         | 12 ++++++++++--
 Src/XCore/xWindow.cs                           |  2 ++
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Src/LexText/ParserCore/ParseFiler.cs b/Src/LexText/ParserCore/ParseFiler.cs
index 20c4d970c5..8f9faa3ea0 100644
--- a/Src/LexText/ParserCore/ParseFiler.cs
+++ b/Src/LexText/ParserCore/ParseFiler.cs
@@ -161,9 +161,6 @@ private bool UpdateWordforms(object parameter)
 					if (work.CheckParser)
 					{
 						// This was just a test.  Don't update data.
-						string testform = work.Wordform.Form.BestVernacularAlternative.Text;
-						using (new TaskReport(String.Format(ParserCoreStrings.ksTestX, testform), m_taskUpdateHandler))
-						{ }
 						FireWordformUpdated(work.Wordform, work.Priority, work.ParseResult, work.CheckParser);
 						continue;
 					}
diff --git a/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs b/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs
index 075913c202..af13bc7fe8 100644
--- a/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs
+++ b/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs
@@ -141,6 +141,15 @@ internal static string ksMaxElementsInRule {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Parsing {0}.
+        /// </summary>
+        internal static string ksParsingX {
+            get {
+                return ResourceManager.GetString("ksParsingX", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ???.
         /// </summary>
@@ -177,15 +186,6 @@ internal static string ksStarted {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Tested {0}.
-        /// </summary>
-        internal static string ksTestX {
-            get {
-                return ResourceManager.GetString("ksTestX", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Trying Wordform {0}.
         /// </summary>
diff --git a/Src/LexText/ParserCore/ParserCoreStrings.resx b/Src/LexText/ParserCore/ParserCoreStrings.resx
index 0d6fff2d0f..da997fcf6a 100644
--- a/Src/LexText/ParserCore/ParserCoreStrings.resx
+++ b/Src/LexText/ParserCore/ParserCoreStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -186,8 +186,8 @@
   <data name="ksUnknownNaturalClass" xml:space="preserve">
     <value>Unknown Natural Class!</value>
   </data>
-  <data name="ksTestX" xml:space="preserve">
-    <value>Tested {0}</value>
+  <data name="ksParsingX" xml:space="preserve">
+    <value>Parsing {0}</value>
   </data>
   <data name="ksMaxElementsInRule" xml:space="preserve">
     <value>A rule can't have more than one element in its left-hand side or its right-hand side.</value>
diff --git a/Src/LexText/ParserCore/ParserWorker.cs b/Src/LexText/ParserCore/ParserWorker.cs
index ef92afb140..5cb68ef4bd 100644
--- a/Src/LexText/ParserCore/ParserWorker.cs
+++ b/Src/LexText/ParserCore/ParserWorker.cs
@@ -141,8 +141,12 @@ public bool UpdateWordform(IWfiWordform wordform, ParserPriority priority, bool
 			CheckNeedsUpdate();
 			var normalizer = CustomIcu.GetIcuNormalizer(FwNormalizationMode.knmNFD);
 			var word = normalizer.Normalize(form.Text.Replace(' ', '.'));
+			ParseResult result = null;
 			var stopWatch = System.Diagnostics.Stopwatch.StartNew();
-			ParseResult result = m_parser.ParseWord(word);
+			using (var task = new TaskReport(String.Format(ParserCoreStrings.ksParsingX, word), m_taskUpdateHandler))
+			{
+				result = m_parser.ParseWord(word);
+			}
 			stopWatch.Stop();
 			result.ParseTime = stopWatch.ElapsedMilliseconds;
 
@@ -160,8 +164,12 @@ public bool UpdateWordform(IWfiWordform wordform, ParserPriority priority, bool
 				if (m_cache.ServiceLocator.GetInstance<IWfiWordformRepository>().TryGetObject(text, out lcWordform))
 				{
 					var lcWord = normalizer.Normalize(sLower.Replace(' ', '.'));
+					ParseResult lcResult = null;
 					stopWatch.Start();
-					var lcResult = m_parser.ParseWord(lcWord);
+					using (var task = new TaskReport(String.Format(ParserCoreStrings.ksParsingX, word), m_taskUpdateHandler))
+					{
+						lcResult = m_parser.ParseWord(lcWord);
+					}
 					stopWatch.Stop();
 					lcResult.ParseTime = stopWatch.ElapsedMilliseconds;
 					if (lcResult.Analyses.Count > 0 && lcResult.ErrorMessage == null)
diff --git a/Src/XCore/xWindow.cs b/Src/XCore/xWindow.cs
index 50e1e78791..1f2bcc8afa 100644
--- a/Src/XCore/xWindow.cs
+++ b/Src/XCore/xWindow.cs
@@ -1929,6 +1929,8 @@ public bool OnCloseWindow(object sender)
 		{
 			CheckDisposed();
 
+			if (Mediator != null)
+				Mediator.SendMessage("StopParser", null);
 			this.Close();
 
 			return true;