Catch language load error earlier

Crimson1st · Jul 25, 2021 · 3f25ccd · 3f25ccd
1 parent f045078
commit 3f25ccd
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/OneMore/Colorizer/Provider.cs b/OneMore/Colorizer/Provider.cs
@@ -4,6 +4,7 @@
 
 namespace River.OneMoreAddIn.Colorizer
 {
+	using System;
 	using System.Collections.Generic;
 	using System.IO;
 	using System.Web.Script.Serialization;
@@ -21,7 +22,16 @@ public static ILanguage LoadLanguage(string path)
 		{
 			var json = File.ReadAllText(path);
 			var serializer = new JavaScriptSerializer();
-			var language = serializer.Deserialize<Language>(json);
+			Language language = null;
+
+			try
+			{
+				language = serializer.Deserialize<Language>(json);
+			}
+			catch (Exception exc)
+			{
+				Logger.Current.WriteLine($"error loading language {path}", exc);
+			}
 
 			return language;
 		}
@@ -44,7 +54,10 @@ public static IDictionary<string, string> LoadLanguageNames(string dirPath)
 			foreach (var file in Directory.GetFiles(dirPath, "*.json"))
 			{
 				var language = LoadLanguage(file);
-				names.Add(language.Name, Path.GetFileNameWithoutExtension(file));
+				if (language != null)
+				{
+					names.Add(language.Name, Path.GetFileNameWithoutExtension(file));
+				}
 			}
 
 			return names;