merge branch 'feature/v5.10.18'

michael-damatov · michael-damatov · commit f453a05dc215 · 2024-04-10T17:20:03.000+02:00
diff --git a/Sources/.nuget/NuGet.exe b/Sources/.nuget/NuGet.exe
diff --git a/Sources/ReCommendedExtension.Deployment/ReCommendedExtension.nuspec b/Sources/ReCommendedExtension.Deployment/ReCommendedExtension.nuspec
@@ -33,7 +33,7 @@
         <copyright>{{AssemblyCopyright}}</copyright>
         <tags>recommended extension resharper plugin addin prodot</tags>
         <dependencies>
-            <dependency id="Wave" version="[233.0,233.1)" />
+            <dependency id="Wave" version="[241.0,241.1)" />
         </dependencies>
     </metadata>
     <files>
diff --git a/Sources/ReCommendedExtension.Tests/Analyzers/AnnotationAnalyzerTestsForNUnitTestProjects.cs b/Sources/ReCommendedExtension.Tests/Analyzers/AnnotationAnalyzerTestsForNUnitTestProjects.cs
@@ -17,12 +17,12 @@ protected override bool HighlightingPredicate(IHighlighting highlighting, IPsiSo
             => highlighting is MissingSuppressionJustificationWarning;
 
         [Test]
-        [TestNetFramework47]
-        [TestPackages("nunit")]
+        [TestNetFramework46]
+        [TestPackages("nunit/3.13.3")]
         public void TestSuppressMessage_TestProject() => DoNamedTest2();
 
         [Test]
-        [TestNet50("nunit")]
+        [TestNet50("nunit/3.13.3")]
         public void TestSuppressMessage_TestProject_NET_5() => DoNamedTest2();
     }
 }
diff --git a/Sources/ReCommendedExtension.Tests/Analyzers/AnnotationAnalyzerTestsForXUnitTestProjects.cs b/Sources/ReCommendedExtension.Tests/Analyzers/AnnotationAnalyzerTestsForXUnitTestProjects.cs
@@ -17,11 +17,11 @@ protected override bool HighlightingPredicate(IHighlighting highlighting, IPsiSo
             => highlighting is MissingSuppressionJustificationWarning;
 
         [Test]
-        [TestPackages("xunit.core")]
+        [TestPackages("xunit.core/2.4.1")]
         public void TestSuppressMessage_TestProject() => DoNamedTest2();
 
         [Test]
-        [TestNet50("xunit.core")]
+        [TestNet50("xunit.core/2.4.1")]
         public void TestSuppressMessage_TestProject_NET_5() => DoNamedTest2();
     }
 }
diff --git a/Sources/ReCommendedExtension.Tests/Analyzers/AwaitAnalyzerTestsRedundantCapturedContext.cs b/Sources/ReCommendedExtension.Tests/Analyzers/AwaitAnalyzerTestsRedundantCapturedContext.cs
@@ -1,4 +1,5 @@
 ﻿using JetBrains.Application.Settings;
+using JetBrains.ReSharper.Daemon.CSharp.Errors;
 using JetBrains.ReSharper.Feature.Services.CSharp.PropertiesExtender;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.FeaturesTestFramework.Daemon;
@@ -15,7 +16,7 @@ public sealed class AwaitAnalyzerTestsRedundantCapturedContext : CSharpHighlight
         protected override string RelativeTestDataPath => @"Analyzers\Await";
 
         protected override bool HighlightingPredicate(IHighlighting highlighting, IPsiSourceFile sourceFile, IContextBoundSettingsStore settingsStore)
-            => highlighting is RedundantCapturedContextSuggestion;
+            => highlighting is RedundantCapturedContextSuggestion || highlighting is RedundantConfigureAwaitWarning; // to figure out which cases are supported by R#
 
         [TestNetFramework45]
         [Test]
