Fixed the return type of auto event revoker (mono#553)

JeffInChrist · anmeng10101 · web-flow · commit 511dafa67f2b · 2021-04-30T15:26:32.000-04:00
https://dev.azure.com/ceapex/Engineering/_workitems/edit/100018 Co-authored-by: anmeng10101 <33647870+anmeng10101@users.noreply.github.com>
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
@@ -186,6 +186,7 @@ protected override string GetPropertyDeclaration(PropertyDefinition property)
         protected override string GetEventDeclaration(EventDefinition e)
         {
             string apiName = e.Name, typeName = GetTypeNameWithOptions(e.EventType, AppendHatOnReturn);
+            var rtnAutoEventRevoker = e.DeclaringType.Name + NestedTypeSeparator + apiName;
 
             StringBuilder buf = new StringBuilder();
             //if (AppendVisibility(buf, e.AddMethod).Length == 0)
@@ -194,7 +195,7 @@ protected override string GetEventDeclaration(EventDefinition e)
             buf.AppendLine().AppendLine("// Revoke with event_token");
             buf.AppendLine($"void {apiName}(event_token const* cookie) const;");
             buf.AppendLine().AppendLine("// Revoke with event_revoker");
-            buf.Append($"{apiName}_revoker {apiName}(auto_revoke_t, {typeName} const& handler) const;");
+            buf.Append($"{rtnAutoEventRevoker}_revoker {apiName}(auto_revoke_t, {typeName} const& handler) const;");
 
             return buf.ToString().Replace("\r\n", "\n");
         }
diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/GenericBase`1.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/GenericBase`1.xml
@@ -85,7 +85,7 @@
     <Member MemberName="ItemChanged">
       <MemberSignature Language="C#" Value="public event Action&lt;Mono.DocTest.Generic.MyList&lt;U&gt;,Mono.DocTest.Generic.MyList&lt;U&gt;.Helper&lt;U,U&gt;&gt; ItemChanged;" />
       <MemberSignature Language="ILAsm" Value=".event class System.Action`2&lt;class Mono.DocTest.Generic.MyList`1&lt;!U&gt;, class Mono.DocTest.Generic.MyList`1/Helper`2&lt;!U, !U, !U&gt;&gt; ItemChanged" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token ItemChanged(Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void ItemChanged(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;ItemChanged_revoker ItemChanged(auto_revoke_t, Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token ItemChanged(Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void ItemChanged(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;GenericBase`1::ItemChanged_revoker ItemChanged(auto_revoke_t, Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -101,7 +101,7 @@
     <Member MemberName="MyEvent">
       <MemberSignature Language="C#" Value="public event EventHandler&lt;Mono.DocTest.Generic.GenericBase&lt;U&gt;.FooEventArgs&gt; MyEvent;" />
       <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Mono.DocTest.Generic.GenericBase`1/FooEventArgs&lt;!U&gt;&gt; MyEvent" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token MyEvent(EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void MyEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;MyEvent_revoker MyEvent(auto_revoke_t, EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token MyEvent(EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void MyEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;GenericBase`1::MyEvent_revoker MyEvent(auto_revoke_t, EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget.xml
@@ -69,7 +69,7 @@
     <Member MemberName="AnEvent">
       <MemberSignature Language="C#" Value="public event Mono.DocTest.Widget.Del AnEvent;" />
       <MemberSignature Language="ILAsm" Value=".event class Mono.DocTest.Widget/Del AnEvent" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;AnEvent_revoker AnEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::AnEvent_revoker AnEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -99,7 +99,7 @@
     <Member MemberName="AnotherEvent">
       <MemberSignature Language="C#" Value="protected event Mono.DocTest.Widget.Del AnotherEvent;" />
       <MemberSignature Language="ILAsm" Value=".event class Mono.DocTest.Widget/Del AnotherEvent" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnotherEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnotherEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;AnotherEvent_revoker AnotherEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnotherEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnotherEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::AnotherEvent_revoker AnotherEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -306,7 +306,7 @@
     <Member MemberName="DynamicE1">
       <MemberSignature Language="C#" Value="public event Func&lt;dynamic&gt; DynamicE1;" />
       <MemberSignature Language="ILAsm" Value=".event class System.Func`1&lt;object&gt; DynamicE1" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE1(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE1(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;DynamicE1_revoker DynamicE1(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE1(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE1(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::DynamicE1_revoker DynamicE1(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -328,7 +328,7 @@
     <Member MemberName="DynamicE2">
       <MemberSignature Language="C#" Value="public event Func&lt;dynamic&gt; DynamicE2;" />
       <MemberSignature Language="ILAsm" Value=".event class System.Func`1&lt;object&gt; DynamicE2" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE2(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE2(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;DynamicE2_revoker DynamicE2(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE2(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE2(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::DynamicE2_revoker DynamicE2(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest.Generic/GenericBase`1.xml b/mdoc/Test/en.expected/Mono.DocTest.Generic/GenericBase`1.xml
@@ -107,7 +107,7 @@
       <MemberSignature Language="VB.NET" Value="Public Custom Event ItemChanged As Action(Of MyList(Of U), MyList(Of U).Helper(Of U, U)) " />
       <MemberSignature Language="F#" Value="member this.ItemChanged : Action&lt;Mono.DocTest.Generic.MyList&lt;'U&gt;, Mono.DocTest.Generic.MyList&lt;'U&gt;.Helper&lt;'U, 'U&gt;&gt; " Usage="member this.ItemChanged : System.Action&lt;Mono.DocTest.Generic.MyList&lt;'U&gt;, Mono.DocTest.Generic.MyList&lt;'U&gt;.Helper&lt;'U, 'U&gt;&gt; " />
       <MemberSignature Language="C++ CLI" Value="public:&#xA; event Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt; ^, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; ^&gt; ^ ItemChanged;" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token ItemChanged(Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void ItemChanged(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;ItemChanged_revoker ItemChanged(auto_revoke_t, Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token ItemChanged(Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void ItemChanged(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;GenericBase`1::ItemChanged_revoker ItemChanged(auto_revoke_t, Action&lt;Mono::DocTest::Generic::MyList&lt;U&gt;, Mono::DocTest::Generic::MyList&lt;U&gt;::Helper&lt;U, U&gt; const&amp;&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -127,7 +127,7 @@
       <MemberSignature Language="VB.NET" Value="Public Custom Event MyEvent As EventHandler(Of GenericBase(Of U).FooEventArgs) " />
       <MemberSignature Language="F#" Value="member this.MyEvent : EventHandler&lt;Mono.DocTest.Generic.GenericBase&lt;'U&gt;.FooEventArgs&gt; " Usage="member this.MyEvent : System.EventHandler&lt;Mono.DocTest.Generic.GenericBase&lt;'U&gt;.FooEventArgs&gt; " />
       <MemberSignature Language="C++ CLI" Value="public:&#xA; event EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs ^&gt; ^ MyEvent;" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token MyEvent(EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void MyEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;MyEvent_revoker MyEvent(auto_revoke_t, EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token MyEvent(EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void MyEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;GenericBase`1::MyEvent_revoker MyEvent(auto_revoke_t, EventHandler&lt;Mono::DocTest::Generic::GenericBase&lt;U&gt;::FooEventArgs&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest/Widget.xml b/mdoc/Test/en.expected/Mono.DocTest/Widget.xml
@@ -95,7 +95,7 @@
       <MemberSignature Language="JavaScript" Usage="function onAnEvent(eventArgs) { /* Your code */ }&#xA;widget.addEventListener(&quot;anevent&quot;, onAnEvent);&#xA;widget.removeEventListener(&quot;anevent&quot;, onAnEvent);&#xA;- or -&#xA;widget.onanevent = onAnEvent;" />
       <MemberSignature Language="C++ CLI" Value="public:&#xA; event Mono::DocTest::Widget::Del ^ AnEvent;" />
       <MemberSignature Language="C++ CX" Value="public:&#xA; event Mono::DocTest::Widget::Del ^ AnEvent;" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;AnEvent_revoker AnEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::AnEvent_revoker AnEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -133,7 +133,7 @@
       <MemberSignature Language="F#" Value="member this.AnotherEvent : Mono.DocTest.Widget.Del " Usage="member this.AnotherEvent : Mono.DocTest.Widget.Del " />
       <MemberSignature Language="C++ CLI" Value="protected:&#xA; event Mono::DocTest::Widget::Del ^ AnotherEvent;" />
       <MemberSignature Language="C++ CX" Value="protected:&#xA; event Mono::DocTest::Widget::Del ^ AnotherEvent;" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnotherEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnotherEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;AnotherEvent_revoker AnotherEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token AnotherEvent(Mono::DocTest::Widget::Del const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void AnotherEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::AnotherEvent_revoker AnotherEvent(auto_revoke_t, Mono::DocTest::Widget::Del const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -391,7 +391,7 @@
       <MemberSignature Language="F#" Value="member this.DynamicE1 : Func&lt;obj&gt; " Usage="member this.DynamicE1 : System.Func&lt;System.obj&gt; " />
       <MemberSignature Language="JavaScript" Usage="function onDynamicE1(eventArgs) { /* Your code */ }&#xA;widget.addEventListener(&quot;dynamice1&quot;, onDynamicE1);&#xA;widget.removeEventListener(&quot;dynamice1&quot;, onDynamicE1);&#xA;- or -&#xA;widget.ondynamice1 = onDynamicE1;" />
       <MemberSignature Language="C++ CLI" Value="public:&#xA; event Func&lt;System::Object ^&gt; ^ DynamicE1;" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE1(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE1(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;DynamicE1_revoker DynamicE1(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE1(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE1(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::DynamicE1_revoker DynamicE1(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -419,7 +419,7 @@
       <MemberSignature Language="F#" Value="member this.DynamicE2 : Func&lt;obj&gt; " Usage="member this.DynamicE2 : System.Func&lt;System.obj&gt; " />
       <MemberSignature Language="JavaScript" Usage="function onDynamicE2(eventArgs) { /* Your code */ }&#xA;widget.addEventListener(&quot;dynamice2&quot;, onDynamicE2);&#xA;widget.removeEventListener(&quot;dynamice2&quot;, onDynamicE2);&#xA;- or -&#xA;widget.ondynamice2 = onDynamicE2;" />
       <MemberSignature Language="C++ CLI" Value="public:&#xA; event Func&lt;System::Object ^&gt; ^ DynamicE2;" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE2(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE2(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;DynamicE2_revoker DynamicE2(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token DynamicE2(Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void DynamicE2(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Widget::DynamicE2_revoker DynamicE2(auto_revoke_t, Func&lt;winrt::Windows::Foundation::IInspectable&gt; const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Class1.xml b/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Class1.xml
@@ -123,7 +123,7 @@
     <Member MemberName="primeFoundEvent">
       <MemberSignature Language="C#" Value="public event UwpTestWinRtComponentCpp.PrimeFoundHandler primeFoundEvent;" />
       <MemberSignature Language="ILAsm" Value=".event class UwpTestWinRtComponentCpp.PrimeFoundHandler primeFoundEvent" />
-      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token primeFoundEvent(UwpTestWinRtComponentCpp::PrimeFoundHandler const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void primeFoundEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;primeFoundEvent_revoker primeFoundEvent(auto_revoke_t, UwpTestWinRtComponentCpp::PrimeFoundHandler const&amp; handler) const;" />
+      <MemberSignature Language="C++ WINRT" Value="// Register&#xA;event_token primeFoundEvent(UwpTestWinRtComponentCpp::PrimeFoundHandler const&amp; handler) const;&#xA;&#xA;// Revoke with event_token&#xA;void primeFoundEvent(event_token const* cookie) const;&#xA;&#xA;// Revoke with event_revoker&#xA;Class1::primeFoundEvent_revoker primeFoundEvent(auto_revoke_t, UwpTestWinRtComponentCpp::PrimeFoundHandler const&amp; handler) const;" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>255.255.255.255</AssemblyVersion>
diff --git a/mdoc/mdoc.Test/CppWinRtMembersTests.cs b/mdoc/mdoc.Test/CppWinRtMembersTests.cs
@@ -107,7 +107,7 @@ public void Event_Class1_primeFoundEvent()
 void primeFoundEvent(event_token const* cookie) const;
 
 // Revoke with event_revoker
-primeFoundEvent_revoker primeFoundEvent(auto_revoke_t, UwpTestWinRtComponentCpp::PrimeFoundHandler const& handler) const;";
+Class1::primeFoundEvent_revoker primeFoundEvent(auto_revoke_t, UwpTestWinRtComponentCpp::PrimeFoundHandler const& handler) const;";
             TestEventSignature(CppCxTestLibName, "UwpTestWinRtComponentCpp.Class1", "primeFoundEvent", expectedSig);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ protected override string GetPropertyDeclaration(PropertyDefinition property)`
`186`	`186`	`protected override string GetEventDeclaration(EventDefinition e)`
`187`	`187`	`{`
`188`	`188`	`string apiName = e.Name, typeName = GetTypeNameWithOptions(e.EventType, AppendHatOnReturn);`
	`189`	`+ var rtnAutoEventRevoker = e.DeclaringType.Name + NestedTypeSeparator + apiName;`
`189`	`190`
`190`	`191`	`StringBuilder buf = new StringBuilder();`
`191`	`192`	`//if (AppendVisibility(buf, e.AddMethod).Length == 0)`
`@@ -194,7 +195,7 @@ protected override string GetEventDeclaration(EventDefinition e)`
`194`	`195`	`buf.AppendLine().AppendLine("// Revoke with event_token");`
`195`	`196`	`buf.AppendLine($"void {apiName}(event_token const* cookie) const;");`
`196`	`197`	`buf.AppendLine().AppendLine("// Revoke with event_revoker");`
`197`		`- buf.Append($"{apiName}_revoker {apiName}(auto_revoke_t, {typeName} const& handler) const;");`
	`198`	`+ buf.Append($"{rtnAutoEventRevoker}_revoker {apiName}(auto_revoke_t, {typeName} const& handler) const;");`
`198`	`199`
`199`	`200`	`return buf.ToString().Replace("\r\n", "\n");`
`200`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public void Event_Class1_primeFoundEvent()`
`107`	`107`	`void primeFoundEvent(event_token const* cookie) const;`
`108`	`108`
`109`	`109`	`// Revoke with event_revoker`
`110`		`-primeFoundEvent_revoker primeFoundEvent(auto_revoke_t, UwpTestWinRtComponentCpp::PrimeFoundHandler const& handler) const;";`
	`110`	`+Class1::primeFoundEvent_revoker primeFoundEvent(auto_revoke_t, UwpTestWinRtComponentCpp::PrimeFoundHandler const& handler) const;";`
`111`	`111`	`TestEventSignature(CppCxTestLibName, "UwpTestWinRtComponentCpp.Class1", "primeFoundEvent", expectedSig);`
`112`	`112`	`}`
`113`	`113`