Merge pull request #4891 from Vogel612/fix/experimental-attribute-usage

Fixes experimental attribute usage and surfaces experimental features in general settings; see #4270

Author: retailcoder

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyCaseBlockInspection.cs

@@ -1,17 +1,18 @@
 using Antlr4.Runtime.Misc;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;
-using Rubberduck.Parsing.Common;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Common;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyCaseBlockInspection : ParseTreeInspectionBase
     {
         public EmptyCaseBlockInspection(RubberduckParserState state)

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyDoWhileBlockInspection.cs

@@ -8,10 +8,11 @@
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyDoWhileBlockInspection : ParseTreeInspectionBase
     {
         public EmptyDoWhileBlockInspection(RubberduckParserState state)

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyElseBlockInspection.cs

@@ -8,10 +8,11 @@
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyElseBlockInspection : ParseTreeInspectionBase
     {
         public EmptyElseBlockInspection(RubberduckParserState state)

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyForEachBlockInspection.cs

@@ -8,10 +8,11 @@
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyForEachBlockInspection : ParseTreeInspectionBase
     {
         public EmptyForEachBlockInspection(RubberduckParserState state)

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyForLoopBlockInspection.cs

@@ -8,10 +8,11 @@
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyForLoopBlockInspection : ParseTreeInspectionBase
     {
         public EmptyForLoopBlockInspection(RubberduckParserState state)

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyIfBlockInspection.cs

@@ -7,13 +7,14 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Resources.Inspections;
+using Rubberduck.Resources.Experimentals;
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyIfBlockInspection : ParseTreeInspectionBase
     {
         public EmptyIfBlockInspection(RubberduckParserState state)

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyWhileWendBlockInspection.cs

@@ -8,10 +8,11 @@
 using Rubberduck.Parsing.VBA;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Inspections.Concrete
 {
-    [Experimental]
+    [Experimental(nameof(ExperimentalNames.EmptyBlockInspections))]
     internal class EmptyWhileWendBlockInspection : ParseTreeInspectionBase
     {
         public EmptyWhileWendBlockInspection(RubberduckParserState state)

Rubberduck.Core/Settings/ExperimentalFeatures.cs

@@ -1,10 +1,10 @@
 using System.Xml.Serialization;
 using Rubberduck.UI;
-using Rubberduck.Resources;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Settings
 {
-    public class ExperimentalFeatures : ViewModelBase
+    public class ExperimentalFeature : ViewModelBase
     {
         private bool _isEnabled;
         public bool IsEnabled
@@ -30,7 +30,7 @@ public string Key
         }
 
         [XmlIgnore]
-        public string DisplayValue => Key == null ? string.Empty : RubberduckUI.ResourceManager.GetString(Key);
+        public string DisplayValue => Key == null ? string.Empty : ExperimentalNames.ResourceManager.GetString(Key);
 
         public override string ToString()
         {
@@ -39,7 +39,7 @@ public override string ToString()
 
         public override bool Equals(object obj)
         {
-            return obj is ExperimentalFeatures value &&
+            return obj is ExperimentalFeature value &&
                    value.IsEnabled == IsEnabled &&
                    value.Key == Key;
         }

Rubberduck.Core/Settings/GeneralSettings.cs

@@ -20,7 +20,7 @@ public interface IGeneralSettings
         bool UserEditedLogLevel { get; set; }
         int MinimumLogLevel { get; set; }
         bool SetDpiUnaware { get; set; }
-        List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; }
+        List<ExperimentalFeature> EnableExperimentalFeatures { get; set; }
     }
 
     [SettingsSerializeAs(SettingsSerializeAs.Xml)]
@@ -73,7 +73,7 @@ public int MinimumLogLevel
 
         public bool SetDpiUnaware { get; set; }
 
-        public List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeatures>();
+        public List<ExperimentalFeature> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeature>();
 
         public GeneralSettings()
         {

Rubberduck.Core/UI/Settings/GeneralSettings.xaml

@@ -240,7 +240,9 @@
                         </DataGrid.Columns>
                     </DataGrid>
                     <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ExperimentalFeatures}" FontWeight="SemiBold" />
-                    <Label Margin="5,0,0,5" FontWeight="Bold" Foreground="{x:Static SystemColors.HighlightTextBrush}">
+                    <Label Margin="5,0,0,5" FontWeight="Bold"
+                           Foreground="{x:Static SystemColors.InfoTextBrush}" 
+                           Background="{x:Static SystemColors.InfoBrush}">
                         <Label.Content>
                             <AccessText TextWrapping="Wrap" Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ExperimentalFeaturesWarning}"/>
                         </Label.Content>