Merge pull request #31940 from mavasani/NamespaceAndDescendants

Rename new suppress message attribute scope

src/Compilers/Core/Portable/DiagnosticAnalyzer/SuppressMessageAttributeState.cs

@@ -21,7 +21,7 @@ internal partial class SuppressMessageAttributeState
                 { "resource", TargetScope.Resource },
                 { "type", TargetScope.Type },
                 { "member", TargetScope.Member },
-                { "namespaceandchildren", TargetScope.NamespaceAndChildren }
+                { "namespaceanddescendants", TargetScope.NamespaceAndDescendants }
             };
 
         private static bool TryGetTargetScope(SuppressMessageInfo info, out TargetScope scope)
@@ -82,7 +82,7 @@ public bool HasGlobalSymbolSuppression(ISymbol symbol, string id, bool isImmedia
                                 // In other words, only apply suppression to the immediately containing namespace declaration and not to its children or parents.
                                 return isImmediatelyContainingSymbol;
 
-                            case TargetScope.NamespaceAndChildren:
+                            case TargetScope.NamespaceAndDescendants:
                                 return true;
                         }
                     }
@@ -332,7 +332,7 @@ internal static IEnumerable<ISymbol> ResolveTargetSymbols(Compilation compilatio
                         return results;
                     }
 
-                case TargetScope.NamespaceAndChildren:
+                case TargetScope.NamespaceAndDescendants:
                     return ResolveTargetSymbols(compilation, target, TargetScope.Namespace);
 
                 default:
@@ -383,7 +383,7 @@ internal enum TargetScope
             Resource,
             Type,
             Member,
-            NamespaceAndChildren
+            NamespaceAndDescendants
         }
     }
 }

src/Test/Utilities/Portable/Diagnostics/SuppressMessageAttributeTests.cs

@@ -111,13 +111,13 @@ namespace N4
         }
 
         [Fact, WorkItem(486, "https://github.com/dotnet/roslyn/issues/486")]
-        public async Task GlobalSuppressionOnNamespaces_NamespaceAndChildren()
+        public async Task GlobalSuppressionOnNamespaces_NamespaceAndDescendants()
         {
             await VerifyCSharpAsync(@"
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage(""Test"", ""Declaration"", Scope=""NamespaceAndChildren"", Target=""N.N1"")]
-[module: SuppressMessage(""Test"", ""Declaration"", Scope=""namespaceandchildren"", Target=""N4"")]
+[assembly: SuppressMessage(""Test"", ""Declaration"", Scope=""NamespaceAndDescendants"", Target=""N.N1"")]
+[module: SuppressMessage(""Test"", ""Declaration"", Scope=""namespaceanddescendants"", Target=""N4"")]
 
 namespace N
 {
@@ -145,13 +145,13 @@ namespace N.N1.N6.N7
         }
 
         [Fact, WorkItem(486, "https://github.com/dotnet/roslyn/issues/486")]
-        public async Task GlobalSuppressionOnTypesAndNamespaces_NamespaceAndChildren()
+        public async Task GlobalSuppressionOnTypesAndNamespaces_NamespaceAndDescendants()
         {
             await VerifyCSharpAsync(@"
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage(""Test"", ""Declaration"", Scope=""NamespaceAndChildren"", Target=""N.N1.N2"")]
-[module: SuppressMessage(""Test"", ""Declaration"", Scope=""NamespaceAndChildren"", Target=""N4"")]
+[assembly: SuppressMessage(""Test"", ""Declaration"", Scope=""NamespaceAndDescendants"", Target=""N.N1.N2"")]
+[module: SuppressMessage(""Test"", ""Declaration"", Scope=""NamespaceAndDescendants"", Target=""N4"")]
 [module: SuppressMessage(""Test"", ""Declaration"", Scope=""Type"", Target=""C2"")]
 
 namespace N
@@ -449,7 +449,7 @@ class C {}
         public async Task SuppressSyntaxDiagnosticsOnNamespaceAndChildDeclarationCSharp()
         {
             await VerifyTokenDiagnosticsCSharpAsync(@"
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(""Test"", ""Token"", Scope=""NamespaceAndChildren"", Target=""A.B"")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(""Test"", ""Token"", Scope=""NamespaceAndDescendants"", Target=""A.B"")]
 namespace A
 [|{
     namespace B
@@ -483,10 +483,10 @@ End Namespace
         }
 
         [Fact, WorkItem(486, "https://github.com/dotnet/roslyn/issues/486")]
-        public async Task SuppressSyntaxDiagnosticsOnNamespaceAndChildrenDeclarationBasic()
+        public async Task SuppressSyntaxDiagnosticsOnNamespaceAndDescendantsDeclarationBasic()
         {
             await VerifyTokenDiagnosticsBasicAsync(@"
-<assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(""Test"", ""Token"", Scope:=""NamespaceAndChildren"", Target:=""A.B"")>
+<assembly: System.Diagnostics.CodeAnalysis.SuppressMessage(""Test"", ""Token"", Scope:=""NamespaceAndDescendants"", Target:=""A.B"")>
 Namespace [|A
     Namespace B 
         Class C
@@ -500,7 +500,7 @@ End Namespace
 
         [Theory, WorkItem(486, "https://github.com/dotnet/roslyn/issues/486")]
         [InlineData("Namespace")]
-        [InlineData("NamespaceAndChildren")]
+        [InlineData("NamespaceAndDescendants")]
         public async Task DontSuppressSyntaxDiagnosticsInRootNamespaceBasic(string scope)
         {
             await VerifyBasicAsync($@"