Fix broken tests

Author: Hosch250

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -48,6 +48,25 @@ public static Selection GetVariableStmtContextSelection(this Declaration target)
                     statement.Stop.Line, statement.Stop.Column);
         }
 
+        /// <summary>
+        /// Returns the Selection of a ConstStmtContext.
+        /// </summary>
+        /// <exception cref="ArgumentException">Throws when target's DeclarationType is not Constant.</exception>
+        /// <param name="target"></param>
+        /// <returns></returns>
+        public static Selection GetConstStmtContextSelection(this Declaration target)
+        {
+            if (target.DeclarationType != DeclarationType.Constant)
+            {
+                throw new ArgumentException("Target DeclarationType is not Constant.", "target");
+            }
+
+            var statement = GetConstStmtContext(target);
+
+            return new Selection(statement.Start.Line, statement.Start.Column,
+                    statement.Stop.Line, statement.Stop.Column);
+        }
+
         /// <summary>
         /// Returns a VariableStmtContext.
         /// </summary>
@@ -70,6 +89,28 @@ public static VBAParser.VariableStmtContext GetVariableStmtContext(this Declarat
             return statement;
         }
 
+        /// <summary>
+        /// Returns a ConstStmtContext.
+        /// </summary>
+        /// <exception cref="ArgumentException">Throws when target's DeclarationType is not Constant.</exception>
+        /// <param name="target"></param>
+        /// <returns></returns>
+        public static VBAParser.ConstStmtContext GetConstStmtContext(this Declaration target)
+        {
+            if (target.DeclarationType != DeclarationType.Constant)
+            {
+                throw new ArgumentException("Target DeclarationType is not Constant.", "target");
+            }
+
+            var statement = target.Context.Parent as VBAParser.ConstStmtContext;
+            if (statement == null)
+            {
+                throw new MissingMemberException("Statement not found");
+            }
+
+            return statement;
+        }
+
         /// <summary>
         /// Returns whether a variable declaration statement contains multiple declarations in a single statement.
         /// </summary>

RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs

@@ -56,7 +56,7 @@ public RemoveUnusedDeclarationQuickFix(ParserRuleContext context, QualifiedSelec
 
         public override void Fix()
         {
-            if (_target.DeclarationType == DeclarationType.Variable)
+            if (_target.DeclarationType == DeclarationType.Variable || _target.DeclarationType == DeclarationType.Constant)
             {
                 RemoveVariable(_target);
             }
@@ -65,9 +65,7 @@ public override void Fix()
                 var module = Selection.QualifiedName.Component.CodeModule;
                 var selection = Selection.Selection;
 
-                var originalCodeLines = module.Lines[selection.StartLine, selection.LineCount]
-                    .Replace("\r\n", " ")
-                    .Replace("_", string.Empty);
+                var originalCodeLines = module.Lines[selection.StartLine, selection.LineCount];
 
                 var originalInstruction = Context.GetText();
                 module.DeleteLines(selection.StartLine, selection.LineCount);
@@ -84,14 +82,12 @@ private void RemoveVariable(Declaration target)
         {
             Selection selection;
             var declarationText = target.Context.GetText().Replace(" _" + Environment.NewLine, string.Empty);
-            var multipleDeclarations = target.HasMultipleDeclarationsInStatement();
-
-            var variableStmtContext = target.GetVariableStmtContext();
+            var multipleDeclarations = target.DeclarationType == DeclarationType.Variable && target.HasMultipleDeclarationsInStatement();
 
             if (!multipleDeclarations)
             {
-                declarationText = variableStmtContext.GetText().Replace(" _" + Environment.NewLine, string.Empty);
-                selection = target.GetVariableStmtContextSelection();
+                declarationText = GetStmtContext(target).GetText().Replace(" _" + Environment.NewLine, string.Empty);
+                selection = GetStmtContextSelection(target);
             }
             else
             {
@@ -107,7 +103,7 @@ private void RemoveVariable(Declaration target)
 
             if (multipleDeclarations)
             {
-                selection = target.GetVariableStmtContextSelection();
+                selection = GetStmtContextSelection(target);
                 newLines = RemoveExtraComma(codeModule.GetLines(selection).Replace(oldLines, newLines),
                     target.CountOfDeclarationsInStatement(), target.IndexOfVariableDeclarationInStatement());
             }
@@ -144,6 +140,20 @@ private void RemoveVariable(Declaration target)
             }
         }
 
+        private Selection GetStmtContextSelection(Declaration target)
+        {
+            return target.DeclarationType == DeclarationType.Variable
+                ? target.GetVariableStmtContextSelection()
+                : target.GetConstStmtContextSelection();
+        }
+
+        private ParserRuleContext GetStmtContext(Declaration target)
+        {
+            return target.DeclarationType == DeclarationType.Variable
+                ? (ParserRuleContext)target.GetVariableStmtContext()
+                : (ParserRuleContext)target.GetConstStmtContext();
+        }
+
         private string RemoveExtraComma(string str, int numParams, int indexRemoved)
         {
             // Example use cases for this method (fields and variables):