catch theme loading exceptions

Crimson1st · Jul 25, 2021 · 0741289 · 0741289
1 parent 3f25ccd
commit 0741289
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 10 deletions.
diff --git a/OneMore/Colorizer/Colorizer.cs b/OneMore/Colorizer/Colorizer.cs
@@ -72,13 +72,27 @@ public XElement Colorize(string source, XNamespace ns)
 					{
 						// plain text prior to capture
 						code = code.Replace("\t", " ");
-						var style = theme.GetStyle("plaintext");
-						builder.Append(style == null ? code : style.Apply(code));
+						if (theme != null)
+						{
+							var style = theme.GetStyle("plaintext");
+							builder.Append(style == null ? code : style.Apply(code));
+						}
+						else
+						{
+							builder.Append(code);
+						}
 					}
 					else
 					{
-						var style = theme.GetStyle(scope);
-						builder.Append(style == null ? code : style.Apply(code));
+						if (theme != null)
+						{
+							var style = theme.GetStyle(scope);
+							builder.Append(style == null ? code : style.Apply(code));
+						}
+						else
+						{
+							builder.Append(code);
+						}
 					}
 				}
 			});
@@ -113,13 +127,28 @@ public string ColorizeOne(string source)
 						// plain text prior to capture
 						// simple conversion of tabs to spaces (shouldn't be tabs in OneNote)
 						code = code.Replace("\t", " ");
-						var style = theme.GetStyle("plaintext");
-						builder.Append(style == null ? code : style.Apply(code));
+
+						if (theme != null)
+						{
+							var style = theme.GetStyle("plaintext");
+							builder.Append(style == null ? code : style.Apply(code));
+						}
+						else
+						{
+							builder.Append(code);
+						}
 					}
 					else
 					{
-						var style = theme.GetStyle(scope);
-						builder.Append(style == null ? code : style.Apply(code));
+						if (theme != null)
+						{
+							var style = theme.GetStyle(scope);
+							builder.Append(style == null ? code : style.Apply(code));
+						}
+						else
+						{
+							builder.Append(code);
+						}
 					}
 				}
 			});

diff --git a/OneMore/Colorizer/Provider.cs b/OneMore/Colorizer/Provider.cs
@@ -73,9 +73,17 @@ public static ITheme LoadTheme(string path)
 		{
 			var json = File.ReadAllText(path);
 			var serializer = new JavaScriptSerializer();
-			var theme = serializer.Deserialize<Theme>(json);
+			Theme theme = null;
 
-			theme.TranslateColorNames();
+			try
+			{
+				theme = serializer.Deserialize<Theme>(json);
+				theme.TranslateColorNames();
+			}
+			catch (Exception exc)
+			{
+				Logger.Current.WriteLine($"error loading theme {path}", exc);
+			}
 
 			return theme;
 		}