Skip to content

Updated CppWinRt formatter for enum #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected override StringBuilder AppendParameter(StringBuilder buf, ParameterDef
protected override string GetTypeKind(TypeDefinition t)
{
if (t.IsEnum || t.FullName == "System.Enum")
return "enum";
return "enum class";
if (t.IsValueType)
return "struct";
if (t.IsClass)
Expand Down
2 changes: 1 addition & 1 deletion mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Type Name="Color" FullName="Mono.DocTest.Color">
<TypeSignature Language="C#" Value="public enum Color" />
<TypeSignature Language="ILAsm" Value=".class public auto ansi sealed Color extends System.Enum" />
<TypeSignature Language="C++ WINRT" Value="enum Color" />
<TypeSignature Language="C++ WINRT" Value="enum class Color" />
<AssemblyInfo>
<AssemblyName>DocTest</AssemblyName>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Type Name="Widget+Direction" FullName="Mono.DocTest.Widget+Direction">
<TypeSignature Language="C#" Value="protected internal enum Widget.Direction" />
<TypeSignature Language="ILAsm" Value=".class nested protected auto ansi sealed Widget/Direction extends System.Enum" />
<TypeSignature Language="C++ WINRT" Value="enum Widget::Direction" />
<TypeSignature Language="C++ WINRT" Value="enum class Widget::Direction" />
<AssemblyInfo>
<AssemblyName>DocTest</AssemblyName>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion mdoc/Test/en.expected/Mono.DocTest/Color.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<TypeSignature Language="JavaScript" Usage="var value = Mono.DocTest.Color.red" />
<TypeSignature Language="C++ CLI" Value="public enum class Color" />
<TypeSignature Language="C++ CX" Value="public enum class Color" />
<TypeSignature Language="C++ WINRT" Value="enum Color" />
<TypeSignature Language="C++ WINRT" Value="enum class Color" />
<AssemblyInfo>
<AssemblyName>DocTest</AssemblyName>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TypeSignature Language="VB.NET" Value="Protected Friend Enum Widget.Direction" />
<TypeSignature Language="C++ CLI" Value="public protected enum class Widget::Direction" />
<TypeSignature Language="C++ CX" Value="public protected enum class Widget::Direction" />
<TypeSignature Language="C++ WINRT" Value="enum Widget::Direction" />
<TypeSignature Language="C++ WINRT" Value="enum class Widget::Direction" />
<AssemblyInfo>
<AssemblyName>DocTest</AssemblyName>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Type Name="Color1" FullName="UwpTestWinRtComponentCpp.Color1">
<TypeSignature Language="C#" Value="public enum Color1" />
<TypeSignature Language="ILAsm" Value=".class public auto ansi sealed Color1 extends System.Enum" />
<TypeSignature Language="C++ WINRT" Value="enum Color1" />
<TypeSignature Language="C++ WINRT" Value="enum class Color1" />
<AssemblyInfo>
<AssemblyName>UwpTestWinRtComponentCpp</AssemblyName>
<AssemblyVersion>255.255.255.255</AssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion mdoc/mdoc.Test/CppWinRtFormatterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ protected override TypeDefinition GetType(Type type)
[Category("Type")]
public void TypeSignature_enum()
{
TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Color1", "enum Color1");
TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Color1", "enum class Color1");
}

[Test]
Expand Down