diff --git a/Sources/ReCommendedExtension.Tests/ReCommendedExtension.Tests.csproj b/Sources/ReCommendedExtension.Tests/ReCommendedExtension.Tests.csproj
@@ -6,9 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Lifetimes" Version="2023.3.0" />
-    <PackageReference Include="JetBrains.NuGet.Frameworks" Version="6.9.20240222.127" />
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2023.3.4">
+    <PackageReference Include="JetBrains.Lifetimes" Version="2024.1.0" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2024.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Sources/ReCommendedExtension.Tests/TestNetFramework47Attribute.cs b/Sources/ReCommendedExtension.Tests/TestNetFramework47Attribute.cs
diff --git a/Sources/ReCommendedExtension.sln.DotSettings b/Sources/ReCommendedExtension.sln.DotSettings
@@ -391,6 +391,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=2c62818f_002D621b_002D4425_002Dadc9_002D78611099bfcb/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Type parameters"&gt;&lt;ElementKinds&gt;&lt;Kind Name="TYPE_PARAMETER" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="False" Prefix="T" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
@@ -444,6 +449,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">None</s:String>
 	<s:Boolean x:Key="/Default/ReSpeller/DocCommentsUseMemberModifiers/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ReSpeller/DontCheckInheritedMembers/@EntryValue">True</s:Boolean>
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithInstantHandle.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithInstantHandle.cs
@@ -8,7 +8,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate parameter with [InstantHandle] attribute" + ZoneMarker.Suffix,
         Description = "Annotates a parameter with the [InstantHandle] attribute.")]
     public sealed class AnnotateWithInstantHandle : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithItemNotNull.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithItemNotNull.cs
@@ -10,7 +10,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate with [ItemNotNull] attribute" + ZoneMarker.Suffix,
         Description = "Annotates with the [ItemNotNull] attribute.")]
     public sealed class AnnotateWithItemNotNull : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithLinqTunnel.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithLinqTunnel.cs
@@ -8,7 +8,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate method with [LinqTunnel] attribute" + ZoneMarker.Suffix,
         Description = "Annotates a method with the [LinqTunnel] attribute.")]
     public sealed class AnnotateWithLinqTunnel : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithMustUseReturnValue.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithMustUseReturnValue.cs
@@ -10,7 +10,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate method with [MustUseReturnValue] attribute" + ZoneMarker.Suffix,
         Description = "Annotates a method with the [MustUseReturnValue] attribute.")]
     public sealed class AnnotateWithMustUseReturnValue : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithNonNegativeValue.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithNonNegativeValue.cs
@@ -7,7 +7,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate with [NonNegativeValue] attribute" + ZoneMarker.Suffix,
         Description = "Annotates with the [NonNegativeValue] attribute.")]
     public sealed class AnnotateWithNonNegativeValue : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithPure.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithPure.cs
@@ -11,7 +11,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate method with [Pure] attribute" + ZoneMarker.Suffix,
         Description = "Annotates a method with the [Pure] attribute.")]
     public sealed class AnnotateWithPure : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/AnnotateWithValueRange.cs b/Sources/ReCommendedExtension/ContextActions/AnnotateWithValueRange.cs
@@ -10,7 +10,7 @@
 namespace ReCommendedExtension.ContextActions
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Annotate with [ValueRange(...)] attribute" + ZoneMarker.Suffix,
         Description = "Annotates with the [ValueRange(...)] attribute.")]
     public sealed class AnnotateWithValueRange : AnnotateWithCodeAnnotation
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/CollectionAllItemsNotNull.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/CollectionAllItemsNotNull.cs
@@ -14,7 +14,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: all collection items are not null" + ZoneMarker.Suffix,
         Description = "Adds a contract that all collection items (or dictionary values) are not null.")]
     public sealed class CollectionAllItemsNotNull : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/CollectionCountPositive.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/CollectionCountPositive.cs
@@ -12,7 +12,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: collection is not empty" + ZoneMarker.Suffix,
         Description = "Adds a contract that the collection is not empty.")]
     public sealed class CollectionCountPositive : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/DateTimeTimeOfDayZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/DateTimeTimeOfDayZero.cs
@@ -10,7 +10,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: date/time doesn't have a time part" + ZoneMarker.Suffix,
         Description = "Adds a contract that the date/time doesn't have a time part.")]
     public sealed class DateTimeTimeOfDayZero : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/EnumBetweenFirstAndLast.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/EnumBetweenFirstAndLast.cs
@@ -14,7 +14,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: enum value is within the valid enum range" + ZoneMarker.Suffix,
         Description = "Adds a contract that the enum value is within the valid enum range.")]
     public sealed class EnumBetweenFirstAndLast : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/EnumFlags.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/EnumFlags.cs
