Merge pull request #3252 from rkapka/rkapka-master

Introducing ShadowedDeclarationInspection

Author: retailcoder

Rubberduck.Inspections/Concrete/IntegerDataTypeInspection.cs

@@ -40,9 +40,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
                 .Select(issue =>
                     new DeclarationInspectionResult(this,
                         string.Format(InspectionsUI.IntegerDataTypeInspectionResultFormat,
-                            RubberduckUI.ResourceManager.GetString("DeclarationType_" + issue.DeclarationType,
-                                CultureInfo.CurrentUICulture),
-                            issue.IdentifierName),
+                            RubberduckUI.ResourceManager.GetString("DeclarationType_" + issue.DeclarationType, CultureInfo.CurrentUICulture), issue.IdentifierName),
                         issue));
 
             return result;

Rubberduck.Inspections/Concrete/ShadowedDeclarationInspection.cs

@@ -68,7 +68,6 @@ public void Fix(IInspectionResult result)
                             rewriter.Replace(
                                 userDefinedTypeMemberContext.reservedNameMemberDeclaration().asTypeClause().type(),
                                 Tokens.Long);
-
                         }
                         else
                         {
@@ -87,9 +86,7 @@ public void Fix(IInspectionResult result)
             switch (result.Target.DeclarationType)
             {
                 case DeclarationType.Parameter:
-                    matchingInterfaceMemberContext =
-                        interfaceMembers.Select(member => member.Context)
-                            .FirstOrDefault(c => c == result.Context.Parent.Parent);
+                    matchingInterfaceMemberContext = interfaceMembers.Select(member => member.Context).FirstOrDefault(c => c == result.Context.Parent.Parent);
 
                     if (matchingInterfaceMemberContext != null)
                     {
@@ -127,9 +124,7 @@ public void Fix(IInspectionResult result)
                     }
                     break;
                 case DeclarationType.Function:
-                    matchingInterfaceMemberContext =
-                        interfaceMembers.Select(member => member.Context)
-                            .FirstOrDefault(c => c == result.Context);
+                    matchingInterfaceMemberContext = interfaceMembers.Select(member => member.Context).FirstOrDefault(c => c == result.Context);
 
                     if (matchingInterfaceMemberContext != null)
                     {
@@ -156,9 +151,7 @@ public void Fix(IInspectionResult result)
                     }
                     break;
                 case DeclarationType.PropertyGet:
-                    matchingInterfaceMemberContext =
-                        interfaceMembers.Select(member => member.Context)
-                            .FirstOrDefault(c => c == result.Context);
+                    matchingInterfaceMemberContext = interfaceMembers.Select(member => member.Context).FirstOrDefault(c => c == result.Context);
 
                     if (matchingInterfaceMemberContext != null)
                     {

Rubberduck.Inspections/QuickFixes/ChangeIntegerToLongQuickFix.cs

@@ -69,6 +69,7 @@
     <Compile Include="Concrete\StopKeywordInspection.cs" />
     <Compile Include="Concrete\LineLabelNotUsedInspection.cs" />
     <Compile Include="Concrete\IntegerDataTypeInspection.cs" />
+    <Compile Include="Concrete\ShadowedDeclarationInspection.cs" />
     <Compile Include="ParseTreeListeners\AttributeAnnotationListener.cs" />
     <Compile Include="Concrete\ConstantNotUsedInspection.cs" />
     <Compile Include="Concrete\DefaultProjectNameInspection.cs" />

Rubberduck.Inspections/Rubberduck.Inspections.csproj

@@ -848,4 +848,13 @@ If the parameter can be null, ignore this inspection result; passing a null valu
   <data name="EmptyWhileWendBlockInspectionName" xml:space="preserve">
     <value>Empty While-Wend block</value>
   </data>
+  <data name="ShadowedDeclarationInspectionMeta" xml:space="preserve">
+    <value>Two declarations are in scope and have the same identifier name. This means that only one of them will be available to use.</value>
+  </data>
+  <data name="ShadowedDeclarationInspectionName" xml:space="preserve">
+    <value>Shadowed declaration</value>
+  </data>
+  <data name="ShadowedDeclarationInspectionResultFormat" xml:space="preserve">
+    <value>{0} '{1}' hides {2} '{3}'</value>
+  </data>
 </root>

Rubberduck.Parsing/Inspections/Resources/InspectionsUI.resx

@@ -865,6 +865,11 @@ public override void EnterEnumerationStmt_Constant(VBAParser.EnumerationStmt_Con
                 null));
         }
 
+        public override void EnterOptionPrivateModuleStmt(VBAParser.OptionPrivateModuleStmtContext context)
+        {
+            ((ProceduralModuleDeclaration) _moduleDeclaration).IsPrivateModule = true;
+        }
+
         private void AddDeclaration(Declaration declaration)
         {
             _createdDeclarations.Add(declaration);