Merge pull request #16 from danipen/fix-change-non-concurrent-collect…

…ions Fix change non concurrent collections
danipen · May 12, 2022 · b0876c1 · b0876c1
2 parents 7b2415e + eda2d2d
commit b0876c1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/src/TextMateSharp/Grammar/IGrammar.cs b/src/TextMateSharp/Grammar/IGrammar.cs
@@ -4,6 +4,7 @@ namespace TextMateSharp.Grammars
 {
     public interface IGrammar
     {
+        bool IsCompiling { get; }
         string GetName();
         string GetScopeName();
         ICollection<string> GetFileTypes();

diff --git a/src/TextMateSharp/Internal/Grammars/Grammar.cs b/src/TextMateSharp/Internal/Grammars/Grammar.cs
@@ -4,7 +4,6 @@
 using TextMateSharp.Grammars;
 using TextMateSharp.Internal.Grammars.Parser;
 using TextMateSharp.Internal.Matcher;
-using TextMateSharp.Internal.Oniguruma;
 using TextMateSharp.Internal.Rules;
 using TextMateSharp.Internal.Types;
 using TextMateSharp.Themes;
@@ -15,6 +14,7 @@ public class Grammar : IGrammar, IRuleFactoryHelper
     {
         private int? _rootId;
         private int _lastRuleId;
+        private volatile bool _isCompiling;
         private Dictionary<int?, Rule> _ruleId2desc;
         private Dictionary<string, IRawGrammar> _includedGrammars;
         private IGrammarRepository _grammarRepository;
@@ -45,6 +45,8 @@ public ScopeMetadata GetMetadataForScope(string scope)
             return this._scopeMetadataProvider.GetMetadataForScope(scope);
         }
 
+        public bool IsCompiling => _isCompiling;
+
         public List<Injection> GetInjections()
         {
             if (this._injections == null)
@@ -196,8 +198,7 @@ private object Tokenize(string lineText, StackElement prevState, bool emitBinary
         {
             if (this._rootId == null)
             {
-                this._rootId = RuleFactory.GetCompiledRuleId(this._grammar.GetRepository().GetSelf(), this,
-                        this._grammar.GetRepository());
+                GenerateRootId();
             }
 
             bool isFirstLine;
@@ -210,7 +211,9 @@ private object Tokenize(string lineText, StackElement prevState, bool emitBinary
                         rawDefaultMetadata.TokenType, defaultTheme.fontStyle, defaultTheme.foreground,
                         defaultTheme.background);
 
-                string rootScopeName = this.GetRule(this._rootId.Value).GetName(null, null);
+                string rootScopeName = this.GetRule(this._rootId.Value)?.GetName(null, null);
+                if (rootScopeName == null)
+                    return null;
                 ScopeMetadata rawRootMetadata = this._scopeMetadataProvider.GetMetadataForScope(rootScopeName);
                 int rootMetadata = ScopeListElement.mergeMetadata(defaultMetadata, null, rawRootMetadata);
 
@@ -241,6 +244,20 @@ private object Tokenize(string lineText, StackElement prevState, bool emitBinary
             return new TokenizeLineResult(lineTokens.GetResult(nextState, lineLength), nextState);
         }
 
+        private void GenerateRootId()
+        {
+            _isCompiling = true;
+            try
+            {
+                this._rootId = RuleFactory.GetCompiledRuleId(this._grammar.GetRepository().GetSelf(), this,
+                        this._grammar.GetRepository());
+            }
+            finally
+            {
+                _isCompiling = false;
+            }
+        }
+
         public string GetName()
         {
             return _grammar.GetName();

diff --git a/src/TextMateSharp/Model/TMModel.cs b/src/TextMateSharp/Model/TMModel.cs
@@ -69,6 +69,13 @@ void ThreadWorker(object state)
                 {
                     int toProcess = -1;
 
+                    if (model._grammar.IsCompiling)
+                    {
+                        this.model._resetEvent.Reset();
+                        this.model._resetEvent.WaitOne();
+                        continue;
+                    }
+
                     lock (this.model._lock)
                     {
                         if (model._invalidLines.Count > 0)
@@ -174,6 +181,12 @@ public int UpdateTokensInRange(ModelTokensChangedEventBuilder eventBuilder, int
                 int lineIndex = startIndex;
                 while (lineIndex <= endLineIndex && lineIndex < model._lines.GetNumberOfLines())
                 {
+                    if (model._grammar.IsCompiling)
+                    {
+                        lineIndex++;
+                        continue;
+                    }
+
                     int endStateIndex = lineIndex + 1;
                     LineTokens r = null;
                     string text = null;

diff --git a/src/TextMateSharp/Themes/Theme.cs b/src/TextMateSharp/Themes/Theme.cs
@@ -318,11 +318,14 @@ static ParsedTheme ResolveParsedThemeRules(
 
         internal List<ThemeTrieElementRule> Match(string scopeName)
         {
-            if (!this.cache.ContainsKey(scopeName))
+            lock (this.cache)
             {
-                this.cache[scopeName] = this.root.Match(scopeName);
+                if (!this.cache.ContainsKey(scopeName))
+                {
+                    this.cache[scopeName] = this.root.Match(scopeName);
+                }
+                return this.cache[scopeName];
             }
-            return this.cache[scopeName];
         }
 
         internal ThemeTrieElementRule GetDefaults()