Merge pull request #3416 from Vogel612/tech-debt

Removed obsolete `DeclarationType.ModuleOption`, fixed bug with cleanup of `VBProjects` event handlers.

Author: retailcoder

RetailCoder.VBE/API/VBA/Declaration.cs

@@ -56,7 +56,6 @@ internal Declaration(RubberduckDeclaration declaration)
                 { Parsing.Symbols.DeclarationType.Control, DeclarationType.Control },
                 { Parsing.Symbols.DeclarationType.UserForm, DeclarationType.UserForm },
                 { Parsing.Symbols.DeclarationType.Document, DeclarationType.Document },
-                { Parsing.Symbols.DeclarationType.ModuleOption, DeclarationType.ModuleOption },
                 { Parsing.Symbols.DeclarationType.Procedure, DeclarationType.Procedure },
                 { Parsing.Symbols.DeclarationType.Function, DeclarationType.Function },
                 { Parsing.Symbols.DeclarationType.PropertyGet, DeclarationType.PropertyGet },

RetailCoder.VBE/API/VBA/DeclarationType.cs

@@ -12,7 +12,6 @@ public enum DeclarationType
         Control, //= 1 << 3,
         UserForm,// = 1 << 4,
         Document,// = 1 << 5,
-        ModuleOption,// = 1 << 6,
         Procedure, //= 1 << 8,
         Function,// = 1 << 9,
         PropertyGet,// = 1 << 11,

RetailCoder.VBE/Refactorings/Rename/RenameModel.cs

@@ -40,7 +40,7 @@ public RenameModel(IVBE vbe, RubberduckParserState state, QualifiedSelection sel
         private void AcquireTarget(out Declaration target, QualifiedSelection selection)
         {
             target = _declarations
-                .Where(item => item.IsUserDefined && item.DeclarationType != DeclarationType.ModuleOption)
+                .Where(item => item.IsUserDefined)
                 .FirstOrDefault(item => item.IsSelected(selection) || item.References.Any(r => r.IsSelected(selection)));
         }
     }

RetailCoder.VBE/UI/FindSymbol/FindSymbolViewModel.cs

@@ -14,8 +14,7 @@ public class FindSymbolViewModel : INotifyPropertyChanged
     {
         private static readonly DeclarationType[] ExcludedTypes =
         {
-            DeclarationType.Control, 
-            DeclarationType.ModuleOption,
+            DeclarationType.Control,
             DeclarationType.Project
         };
 

Rubberduck.Inspections/Concrete/UseMeaningfulNameInspection.cs

@@ -32,7 +32,6 @@ public UseMeaningfulNameInspection(RubberduckParserState state, IPersistanceServ
 
         private static readonly DeclarationType[] IgnoreDeclarationTypes = 
         {
-            DeclarationType.ModuleOption,
             DeclarationType.BracketedExpression, 
             DeclarationType.LibraryFunction,
             DeclarationType.LibraryProcedure, 

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -467,7 +467,6 @@ internal set
             DeclarationType.LibraryProcedure,
             DeclarationType.LineLabel,
             DeclarationType.ProceduralModule,
-            DeclarationType.ModuleOption,
             DeclarationType.Project,
             DeclarationType.Procedure,
             DeclarationType.PropertyGet,

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -315,10 +315,7 @@ public Declaration FindSelectedDeclaration(ICodePane activeCodePane)
                     return ModuleDeclaration(qualifiedSelection.Value.QualifiedName);
 
                 case 1:
-                    var match = matches.Single();
-                    return match.DeclarationType == DeclarationType.ModuleOption
-                        ? match.ParentScopeDeclaration
-                        : match;
+                    return matches.Single();
 
                 default:
                     // they're sorted by type, so a local comes before the procedure it's in

Rubberduck.Parsing/Symbols/DeclarationType.cs

@@ -13,7 +13,6 @@ public enum DeclarationType
         ClassModule = 1 << 3 | Module,
         UserForm = 1 << 4 | ClassModule,
         Document = 1 << 5 | ClassModule,
-        ModuleOption = 1 << 6,
         Member = 1 << 7,
         Procedure = 1 << 8 | Member,
         Function = 1 << 9 | Member,

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -119,9 +119,9 @@ private void AddEventHandlers()
 
         private void RemoveEventHandlers()
         {
-            VBProjects.ProjectAdded += Sinks_ProjectAdded;
-            VBProjects.ProjectRemoved += Sinks_ProjectRemoved;
-            VBProjects.ProjectRenamed += Sinks_ProjectRenamed;
+            VBProjects.ProjectAdded -= Sinks_ProjectAdded;
+            VBProjects.ProjectRemoved -= Sinks_ProjectRemoved;
+            VBProjects.ProjectRenamed -= Sinks_ProjectRenamed;
             VBComponents.ComponentAdded -= Sinks_ComponentAdded;
             VBComponents.ComponentRemoved -= Sinks_ComponentRemoved;
             VBComponents.ComponentRenamed -= Sinks_ComponentRenamed;