Add support for `System.Diagnostics.CodeAnalysis.ExperimentalAttribut…

…e` (#68702)
dotnet · Jul 6, 2023 · cd51ca0 · cd51ca0
1 parent c022624
commit cd51ca0
Show file tree

Hide file tree

Showing 14 changed files with 1,361 additions and 17 deletions.
diff --git a/src/Compilers/CSharp/Portable/Symbols/ObsoleteAttributeHelpers.cs b/src/Compilers/CSharp/Portable/Symbols/ObsoleteAttributeHelpers.cs
@@ -99,6 +99,7 @@ internal static ObsoleteDiagnosticKind GetObsoleteDiagnosticKind(Symbol symbol,
             {
                 case ObsoleteAttributeKind.None:
                     return ObsoleteDiagnosticKind.NotObsolete;
+                case ObsoleteAttributeKind.WindowsExperimental:
                 case ObsoleteAttributeKind.Experimental:
                     return ObsoleteDiagnosticKind.Diagnostic;
                 case ObsoleteAttributeKind.Uninitialized:
@@ -154,12 +155,23 @@ static DiagnosticInfo createObsoleteDiagnostic(Symbol symbol, BinderFlags locati
                     return null;
                 }
 
-                if (data.Kind == ObsoleteAttributeKind.Experimental)
+                if (data.Kind == ObsoleteAttributeKind.WindowsExperimental)
                 {
                     Debug.Assert(data.Message == null);
                     Debug.Assert(!data.IsError);
                     // Provide an explicit format for fully-qualified type names.
-                    return new CSDiagnosticInfo(ErrorCode.WRN_Experimental, new FormattedSymbol(symbol, SymbolDisplayFormat.CSharpErrorMessageFormat));
+                    return new CSDiagnosticInfo(ErrorCode.WRN_Experimental,
+                        new FormattedSymbol(symbol, SymbolDisplayFormat.CSharpErrorMessageFormat));
+                }
+
+                if (data.Kind == ObsoleteAttributeKind.Experimental)
+                {
+                    Debug.Assert(data.Message is null);
+                    Debug.Assert(!data.IsError);
+
+                    // Provide an explicit format for fully-qualified type names.
+                    return new CustomObsoleteDiagnosticInfo(MessageProvider.Instance, (int)ErrorCode.WRN_Experimental, data,
+                        new FormattedSymbol(symbol, SymbolDisplayFormat.CSharpErrorMessageFormat));
                 }
 
                 // Issue a specialized diagnostic for add methods of collection initializers

diff --git a/src/Compilers/CSharp/Portable/Symbols/Symbol.cs b/src/Compilers/CSharp/Portable/Symbols/Symbol.cs
@@ -1320,6 +1320,7 @@ internal ThreeState ObsoleteState
                 switch (ObsoleteKind)
                 {
                     case ObsoleteAttributeKind.None:
+                    case ObsoleteAttributeKind.WindowsExperimental:
                     case ObsoleteAttributeKind.Experimental:
                         return ThreeState.False;
                     case ObsoleteAttributeKind.Uninitialized:

diff --git a/src/Compilers/CSharp/Portable/Symbols/Symbol_Attributes.cs b/src/Compilers/CSharp/Portable/Symbols/Symbol_Attributes.cs
@@ -162,6 +162,10 @@ internal static bool EarlyDecodeDeprecatedOrExperimentalOrObsoleteAttribute(
             {
                 kind = ObsoleteAttributeKind.Deprecated;
             }
+            else if (CSharpAttributeData.IsTargetEarlyAttribute(type, syntax, AttributeDescription.WindowsExperimentalAttribute))
+            {
+                kind = ObsoleteAttributeKind.WindowsExperimental;
+            }
             else if (CSharpAttributeData.IsTargetEarlyAttribute(type, syntax, AttributeDescription.ExperimentalAttribute))
             {
                 kind = ObsoleteAttributeKind.Experimental;

diff --git a/src/Compilers/CSharp/Test/Emit2/Attributes/AttributeTests_Experimental.cs b/src/Compilers/CSharp/Test/Emit2/Attributes/AttributeTests_Experimental.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.CodeAnalysis.CSharp.UnitTests
 {
-    public class AttributeTests_Experimental : CSharpTestBase
+    public class AttributeTests_WindowsExperimental : CSharpTestBase
     {
         private const string DeprecatedAttributeSource =
 @"using System;