diff options
| author | Michael Jin <v-michaeljin@microsoft.com> | 2021-04-30 22:29:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 22:29:30 +0300 |
| commit | 90a605568aa8005236b5034ef5bcbdd0245ee340 (patch) | |
| tree | 6f988edb57dfd74656ce9b7420b448abe7630724 | |
| parent | 511dafa67f2ba31119c313aa28ce6c01d40d13af (diff) | |
[mdoc] C++/WinRT: syntax block shouldn't show "abstract" (#554)
5 files changed, 4 insertions, 6 deletions
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs index 35795bc2..9b0ef96e 100644 --- a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs +++ b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs @@ -217,8 +217,6 @@ namespace Mono.Documentation.Updater.Formatters.CppFormatters ? GetNameWithOptions(type, false, false) : cppType); - if (type.IsAbstract && !type.IsInterface) - buf.Append(" abstract"); if (type.IsSealed && !DocUtils.IsDelegate(type) && !type.IsValueType) buf.Append(" final"); diff --git a/mdoc/Test/en.expected-attached-entities/AttachedEventsAndProperties/AttachedPropertyExample.xml b/mdoc/Test/en.expected-attached-entities/AttachedEventsAndProperties/AttachedPropertyExample.xml index 3ea1fcf1..5bcdd0d4 100644 --- a/mdoc/Test/en.expected-attached-entities/AttachedEventsAndProperties/AttachedPropertyExample.xml +++ b/mdoc/Test/en.expected-attached-entities/AttachedEventsAndProperties/AttachedPropertyExample.xml @@ -6,7 +6,7 @@ <TypeSignature Language="F#" Value="type AttachedPropertyExample = class" /> <TypeSignature Language="C++ CLI" Value="public ref class AttachedPropertyExample abstract sealed" /> <TypeSignature Language="C++ CX" Value="public ref class AttachedPropertyExample abstract sealed" /> - <TypeSignature Language="C++ WINRT" Value="class AttachedPropertyExample abstract final" /> + <TypeSignature Language="C++ WINRT" Value="class AttachedPropertyExample final" /> <AssemblyInfo> <AssemblyName>AttachedEventsAndProperties</AssemblyName> <AssemblyVersion>1.0.0.0</AssemblyVersion> diff --git a/mdoc/Test/en.expected-cppwinrt/MyFramework.MyNamespace/MyClassExtensions.xml b/mdoc/Test/en.expected-cppwinrt/MyFramework.MyNamespace/MyClassExtensions.xml index 00948749..623e21b1 100644 --- a/mdoc/Test/en.expected-cppwinrt/MyFramework.MyNamespace/MyClassExtensions.xml +++ b/mdoc/Test/en.expected-cppwinrt/MyFramework.MyNamespace/MyClassExtensions.xml @@ -1,7 +1,7 @@ <Type Name="MyClassExtensions" FullName="MyFramework.MyNamespace.MyClassExtensions"> <TypeSignature Language="C#" Value="public static class MyClassExtensions" /> <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit MyClassExtensions extends System.Object" /> - <TypeSignature Language="C++ WINRT" Value="class MyClassExtensions abstract final" /> + <TypeSignature Language="C++ WINRT" Value="class MyClassExtensions final" /> <AssemblyInfo> <AssemblyName>DocTest-DropNS-classic</AssemblyName> <AssemblyVersion>0.0.0.0</AssemblyVersion> diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/Extensions.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/Extensions.xml index e8452484..da00e18f 100644 --- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/Extensions.xml +++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/Extensions.xml @@ -1,7 +1,7 @@ <Type Name="Extensions" FullName="Mono.DocTest.Generic.Extensions"> <TypeSignature Language="C#" Value="public static class Extensions" /> <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit Extensions extends System.Object" /> - <TypeSignature Language="C++ WINRT" Value="class Extensions abstract final" /> + <TypeSignature Language="C++ WINRT" Value="class Extensions final" /> <AssemblyInfo> <AssemblyName>DocTest</AssemblyName> <AssemblyVersion>0.0.0.0</AssemblyVersion> diff --git a/mdoc/Test/en.expected/Mono.DocTest.Generic/Extensions.xml b/mdoc/Test/en.expected/Mono.DocTest.Generic/Extensions.xml index 98746f90..2663c3a5 100644 --- a/mdoc/Test/en.expected/Mono.DocTest.Generic/Extensions.xml +++ b/mdoc/Test/en.expected/Mono.DocTest.Generic/Extensions.xml @@ -6,7 +6,7 @@ <TypeSignature Language="F#" Value="type Extensions = class" /> <TypeSignature Language="C++ CLI" Value="public ref class Extensions abstract sealed" /> <TypeSignature Language="C++ CX" Value="public ref class Extensions abstract sealed" /> - <TypeSignature Language="C++ WINRT" Value="class Extensions abstract final" /> + <TypeSignature Language="C++ WINRT" Value="class Extensions final" /> <AssemblyInfo> <AssemblyName>DocTest</AssemblyName> <AssemblyVersion>0.0.0.0</AssemblyVersion> |