Diagnostic to cover the gap left by AttributeTargets.Method

dotnet · Apr 29, 2020 · 3153060 · 3153060
1 parent fb425a8
commit 3153060
Show file tree

Hide file tree

Showing 18 changed files with 90 additions and 21 deletions.
diff --git a/src/Compilers/CSharp/Portable/CSharpResources.resx b/src/Compilers/CSharp/Portable/CSharpResources.resx
@@ -6091,4 +6091,7 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
   <data name="ERR_ModuleInitializerMethodMustReturnVoid" xml:space="preserve">
     <value>Module initializer method '{0}' must return void</value>
   </data>
+  <data name="ERR_ModuleInitializerMethodMustBeOrdinary" xml:space="preserve">
+    <value>A module initializer must be an ordinary method</value>
+  </data>
 </root>
diff --git a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
@@ -1777,12 +1777,13 @@ internal enum ErrorCode
         ERR_ExpressionTreeContainsFromEndIndexExpression = 8791,
         ERR_ExpressionTreeContainsRangeExpression = 8792,
 
-        ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType = 8793,
-        ERR_ModuleInitializerMethodMustBeStatic = 8794,
-        ERR_ModuleInitializerMethodMustNotHaveParameters = 8795,
-        ERR_ModuleInitializerMethodMustReturnVoid = 8796,
-        ERR_ModuleInitializerMethodMustNotBeGeneric = 8797,
-        ERR_ModuleInitializerMethodMustNotBeContainedInGenericType = 8798,
+        ERR_ModuleInitializerMethodMustBeOrdinary = 8793,
+        ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType = 8794,
+        ERR_ModuleInitializerMethodMustBeStatic = 8795,
+        ERR_ModuleInitializerMethodMustNotHaveParameters = 8796,
+        ERR_ModuleInitializerMethodMustReturnVoid = 8797,
+        ERR_ModuleInitializerMethodMustNotBeGeneric = 8798,
+        ERR_ModuleInitializerMethodMustNotBeContainedInGenericType = 8799,
 
         // Note: you will need to re-generate compiler code after adding warnings (eng\generate-compiler-code.cmd)
     }

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf
@@ -332,6 +332,11 @@
         <target state="new">Module initializer method '{0}' must be accessible outside top-level type '{1}'</target>
         <note />
       </trans-unit>
+      <trans-unit id="ERR_ModuleInitializerMethodMustBeOrdinary">
+        <source>A module initializer must be an ordinary method</source>
+        <target state="new">A module initializer must be an ordinary method</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ERR_ModuleInitializerMethodMustBeStatic">
         <source>Module initializer method '{0}' must be static</source>
         <target state="new">Module initializer method '{0}' must be static</target>

diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/ModuleInitializersTests.Accessibility.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/ModuleInitializersTests.Accessibility.cs
@@ -24,7 +24,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (6,6): error CS8793: Module initializer method 'M' must be accessible outside top-level type 'C'
+                // (6,6): error CS8794: Module initializer method 'M' must be accessible outside top-level type 'C'
                 //     [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType, "ModuleInitializer").WithArguments("M", "C").WithLocation(6, 6)
                 );
@@ -46,7 +46,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (6,6): error CS8793: Module initializer method 'M' must be accessible outside top-level type 'C'
+                // (6,6): error CS8794: Module initializer method 'M' must be accessible outside top-level type 'C'
                 //     [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType, "ModuleInitializer").WithArguments("M", "C").WithLocation(6, 6)
                 );
@@ -68,7 +68,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (6,6): error CS8793: Module initializer method 'M' must be accessible outside top-level type 'C'
+                // (6,6): error CS8794: Module initializer method 'M' must be accessible outside top-level type 'C'
                 //     [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType, "ModuleInitializer").WithArguments("M", "C").WithLocation(6, 6)
                 );
@@ -183,7 +183,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (8,10): error CS8793: Module initializer method 'M' must be accessible outside top-level type 'C'
+                // (8,10): error CS8794: Module initializer method 'M' must be accessible outside top-level type 'C'
                 //         [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType, "ModuleInitializer").WithArguments("M", "C").WithLocation(8, 10)
                 );
@@ -208,7 +208,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (8,10): error CS8793: Module initializer method 'M' must be accessible outside top-level type 'C'
+                // (8,10): error CS8794: Module initializer method 'M' must be accessible outside top-level type 'C'
                 //         [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType, "ModuleInitializer").WithArguments("M", "C").WithLocation(8, 10)
                 );
@@ -233,7 +233,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (8,10): error CS8793: Module initializer method 'M' must be accessible outside top-level type 'C'
+                // (8,10): error CS8794: Module initializer method 'M' must be accessible outside top-level type 'C'
                 //         [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustBeAccessibleOutsideTopLevelType, "ModuleInitializer").WithArguments("M", "C").WithLocation(8, 10)
                 );

diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/ModuleInitializersTests.Generics.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/ModuleInitializersTests.Generics.cs
@@ -24,7 +24,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (6,6): error CS8797: Module initializer method 'M' must not have generic parameters
+                // (6,6): error CS8798: Module initializer method 'M' must not have generic parameters
                 //     [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustNotBeGeneric, "ModuleInitializer").WithArguments("M").WithLocation(6, 6)
                 );
@@ -46,7 +46,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (6,6): error CS8797: Module initializer method 'M' must not be contained in a generic type
+                // (6,6): error CS8798: Module initializer method 'M' must not be contained in a generic type
                 //     [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustNotBeContainedInGenericType, "ModuleInitializer").WithArguments("M").WithLocation(6, 6)
                 );
@@ -71,7 +71,7 @@ namespace System.Runtime.CompilerServices { class ModuleInitializerAttribute : S
 ";
             var compilation = CreateCompilation(source, parseOptions: s_parseOptions);
             compilation.VerifyDiagnostics(
-                // (8,10): error CS8798: Module initializer method 'M' must not be contained in a generic type
+                // (8,10): error CS8799: Module initializer method 'M' must not be contained in a generic type
                 //         [ModuleInitializer]
                 Diagnostic(ErrorCode.ERR_ModuleInitializerMethodMustNotBeContainedInGenericType, "ModuleInitializer").WithArguments("M").WithLocation(8, 10)
                 );