Allow for null values, including empty categories

citizenmatt · Oct 24, 2014 · 37c8221 · 37c8221
1 parent e00ed09
commit 37c8221
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/resharper-template-compiler/ReadmeFormatter.cs b/src/resharper-template-compiler/ReadmeFormatter.cs
@@ -25,18 +25,26 @@ public void FormatTemplates(TemplateStore templates)
             writer.WriteLine("# Templates");
             writer.WriteLine();
 
+            if (templatesByCategory.Count == 0)
+                FormatTemplates(templates.Templates);
+
             foreach (var category in templatesByCategory.Keys.OrderBy(s => s))
             {
                 // TODO: Perhaps split this down into template type - Live, Surround or File
                 writer.WriteLine("## {0}", category);
-                writer.WriteLine();
-                writer.WriteLine("Shortcut | Description");
-                writer.WriteLine("---------|------------");
-                foreach (var template in templatesByCategory[category].OrderBy(t => t.Shortcut))
-                    writer.WriteLine("[{0}]({0}.md) | {1}", template.Shortcut, template.Description);
-
-                writer.WriteLine();
+                FormatTemplates(templatesByCategory[category]);
             }
         }
+
+        private void FormatTemplates(IEnumerable<Template> templates)
+        {
+            writer.WriteLine();
+            writer.WriteLine("Shortcut | Description");
+            writer.WriteLine("---------|------------");
+            foreach (var template in templates.OrderBy(t => t.Shortcut))
+                writer.WriteLine("[{0}]({0}.md) | {1}", template.Shortcut, template.Description);
+
+            writer.WriteLine();
+        }
     }
 }
diff --git a/src/resharper-template-compiler/SettingsDeserialisation.cs b/src/resharper-template-compiler/SettingsDeserialisation.cs
@@ -44,7 +44,7 @@ private Template DeserialiseTemplate(Guid guid)
             template.Description = description;
             template.Text = GetValue<string>(templatePath, "Text");
             template.Reformat = TryGetValue(templatePath, "Reformat", true);
-            template.ShortenQualifiedReferences = TryGetValue<bool>(templatePath, "ShortenQualifiedReferences", true);
+            template.ShortenQualifiedReferences = TryGetValue(templatePath, "ShortenQualifiedReferences", true);
             template.Scopes = DeserialiseScopes(templatePath);
             template.Categories = DeserialiseCategories(templatePath);
             template.Fields = DeserialiseFields(templatePath);

diff --git a/src/resharper-template-compiler/SettingsSerialisation.cs b/src/resharper-template-compiler/SettingsSerialisation.cs
@@ -48,7 +48,7 @@ public static void SerialiseToXaml(TextWriter textWriter, SettingsSerialisation
                 xmlWriter.WriteAttributeString("xmlns", "x", null, "http://schemas.microsoft.com/winfx/2006/xaml");
                 xmlWriter.WriteAttributeString("xmlns", "s", null, "clr-namespace:System;assembly=mscorlib");
                 xmlWriter.WriteAttributeString("xmlns", "ss", null, "urn:shemas-jetbrains-com:settings-storage-xaml");
-                foreach (var entry in serialisation.dictionary.OrderBy(p => p.Key))
+                foreach (var entry in serialisation.dictionary.OrderBy(p => p.Key).Where(p => p.Value != null))
                 {
                     xmlWriter.WriteStartElement("s", entry.Value.GetType().Name,
                         "clr-namespace:System;assembly=mscorlib");