Fix race condition (fixes #5)

arthurrump · arthurrump · commit dd253edad251 · 2019-05-08T22:57:51.000+02:00
diff --git a/ColorCode.Core/CodeColorizerBase.cs b/ColorCode.Core/CodeColorizerBase.cs
@@ -15,7 +15,7 @@ public abstract class CodeColorizerBase
         public CodeColorizerBase(StyleDictionary Styles, ILanguageParser languageParser)
         {
             this.languageParser = languageParser
-                ?? new LanguageParser(new LanguageCompiler(Languages.CompiledLanguages), Languages.LanguageRepository);
+                ?? new LanguageParser(new LanguageCompiler(Languages.CompiledLanguages, Languages.CompileLock), Languages.LanguageRepository);
 
             this.Styles = Styles ?? StyleDictionary.DefaultLight;
         }
diff --git a/ColorCode.Core/Compilation/LanguageCompiler.cs b/ColorCode.Core/Compilation/LanguageCompiler.cs
@@ -15,11 +15,10 @@ public class LanguageCompiler : ILanguageCompiler
         private readonly Dictionary<string, CompiledLanguage> compiledLanguages;
         private readonly ReaderWriterLockSlim compileLock;
 
-        public LanguageCompiler(Dictionary<string, CompiledLanguage> compiledLanguages)
+        public LanguageCompiler(Dictionary<string, CompiledLanguage> compiledLanguages, ReaderWriterLockSlim compileLock)
         {
             this.compiledLanguages = compiledLanguages;
-
-            compileLock = new ReaderWriterLockSlim();
+            this.compileLock = compileLock;
         }
 
         public CompiledLanguage Compile(ILanguage language)
diff --git a/ColorCode.Core/Languages.cs b/ColorCode.Core/Languages.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation.  All rights reserved.
 
 using System.Collections.Generic;
+using System.Threading;
 using ColorCode.Common;
 using ColorCode.Compilation;
 using ColorCode.Compilation.Languages;
@@ -15,12 +16,14 @@ public static class Languages
         internal static readonly LanguageRepository LanguageRepository;
         internal static readonly Dictionary<string, ILanguage> LoadedLanguages;
         internal static Dictionary<string, CompiledLanguage> CompiledLanguages;
+        internal static ReaderWriterLockSlim CompileLock;
 
         static Languages()
         {
             LoadedLanguages = new Dictionary<string, ILanguage>();
             CompiledLanguages = new Dictionary<string, CompiledLanguage>();
             LanguageRepository = new LanguageRepository(LoadedLanguages);
+            CompileLock = new ReaderWriterLockSlim();
 
             Load<JavaScript>();
             Load<Html>();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public abstract class CodeColorizerBase`
`15`	`15`	`public CodeColorizerBase(StyleDictionary Styles, ILanguageParser languageParser)`
`16`	`16`	`{`
`17`	`17`	`this.languageParser = languageParser`
`18`		`- ?? new LanguageParser(new LanguageCompiler(Languages.CompiledLanguages), Languages.LanguageRepository);`
	`18`	`+ ?? new LanguageParser(new LanguageCompiler(Languages.CompiledLanguages, Languages.CompileLock), Languages.LanguageRepository);`
`19`	`19`
`20`	`20`	`this.Styles = Styles ?? StyleDictionary.DefaultLight;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,10 @@ public class LanguageCompiler : ILanguageCompiler`
`15`	`15`	`private readonly Dictionary<string, CompiledLanguage> compiledLanguages;`
`16`	`16`	`private readonly ReaderWriterLockSlim compileLock;`
`17`	`17`
`18`		`- public LanguageCompiler(Dictionary<string, CompiledLanguage> compiledLanguages)`
	`18`	`+ public LanguageCompiler(Dictionary<string, CompiledLanguage> compiledLanguages, ReaderWriterLockSlim compileLock)`
`19`	`19`	`{`
`20`	`20`	`this.compiledLanguages = compiledLanguages;`
`21`		`-`
`22`		`- compileLock = new ReaderWriterLockSlim();`
	`21`	`+ this.compileLock = compileLock;`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`public CompiledLanguage Compile(ILanguage language)`