Restore behavior for CompilerMessageAttribute

Author: auduchinok

src/Compiler/Checking/AttributeChecking.fs

@@ -478,13 +478,11 @@ let CheckFSharpAttributesForObsolete (g:TcGlobals) attribs =
     // like Span and ReadOnlySpan in completion lists due to their dual attributes.
     not (HasFSharpAttributeOpt g g.attrib_IsByRefLikeAttribute_opt attribs)
 
-/// Indicate if a list of F# attributes contains 'ObsoleteAttribute'. Used to suppress the item in intellisense.
-/// Also check the attributes for CompilerMessageAttribute, which has an IsHidden argument that allows
-/// items to be suppressed from intellisense.
-let CheckFSharpAttributesForUnseen g attribs _m = 
+/// Indicates if a list of F# attributes contains 'ObsoleteAttribute' or CompilerMessageAttribute', which has an IsHidden argument
+/// May be used to suppress items from intellisense.
+let CheckFSharpAttributesForUnseen g attribs _m allowObsolete = 
     not (isNil attribs) &&         
-    (CheckFSharpAttributesForObsolete g attribs ||
-        CheckFSharpAttributesForHidden g attribs)
+    (not allowObsolete && CheckFSharpAttributesForObsolete g attribs || CheckFSharpAttributesForHidden g attribs)
 
 #if !NO_TYPEPROVIDERS
 /// Indicate if a list of provided attributes contains 'ObsoleteAttribute'. Used to suppress the item in intellisense.
@@ -579,13 +577,11 @@ let CheckMethInfoAttributes g m tyargsOpt (minfo: MethInfo) =
 /// Used to suppress the item in intellisense.
 let MethInfoIsUnseen g (m: range) (ty: TType) minfo allowObsolete = 
     let isUnseenByObsoleteAttrib () =
-        if allowObsolete then false else
-
         match BindMethInfoAttributes m minfo 
-                (fun ilAttribs -> Some(CheckILAttributesForUnseen g ilAttribs m)) 
-                (fun fsAttribs -> Some(CheckFSharpAttributesForUnseen g fsAttribs m))
+                (fun ilAttribs -> Some(not allowObsolete && CheckILAttributesForUnseen g ilAttribs m)) 
+                (fun fsAttribs -> Some(CheckFSharpAttributesForUnseen g fsAttribs m allowObsolete))
 #if !NO_TYPEPROVIDERS
-                (fun provAttribs -> Some(CheckProvidedAttributesForUnseen provAttribs m))
+                (fun provAttribs -> Some(not allowObsolete && CheckProvidedAttributesForUnseen provAttribs m))
 #else
                 (fun _provAttribs -> None)
 #endif
@@ -622,14 +618,14 @@ let MethInfoIsUnseen g (m: range) (ty: TType) minfo allowObsolete =
 
 /// Indicate if a property has 'Obsolete' or 'CompilerMessageAttribute'.
 /// Used to suppress the item in intellisense.
-let PropInfoIsUnseen m pinfo = 
+let PropInfoIsUnseen m allowObsolete pinfo = 
     match pinfo with
     | ILProp (ILPropInfo(_, pdef) as ilpinfo) -> 
         // Properties on .NET tuple types are resolvable but unseen
         isAnyTupleTy pinfo.TcGlobals ilpinfo.ILTypeInfo.ToType || 
         CheckILAttributesForUnseen pinfo.TcGlobals pdef.CustomAttrs m
     | FSProp (g, _, Some vref, _) 
-    | FSProp (g, _, _, Some vref) -> CheckFSharpAttributesForUnseen g vref.Attribs m
+    | FSProp (g, _, _, Some vref) -> CheckFSharpAttributesForUnseen g vref.Attribs m allowObsolete
     | FSProp _ -> failwith "CheckPropInfoAttributes: unreachable"
 #if !NO_TYPEPROVIDERS
     | ProvidedProp (_amap, pi, m) -> 

src/Compiler/Checking/AttributeChecking.fsi

