diff --git a/src/Generator/Generators/HtmlOmdGenerator.cs b/src/Generator/Generators/HtmlOmdGenerator.cs
index 5cd6223..6551b7b 100644
--- a/src/Generator/Generators/HtmlOmdGenerator.cs
+++ b/src/Generator/Generators/HtmlOmdGenerator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -209,7 +209,7 @@ public void WriteType(INamedTypeSymbol type, INamedTypeSymbol oldType)
if (type.GetInterfaces(oldType).Any())
{
isEmpty = false;
- sw.Write("
Implements ");
+ sw.Write("
Implements ");
int i = 0;
foreach(var iface in type.GetInterfaces(oldType))
{
@@ -220,6 +220,7 @@ public void WriteType(INamedTypeSymbol type, INamedTypeSymbol oldType)
if (iface.wasRemoved) sw.Write("");
i++;
}
+ sw.Write(""); // MA - End "); //End header box
@@ -261,7 +262,7 @@ private string GetIcon(ISymbol type, string content)
}
if (icon == "")
return content;
- return $"{content}";
+ return $"{content}";
}
public void WriteEnum(INamedTypeSymbol enm) => WriteEnum(enm, null);
@@ -295,7 +296,7 @@ private string FormatType(ITypeSymbol type)
if (p.Kind == SymbolDisplayPartKind.Punctuation || p.Kind == SymbolDisplayPartKind.Space)
t += System.Web.HttpUtility.HtmlEncode(p.ToString());
else if (p.Symbol is ITypeSymbol its)
- t += LinkifyType(its, false);
+ t += $"{LinkifyType(its, false)}";
else
{
@@ -304,7 +305,11 @@ private string FormatType(ITypeSymbol type)
return t;
}
else {
- return LinkifyType(type);
+ if (parts[0].Kind == SymbolDisplayPartKind.Keyword)
+ {
+ return $"{LinkifyType(type)}";
+ }
+ return $"{LinkifyType(type)}";
}
}
@@ -316,27 +321,29 @@ private string LinkifyType(ITypeSymbol type, bool includeGeneric = true)
}
var name = includeGeneric ? type.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) : type.Name;
if (allSymbols.Contains(type))
- return $"{System.Web.HttpUtility.HtmlEncode(name)}";
+ return $"{System.Web.HttpUtility.HtmlEncode(name)}";
else
return Briefify(type, name);
}
private static string AccessorToString(Accessibility a)
{
+ string format = "{0}";
+
switch(a)
{
case Accessibility.Public:
- return "public";
+ return string.Format(format, "public");
case Accessibility.Private:
- return "private";
+ return string.Format(format, "private");
case Accessibility.Internal:
- return "internal";
+ return string.Format(format, "internal");
case Accessibility.Protected:
- return "protected";
+ return string.Format(format, "protected");
case Accessibility.ProtectedOrInternal:
- return GeneratorSettings.ShowInternalMembers ? "protected internal" : "protected";
+ return string.Format(format, GeneratorSettings.ShowInternalMembers ? "protected internal" : "protected");
case Accessibility.ProtectedAndInternal:
- return "private protected";
+ return string.Format(format, "private protected");
default:
return string.Empty;
}
@@ -363,7 +370,7 @@ private string FormatMember(ISymbol member)
{
name += AccessorToString(p.GetMethod.DeclaredAccessibility) + " ";
}
- name += "get; ";
+ name += "get; ";
}
if (p.SetMethod != null && ((p.SetMethod.DeclaredAccessibility == Accessibility.Public || p.SetMethod.DeclaredAccessibility == Accessibility.Protected || p.SetMethod.DeclaredAccessibility == Accessibility.ProtectedOrInternal) ||
(GeneratorSettings.ShowInternalMembers && p.SetMethod.DeclaredAccessibility == Accessibility.Internal || p.SetMethod.DeclaredAccessibility == Accessibility.ProtectedAndInternal) ||
@@ -373,7 +380,7 @@ private string FormatMember(ISymbol member)
{
name += AccessorToString(p.SetMethod.DeclaredAccessibility) + " ";
}
- name += "set; ";
+ name += "set; ";
}
name += "} : " + FormatType(p.Type);
@@ -382,11 +389,13 @@ private string FormatMember(ISymbol member)
{
if (m.TypeArguments.Any())
{
- name += System.Web.HttpUtility.HtmlEncode("<" + string.Join(", ", m.TypeArguments.Select(t => t.ToDisplayString())) + ">");
+ name += System.Web.HttpUtility.HtmlEncode("<")
+ + string.Join(", ", m.TypeArguments.Select(t => $"{t.ToDisplayString()}"))
+ + System.Web.HttpUtility.HtmlEncode(">");
}
name += "(";
- name += string.Join(", ", m.Parameters.Select(pr => FormatType(pr.Type) + " " + Briefify(pr) + (pr.HasExplicitDefaultValue ? (" = " + (pr.ExplicitDefaultValue?.ToString() ?? "null")) : "")));
+ name += string.Join(", ", m.Parameters.Select(pr => FormatType(pr.Type) + " " + Briefify(pr) + (pr.HasExplicitDefaultValue ? (" = " + (pr.ExplicitDefaultValue?.ToString() ?? "null")) : "")));
name += ")";
if (!m.ReturnsVoid)
{
diff --git a/src/Generator/Generators/HtmlOmdHeader.html b/src/Generator/Generators/HtmlOmdHeader.html
index 6b4cbc2..7836cb2 100644
--- a/src/Generator/Generators/HtmlOmdHeader.html
+++ b/src/Generator/Generators/HtmlOmdHeader.html
@@ -5,26 +5,30 @@
OMD