diff options
author | RanhaoXu <v-jex@microsoft.com> | 2021-06-03 00:03:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-03 00:03:21 +0300 |
commit | 749ae75e190d6ce65ce23c6ad5be3b45bc9eb414 (patch) | |
tree | 86a8324191b347469f2282d2c35101a2dd5da7d9 | |
parent | d9e2cd450a322fe0eaff003e43ec0042b6a7a81b (diff) |
Updated CppWinRt formatter for enum (#561)
https://ceapex.visualstudio.com/Engineering/_workitems/edit/433832
Co-authored-by: anmeng10101 <33647870+anmeng10101@users.noreply.github.com>
7 files changed, 7 insertions, 7 deletions
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs index b2591b44..976d1b64 100644 --- a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs +++ b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs @@ -124,7 +124,7 @@ namespace Mono.Documentation.Updater.Formatters.CppFormatters 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) diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml index 75a454f5..1a97fd03 100644 --- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml +++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml @@ -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> diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml index f12f0158..384ed207 100644 --- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml +++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml @@ -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> diff --git a/mdoc/Test/en.expected/Mono.DocTest/Color.xml b/mdoc/Test/en.expected/Mono.DocTest/Color.xml index e18d6852..c9bb8b3d 100644 --- a/mdoc/Test/en.expected/Mono.DocTest/Color.xml +++ b/mdoc/Test/en.expected/Mono.DocTest/Color.xml @@ -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> diff --git a/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml b/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml index d484879f..673a3d09 100644 --- a/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml +++ b/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml @@ -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> diff --git a/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml b/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml index 87873a92..5b2ab6b1 100644 --- a/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml +++ b/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml @@ -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> diff --git a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs index 65e6a614..b279dcaa 100644 --- a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs +++ b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs @@ -29,7 +29,7 @@ namespace mdoc.Test [Category("Type")] public void TypeSignature_enum() { - TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Color1", "enum Color1"); + TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Color1", "enum class Color1"); } [Test] |