Stop the tokenizer thread and start it again when setting a grammar

danipen · Jan 28, 2022 · 079c049 · 079c049
1 parent a8369f3
commit 079c049
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/src/TextMateSharp/Model/TMModel.cs b/src/TextMateSharp/Model/TMModel.cs
@@ -272,25 +272,21 @@ public void SetGrammar(IGrammar grammar)
         {
             if (!Object.Equals(grammar, this.grammar))
             {
+                Stop();
+
                 this.grammar = grammar;
                 this.tokenizer = new Tokenizer(grammar);
                 lines.ForEach((line) => line.ResetTokenizationState());
                 lines.Get(0).SetState(tokenizer.GetInitialState());
+
+                Start();
                 InvalidateLine(0);
             }
         }
 
         public void AddModelTokensChangedListener(IModelTokensChangedListener listener)
         {
-            if (this.fThread == null || this.fThread.IsStopped)
-            {
-                this.fThread = new TokenizerThread("TMModelThread", this);
-            }
-
-            if (this.fThread.IsStopped)
-            {
-                this.fThread.Run();
-            }
+            Start();
 
             if (!listeners.Contains(listener))
             {
@@ -326,6 +322,19 @@ private void Stop()
             this.fThread = null;
         }
 
+        private void Start()
+        {
+            if (this.fThread == null || this.fThread.IsStopped)
+            {
+                this.fThread = new TokenizerThread("TMModelThread", this);
+            }
+
+            if (this.fThread.IsStopped)
+            {
+                this.fThread.Run();
+            }
+        }
+
         private void BuildEventWithCallback(Action<ModelTokensChangedEventBuilder> callback)
         {
             if (this.fThread == null || this.fThread.IsStopped)