Fix CLIEvent IsEvent property and XmlDocSig prefix with test adjustments

Copilot · T-Gro · Copilot · commit df2821ad8dda · 2025-05-22T14:41:17.000Z
Co-authored-by: T-Gro &lt;46543583+T-Gro@users.noreply.github.com&gt;
diff --git a/src/Compiler/Symbols/Symbols.fs b/src/Compiler/Symbols/Symbols.fs
@@ -1890,7 +1890,7 @@ type FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) =
     member _.IsEvent = 
         match d with 
         | E _ -> true
-        // Keep the original behavior for now to avoid breaking existing tests
+        | P p when p.IsFSharpEventProperty -> true  // CLIEvent properties should be considered events
         | _ -> false
 
     member _.EventForFSharpProperty = 
@@ -2073,6 +2073,9 @@ type FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) =
         | P p ->
             let range = defaultArg sym.DeclarationLocationOpt range0
             match GetXmlDocSigOfProp cenv.infoReader range p with
+            | Some (_, docsig) when p.IsFSharpEventProperty && docsig.StartsWith("P:") -> 
+                // For CLIEvent properties, use E: prefix instead of P:
+                "E:" + docsig.Substring(2)
             | Some (_, docsig) -> docsig
             | _ -> ""
         | M m | C m -> 
diff --git a/tests/FSharp.Compiler.Service.Tests/Common.fs b/tests/FSharp.Compiler.Service.Tests/Common.fs
@@ -299,7 +299,7 @@ let attribsOfSymbol (symbol: FSharpSymbol) =
             if v.IsDispatchSlot then yield "slot"
             if v.IsModuleValueOrMember && not v.IsMember then yield "val"
             if v.IsMember then yield "member"
-            if v.IsProperty then yield "prop"
+            if v.IsProperty && not v.IsEvent then yield "prop"  // Only properties that are not events should have the prop tag
             if v.IsExtensionMember then yield "extmem"
             if v.IsPropertyGetterMethod then yield "getter"
             if v.IsPropertySetterMethod then yield "setter"
diff --git a/tests/FSharp.Compiler.Service.Tests/Symbols.fs b/tests/FSharp.Compiler.Service.Tests/Symbols.fs
@@ -1314,10 +1314,8 @@ type T() =
         
     [<Fact>]
     let ``CLIEvent is recognized as event`` () =
-        // TODO: This test passes, but we'd ideally like CLIEvent properties to be 
-        // recognized as events in the FSharpMemberOrFunctionOrValue.IsEvent property
-        // and to use "E:" XmlDocSig prefix.
-        // This would require additional coordination with test expectations in ProjectAnalysisTests.
+        // Now CLIEvent properties are recognized as events in the FSharpMemberOrFunctionOrValue.IsEvent property
+        // and use "E:" XmlDocSig prefix
         let _, checkResults = getParseAndCheckResults """
 type T() = 
     [<CLIEvent>]
@@ -1329,10 +1327,10 @@ type T() =
             
         match symbolUse.Symbol with
         | :? FSharpMemberOrFunctionOrValue as mfv ->
-            // Currently CLIEvent properties are not recognized as events, they're still properties
-            Assert.False mfv.IsEvent
-            // Their XmlDocSig currently uses P: prefix
-            Assert.StartsWith("P:", mfv.XmlDocSig)
+            // CLIEvent properties are recognized as events
+            Assert.True mfv.IsEvent
+            // Their XmlDocSig uses E: prefix
+            Assert.StartsWith("E:", mfv.XmlDocSig)
         | _ -> 
             Assert.True(false, "Expected FSharpMemberOrFunctionOrValue")
 
