Fix highlighting F#-defined CliEvents idents

nathanpovo · Dec 18, 2017 · c38f2fb · c38f2fb
1 parent b942dc4
commit c38f2fb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ReSharper.FSharp/src/Daemon.FSharp/src/FSharpSymbolHighlightingUtil.cs b/ReSharper.FSharp/src/Daemon.FSharp/src/FSharpSymbolHighlightingUtil.cs
@@ -30,7 +30,7 @@ public static string GetEntityHighlightingAttributeId([NotNull] this FSharpEntit
     [NotNull]
     public static string GetMfvHighlightingAttributeId([NotNull] this FSharpMemberOrFunctionOrValue mfv)
     {
-      if (mfv.IsEvent || mfv.IsEventAddMethod || mfv.IsEventRemoveMethod)
+      if (mfv.IsEvent || mfv.IsEventAddMethod || mfv.IsEventRemoveMethod || mfv.EventForFSharpProperty != null)
         return HighlightingAttributeIds.EVENT_IDENTIFIER_ATTRIBUTE;
 
       if (mfv.IsImplicitConstructor || mfv.IsConstructor)
@@ -59,7 +59,7 @@ public static string GetHighlightingAttributeId([NotNull] this FSharpSymbol symb
           return GetEntityHighlightingAttributeId(entity);
 
         case FSharpMemberOrFunctionOrValue mfv when !mfv.IsUnresolved:
-          return GetMfvHighlightingAttributeId(mfv);
+          return GetMfvHighlightingAttributeId(mfv.AccessorProperty?.Value ?? mfv);
 
         case FSharpField field:
           return field.IsLiteral