@@ -15,7 +15,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: enum value has the valid flags" + ZoneMarker.Suffix,
         Description = "Adds a contract that the enum value has the valid flags.")]
     public sealed class EnumFlags : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/EnumKnownValues.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/EnumKnownValues.cs
@@ -13,7 +13,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: enum value has valid values" + ZoneMarker.Suffix,
         Description = "Adds a contract that the enum value has the valid values.")]
     public sealed class EnumKnownValues : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/GuidNonEmpty.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/GuidNonEmpty.cs
@@ -10,7 +10,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: Guid is not empty" + ZoneMarker.Suffix,
         Description = "Adds a contract that the Guid is not empty.")]
     public sealed class GuidNonEmpty : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/IntPtrUIntPtrNonZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/IntPtrUIntPtrNonZero.cs
@@ -11,7 +11,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: IntPtr is not zero" + ZoneMarker.Suffix,
         Description = "Adds a contract that the IntPtr (or UIntPtr) value is not zero.")]
     public sealed class IntPtrUIntPtrNonZero : IntPtrUIntPtr
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/IntPtrUIntPtrZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/IntPtrUIntPtrZero.cs
@@ -11,7 +11,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: IntPtr is zero" + ZoneMarker.Suffix,
         Description = "Adds a contract that the IntPtr (or UIntPtr) value is zero.")]
     public sealed class IntPtrUIntPtrZero : IntPtrUIntPtr
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/NotNull.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/NotNull.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: a nullable value is not null" + ZoneMarker.Suffix,
         Description = "Adds a contract that a nullable value is not null.")]
     public sealed class NotNull : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/NumericPositive.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/NumericPositive.cs