@@ -68,7 +68,7 @@ val CheckFSharpAttributesForHidden: g: TcGlobals -> attribs: Attrib list -> bool
 
 val CheckFSharpAttributesForObsolete: g: TcGlobals -> attribs: Attrib list -> bool
 
-val CheckFSharpAttributesForUnseen: g: TcGlobals -> attribs: Attrib list -> _m: 'a -> bool
+val CheckFSharpAttributesForUnseen: g: TcGlobals -> attribs: Attrib list -> _m: 'a -> allowObsolete: bool -> bool
 
 val CheckPropInfoAttributes: pinfo: PropInfo -> m: range -> OperationResult<unit>
 
@@ -79,7 +79,7 @@ val CheckMethInfoAttributes:
 
 val MethInfoIsUnseen: g: TcGlobals -> m: range -> ty: TType -> minfo: MethInfo -> allowObsolete: bool -> bool
 
-val PropInfoIsUnseen: m: 'a -> pinfo: PropInfo -> bool
+val PropInfoIsUnseen: m: 'a -> allowObsolete: bool -> pinfo: PropInfo -> bool
 
 val CheckEntityAttributes: g: TcGlobals -> tcref: TyconRef -> m: range -> OperationResult<unit>
 

src/Compiler/Checking/NameResolution.fs

@@ -4275,19 +4275,19 @@ let IsTyconUnseenObsoleteSpec ad g amap m (x: TyconRef) allowObsolete =
       (if x.IsILTycon then
           CheckILAttributesForUnseen g x.ILTyconRawMetadata.CustomAttrs m
        else
-          CheckFSharpAttributesForUnseen g x.Attribs m))
+          CheckFSharpAttributesForUnseen g x.Attribs m allowObsolete))
 
 let IsTyconUnseen ad g amap m allowObsolete (x: TyconRef) = IsTyconUnseenObsoleteSpec ad g amap m x allowObsolete
 
 let IsValUnseen ad g m allowObsolete (v: ValRef) =
     v.IsCompilerGenerated ||
     v.Deref.IsClassConstructor ||
     not (IsValAccessible ad v) ||
-    not allowObsolete && CheckFSharpAttributesForUnseen g v.Attribs m
+    not allowObsolete && CheckFSharpAttributesForUnseen g v.Attribs m allowObsolete
 
 let IsUnionCaseUnseen ad g amap m allowObsolete (ucref: UnionCaseRef) =
     not (IsUnionCaseAccessible amap m ad ucref) ||
-    not allowObsolete && (IsTyconUnseen ad g amap m allowObsolete ucref.TyconRef || CheckFSharpAttributesForUnseen g ucref.Attribs m)
+    not allowObsolete && (IsTyconUnseen ad g amap m allowObsolete ucref.TyconRef || CheckFSharpAttributesForUnseen g ucref.Attribs m allowObsolete)
 
 let ItemIsUnseen ad g amap m allowObsolete item =
     match item with
@@ -4423,7 +4423,7 @@ let ResolveCompletionsInType (ncenv: NameResolver) nenv (completionTargets: Reso
         if allowObsolete then pinfosIncludingUnseen else
 
         pinfosIncludingUnseen
-        |> List.filter (fun x -> not (PropInfoIsUnseen m x))
+        |> List.filter (fun x -> not (PropInfoIsUnseen m allowObsolete x))
 
     let minfoFilter (suppressedMethNames: Zset<_>) (minfo: MethInfo) =
         let isApplicableMeth =
@@ -5127,7 +5127,7 @@ let ResolveCompletionsInTypeForItem (ncenv: NameResolver) nenv m ad statics ty (
 
             let pinfos =
                 pinfosIncludingUnseen
-                |> List.filter (fun x -> not (PropInfoIsUnseen m x))
+                |> List.filter (fun x -> not (PropInfoIsUnseen m false x))
 
             let minfoFilter (suppressedMethNames: Zset<_>) (minfo: MethInfo) =
                 // Only show the Finalize, MemberwiseClose etc. methods on System.Object for values whose static type really is