@@ -8,7 +8,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: number is positive" + ZoneMarker.Suffix,
         Description = "Adds a contract that a number is greater than 0.")]
     public sealed class NumericPositive : Numeric
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/NumericZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/NumericZero.cs
@@ -9,7 +9,10 @@
 
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
-    [ContextAction(Group = "C#", Name = "Add contract: number is 0" + ZoneMarker.Suffix, Description = "Adds a contract that a number is 0.")]
+    [ContextAction(
+        GroupType = typeof(CSharpContextActions),
+        Name = "Add contract: number is 0" + ZoneMarker.Suffix,
+        Description = "Adds a contract that a number is 0.")]
     public sealed class NumericZero : Numeric
     {
         public NumericZero([NotNull] ICSharpContextActionDataProvider provider) : base(provider) { }
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericNegative.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericNegative.cs
@@ -8,7 +8,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: number is negative" + ZoneMarker.Suffix,
         Description = "Adds a contract that a number (signed) is less than 0.")]
     public sealed class SignedNumericNegative : SignedNumeric
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericNonZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericNonZero.cs
@@ -10,7 +10,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: number is not 0" + ZoneMarker.Suffix,
         Description = "Adds a contract that a number (signed) is not 0.")]
     public sealed class SignedNumericNonZero : SignedNumeric
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericZeroOrNegative.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericZeroOrNegative.cs
@@ -8,7 +8,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: number is zero or negative" + ZoneMarker.Suffix,
         Description = "Adds a contract that a number (signed) is less than or equal to 0.")]
     public sealed class SignedNumericZeroOrNegative : SignedNumeric
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericZeroOrPositive.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/SignedNumericZeroOrPositive.cs
@@ -8,7 +8,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: number is zero or positive" + ZoneMarker.Suffix,
         Description = "Adds a contract that a number (signed) is greater than or equal to 0.")]
     public sealed class SignedNumericZeroOrPositive : SignedNumeric
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/StringNotNullAndNotEmpty.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/StringNotNullAndNotEmpty.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: string is not null or empty" + ZoneMarker.Suffix,
         Description = "Adds a contract that a string is not null and not empty.")]
     public sealed class StringNotNullAndNotEmpty : AddContractContextAction
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanNegative.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanNegative.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: time span is negative" + ZoneMarker.Suffix,
         Description = "Adds a contract that a time span is less than zero.")]
     public sealed class TimeSpanNegative : TimeSpan
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanNonZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanNonZero.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: time span is not zero" + ZoneMarker.Suffix,
         Description = "Adds a contract that a time span is not zero.")]
     public sealed class TimeSpanNonZero : TimeSpan
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanPositive.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanPositive.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: time span is positive" + ZoneMarker.Suffix,
         Description = "Adds a contract that a time span is greater than zero.")]
     public sealed class TimeSpanPositive : TimeSpan
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanZero.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanZero.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: time span is zero" + ZoneMarker.Suffix,
         Description = "Adds a contract that a time span is zero.")]
     public sealed class TimeSpanZero : TimeSpan
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanZeroOrNegative.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanZeroOrNegative.cs
@@ -9,7 +9,7 @@
 namespace ReCommendedExtension.ContextActions.CodeContracts
 {
     [ContextAction(
-        Group = "C#",
+        GroupType = typeof(CSharpContextActions),
         Name = "Add contract: time span is zero or negative" + ZoneMarker.Suffix,
         Description = "Adds a contract that a time span is less than or equal to zero.")]
     public sealed class TimeSpanZeroOrNegative : TimeSpan
diff --git a/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanZeroOrPositive.cs b/Sources/ReCommendedExtension/ContextActions/CodeContracts/TimeSpanZeroOrPositive.cs
diff --git a/Sources/ReCommendedExtension/ContextActions/RemoveAssertNotNull.cs b/Sources/ReCommendedExtension/ContextActions/RemoveAssertNotNull.cs
diff --git a/Sources/ReCommendedExtension/ContextActions/SetLanguageInjection.cs b/Sources/ReCommendedExtension/ContextActions/SetLanguageInjection.cs
diff --git a/Sources/ReCommendedExtension/Properties/AssemblyInfo.cs b/Sources/ReCommendedExtension/Properties/AssemblyInfo.cs
diff --git a/Sources/ReCommendedExtension/ReCommendedExtension.csproj b/Sources/ReCommendedExtension/ReCommendedExtension.csproj

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ protected override bool HighlightingPredicate(IHighlighting highlighting, IPsiSo`
`17`	`17`	`=> highlighting is MissingSuppressionJustificationWarning;`
`18`	`18`
`19`	`19`	`[Test]`
`20`		`- [TestNetFramework47]`
`21`		`- [TestPackages("nunit")]`
	`20`	`+ [TestNetFramework46]`
	`21`	`+ [TestPackages("nunit/3.13.3")]`
`22`	`22`	`public void TestSuppressMessage_TestProject() => DoNamedTest2();`
`23`	`23`
`24`	`24`	`[Test]`
`25`		`- [TestNet50("nunit")]`
	`25`	`+ [TestNet50("nunit/3.13.3")]`
`26`	`26`	`public void TestSuppressMessage_TestProject_NET_5() => DoNamedTest2();`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ protected override bool HighlightingPredicate(IHighlighting highlighting, IPsiSo`
`17`	`17`	`=> highlighting is MissingSuppressionJustificationWarning;`
`18`	`18`
`19`	`19`	`[Test]`
`20`		`- [TestPackages("xunit.core")]`
	`20`	`+ [TestPackages("xunit.core/2.4.1")]`
`21`	`21`	`public void TestSuppressMessage_TestProject() => DoNamedTest2();`
`22`	`22`
`23`	`23`	`[Test]`
`24`		`- [TestNet50("xunit.core")]`
	`24`	`+ [TestNet50("xunit.core/2.4.1")]`
`25`	`25`	`public void TestSuppressMessage_TestProject_NET_5() => DoNamedTest2();`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace ReCommendedExtension.ContextActions`
`9`	`9`	`{`
`10`	`10`	`[ContextAction(`
`11`		`- Group = "C#",`
	`11`	`+ GroupType = typeof(CSharpContextActions),`
`12`	`12`	`Name = "Annotate parameter with [InstantHandle] attribute" + ZoneMarker.Suffix,`
`13`	`13`	`Description = "Annotates a parameter with the [InstantHandle] attribute.")]`
`14`	`14`	`public sealed class AnnotateWithInstantHandle : AnnotateWithCodeAnnotation`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`namespace ReCommendedExtension.ContextActions`
`11`	`11`	`{`
`12`	`12`	`[ContextAction(`
`13`		`- Group = "C#",`
	`13`	`+ GroupType = typeof(CSharpContextActions),`
`14`	`14`	`Name = "Annotate with [ItemNotNull] attribute" + ZoneMarker.Suffix,`
`15`	`15`	`Description = "Annotates with the [ItemNotNull] attribute.")]`
`16`	`16`	`public sealed class AnnotateWithItemNotNull : AnnotateWithCodeAnnotation`