Merge pull request #5559 from retailcoder/vbump251

retailcoder · web-flow · commit e402465000b3 · 2020-08-22T18:16:39.000-04:00
Changes build version to 2.5.1.x
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ShadowedDeclarationInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ShadowedDeclarationInspection.cs
@@ -263,15 +263,15 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi
 
             // It is not possible to directly access any declarations placed inside a Document Module. (Document Modules have DeclarationType ClassMoodule.)
             if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&
-                originalDeclaration.DeclarationType != DeclarationType.Document && 
+                originalDeclaration.DeclarationType != DeclarationType.Document &&
                 originalDeclarationEnclosingType == ComponentType.Document)
             {
                 return false;
             }
 
-            // It is not possible to directly access any declarations placed inside a User Form. (User Forms have DeclarationType ClassMoodule.)
+            // It is not possible to directly access any declarations placed inside a User Form.
             if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&
-                originalDeclaration.DeclarationType != DeclarationType.Document && 
+                originalDeclaration.DeclarationType != DeclarationType.Document &&
                 originalDeclarationEnclosingType == ComponentType.UserForm)
             {
                 return false;
@@ -312,10 +312,10 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi
         private static bool DeclarationInTheSameComponentCanBeShadowed(Declaration originalDeclaration, Declaration userDeclaration)
         {
             // Shadowing the component containing the declaration is not a problem, because it is possible to directly access declarations inside that component
-            if (originalDeclaration.DeclarationType == DeclarationType.ProceduralModule || 
+            if (originalDeclaration.DeclarationType == DeclarationType.ProceduralModule ||
                 originalDeclaration.DeclarationType == DeclarationType.ClassModule ||
                 originalDeclaration.DeclarationType == DeclarationType.Document ||
-                userDeclaration.DeclarationType == DeclarationType.ProceduralModule || 
+                userDeclaration.DeclarationType == DeclarationType.ProceduralModule ||
                 userDeclaration.DeclarationType == DeclarationType.ClassModule ||
                 userDeclaration.DeclarationType == DeclarationType.Document)
             {
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs
@@ -49,10 +49,11 @@ public CodeExplorerComponentViewModel(ICodeExplorerNode parent, Declaration decl
                                      Declaration.IsUserDefined &&
                                      Declaration.DeclarationType == DeclarationType.ClassModule &&
                                      Declaration.QualifiedName.QualifiedModuleName.ComponentType != ComponentType.Document &&
+                                     Declaration.QualifiedName.QualifiedModuleName.ComponentType != ComponentType.UserForm &&
                                      Declaration.Attributes.HasPredeclaredIdAttribute(out _);
 
         public bool IsTestModule => Declaration.DeclarationType == DeclarationType.ProceduralModule
-                                    && Declaration.Annotations.Any(annotation => annotation is TestModuleAnnotation);
+                                    && Declaration.Annotations.Any(annotation => annotation.Annotation is TestModuleAnnotation);
 
         public override void Synchronize(ref List<Declaration> updated)
         {
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -13,7 +13,7 @@
     <ApplicationIcon>Ducky.ico</ApplicationIcon>
     <!-- Give a fixed version to not blow XAML generated code to smithereens -->
     <!-- This also fixes "Input string was not in the correct format" error message when referring to the current assembly in an XAML-Namespace -->
-    <AssemblyVersion>2.5.0</AssemblyVersion>
+    <AssemblyVersion>2.5.1</AssemblyVersion>
   </PropertyGroup>
   <Import Project="..\RubberduckBaseProject.csproj" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">
diff --git a/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml b/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -398,7 +398,7 @@
 
         <TreeView x:Name="ProjectTree"
                   Grid.Row="2"
-                  Background="{StaticResource BackgroundLightBrush}"
+                  Background="{StaticResource BackgroundWhiteBrush}"
                   HorizontalContentAlignment="Stretch"
                   ItemsSource="{Binding Projects}"
                   ItemContainerStyle="{StaticResource TreeViewContainerStyle}"
diff --git a/Rubberduck.Core/UI/Converters/CodeExplorerNodeToIconConverter.cs b/Rubberduck.Core/UI/Converters/CodeExplorerNodeToIconConverter.cs
@@ -62,7 +62,7 @@ public class CodeExplorerNodeToIconConverter : ImageSourceConverter, IMultiValue
 
         public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if ((value as ICodeExplorerNode )?.Declaration is null)
+            if ((value as ICodeExplorerNode)?.Declaration is null)
             {
                 return NullIcon;
             }
@@ -93,19 +93,20 @@ public override object Convert(object value, Type targetType, object parameter,
                     }
 
                     if (component.Declaration is ClassModuleDeclaration classModule && 
-                        (classModule.IsInterface || classModule.Annotations.Any(annotation => annotation is InterfaceAnnotation)))
+                        (classModule.IsInterface || classModule.Annotations.Any(annotation => annotation.Annotation is InterfaceAnnotation)))
                     {
                         return InterfaceIcon;
                     }
 
+                    var isUserForm = component.Declaration.QualifiedModuleName.ComponentType == VBEditor.SafeComWrappers.ComponentType.UserForm; 
                     return DeclarationIcons.ContainsKey(component.Declaration.DeclarationType)
-                        ? DeclarationIcons[component.Declaration.DeclarationType]
+                        ? DeclarationIcons[isUserForm ? DeclarationType.UserForm : component.Declaration.DeclarationType]
                         : ExceptionIcon;
                 default:
                     return value is ICodeExplorerNode node &&
                            node.Declaration != null &&
                            DeclarationIcons.ContainsKey(node.Declaration.DeclarationType)
-                        ? node.Declaration.Annotations.Any(a => a is TestMethodAnnotation)
+                        ? node.Declaration.Annotations.Any(a => a.Annotation is TestMethodAnnotation)
                             ? TestMethodIcon
                             : DeclarationIcons[node.Declaration.DeclarationType]
                         : ExceptionIcon;
diff --git a/Rubberduck.Core/UI/Styles/LightBlueTheme.xaml b/Rubberduck.Core/UI/Styles/LightBlueTheme.xaml
@@ -31,12 +31,13 @@
     <Color x:Key="CaptionHyperlinkVisitedColor">#FFFF0000</Color>
     <Color x:Key="BackgroundDarkColor">#FFA9A9A9</Color>
     <Color x:Key="BackgroundLightColor">#FFF5F5F5</Color>
+    <Color x:Key="BackgroundWhiteColor">#FFFFFFFF</Color>
     <Color x:Key="BackgroundSoftColor">#FFF8F8FF</Color>
     <Color x:Key="HeaderBackgroundDarkColor">#FFA9A9A9</Color>
     <Color x:Key="TabSelectionUnderlineColor">#FF0000FF</Color>
     <Color x:Key="GrayColor">#FF696969</Color>
-    <Color x:Key="BlackColor">#FFFFFFFF</Color>
-    <Color x:Key="WhiteColor">#FF000000</Color>
+    <Color x:Key="BlackColor">#FFFFFFFF</Color> <!-- FIXME white is black... -->
+    <Color x:Key="WhiteColor">#FF000000</Color> <!-- FIXME black is white... -->
     <Color x:Key="BusyIndicatorFillColor">#FF00569A</Color>
 
     <Color x:Key="ToolBarButtonHoverColor">#210080FF</Color>
diff --git a/Rubberduck.Core/UI/ViewModelBase.cs b/Rubberduck.Core/UI/ViewModelBase.cs
@@ -51,9 +51,13 @@ protected virtual void OnErrorsChanged(string propertyName = null)
 
         public IEnumerable GetErrors(string propertyName)
         {
-            return _errors.TryGetValue(propertyName, out var errorList)
-                ? errorList
-                : null;
+            if (propertyName != null)
+            {
+                return _errors.TryGetValue(propertyName, out var errorList)
+                    ? errorList
+                    : null;
+            }
+            return null;
         }
 
         public bool HasErrors => _errors.Any();
diff --git a/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs b/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs
@@ -243,6 +243,7 @@ private IDictionary<ClassModuleDeclaration, List<Declaration>> FindAllInterfaceM
         {
             return UserDeclarations(DeclarationType.ClassModule)
                 .Concat(UserDeclarations(DeclarationType.Document))
+                .Concat(UserDeclarations(DeclarationType.UserForm))
                 .Cast<ClassModuleDeclaration>()
                 .Where(module => module.IsInterface)
                 .ToDictionary(
diff --git a/Rubberduck.Parsing/VBA/DeclarationResolving/DeclarationResolveRunnerBase.cs b/Rubberduck.Parsing/VBA/DeclarationResolving/DeclarationResolveRunnerBase.cs
@@ -191,6 +191,7 @@ private ModuleDeclaration NewModuleDeclaration(
                         true,
                         moduleAnnotations,
                         moduleAttributes);
+
                 case ComponentType.ClassModule:
                     return new ClassModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
@@ -199,14 +200,16 @@ private ModuleDeclaration NewModuleDeclaration(
                         true,
                         moduleAnnotations,
                         moduleAttributes);
+
                 case ComponentType.Document:
                     return new DocumentModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
                         projectDeclaration,
                         qualifiedModuleName.ComponentName,
                         moduleAnnotations,
                         moduleAttributes);
-                default:
+
+                default: /*ComponentType.UserForm*/
                     return new ClassModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
                         projectDeclaration,
diff --git a/Rubberduck.Parsing/VBA/ReferenceManagement/CompilationPasses/TypeHierarchyPass.cs b/Rubberduck.Parsing/VBA/ReferenceManagement/CompilationPasses/TypeHierarchyPass.cs
@@ -33,6 +33,7 @@ public void Execute(IReadOnlyCollection<QualifiedModuleName> modules)
         {
             var toRelsolveSupertypesFor = _declarationFinder.UserDeclarations(DeclarationType.ClassModule)
                                             .Concat(_declarationFinder.UserDeclarations(DeclarationType.Document))
+                                            .Concat(_declarationFinder.UserDeclarations(DeclarationType.UserForm))
                                             .Where(decl => modules.Contains(decl.QualifiedName.QualifiedModuleName))
                                             .Concat(_declarationFinder.BuiltInDeclarations(DeclarationType.ClassModule));
             foreach (var declaration in toRelsolveSupertypesFor)
diff --git a/RubberduckBaseProject.csproj b/RubberduckBaseProject.csproj
@@ -17,15 +17,15 @@
     <!-- Ignore MSB4011 warning, rationale above -->
     <!-- Ignore VisualStudio whining about the CodeAnalysis assembly changing (IDE1001) -->
     <DisabledWarnings>$(DisabledWarnings);4011;1001</DisabledWarnings>
-    <Version Condition=" '$(Version)' == ''">2.5.0</Version>
+    <Version Condition=" '$(Version)' == ''">2.5.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">
     <!--
      This assembly version specification is considered nonstandard.
      As such builds that do not override the assembly version generate a warning, which we ignore.
     -->
-    <AssemblyVersion>2.5.0.*</AssemblyVersion>
+    <AssemblyVersion>2.5.1.*</AssemblyVersion>
     <!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
     <!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
     <DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '2.5.0.{build}'
+version: '2.5.1.{build}'
 
 # add nuget api to hosts file, making sure we can actually nuget restore for the build
 hosts:

Original file line number	Diff line number	Diff line change
`@@ -263,15 +263,15 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi`
`263`	`263`
`264`	`264`	`// It is not possible to directly access any declarations placed inside a Document Module. (Document Modules have DeclarationType ClassMoodule.)`
`265`	`265`	`if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&`
`266`		`- originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`266`	`+ originalDeclaration.DeclarationType != DeclarationType.Document &&`
`267`	`267`	`originalDeclarationEnclosingType == ComponentType.Document)`
`268`	`268`	`{`
`269`	`269`	`return false;`
`270`	`270`	`}`
`271`	`271`
`272`		`- // It is not possible to directly access any declarations placed inside a User Form. (User Forms have DeclarationType ClassMoodule.)`
	`272`	`+ // It is not possible to directly access any declarations placed inside a User Form.`
`273`	`273`	`if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&`
`274`		`- originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`274`	`+ originalDeclaration.DeclarationType != DeclarationType.Document &&`
`275`	`275`	`originalDeclarationEnclosingType == ComponentType.UserForm)`
`276`	`276`	`{`
`277`	`277`	`return false;`
`@@ -312,10 +312,10 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi`
`312`	`312`	`private static bool DeclarationInTheSameComponentCanBeShadowed(Declaration originalDeclaration, Declaration userDeclaration)`
`313`	`313`	`{`
`314`	`314`	`// Shadowing the component containing the declaration is not a problem, because it is possible to directly access declarations inside that component`
`315`		`- if (originalDeclaration.DeclarationType == DeclarationType.ProceduralModule \|\|`
	`315`	`+ if (originalDeclaration.DeclarationType == DeclarationType.ProceduralModule \|\|`
`316`	`316`	`originalDeclaration.DeclarationType == DeclarationType.ClassModule \|\|`
`317`	`317`	`originalDeclaration.DeclarationType == DeclarationType.Document \|\|`
`318`		`- userDeclaration.DeclarationType == DeclarationType.ProceduralModule \|\|`
	`318`	`+ userDeclaration.DeclarationType == DeclarationType.ProceduralModule \|\|`
`319`	`319`	`userDeclaration.DeclarationType == DeclarationType.ClassModule \|\|`
`320`	`320`	`userDeclaration.DeclarationType == DeclarationType.Document)`
`321`	`321`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public class CodeExplorerNodeToIconConverter : ImageSourceConverter, IMultiValue`
`62`	`62`
`63`	`63`	`public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`64`	`64`	`{`
`65`		`- if ((value as ICodeExplorerNode )?.Declaration is null)`
	`65`	`+ if ((value as ICodeExplorerNode)?.Declaration is null)`
`66`	`66`	`{`
`67`	`67`	`return NullIcon;`
`68`	`68`	`}`
`@@ -93,19 +93,20 @@ public override object Convert(object value, Type targetType, object parameter,`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (component.Declaration is ClassModuleDeclaration classModule &&`
`96`		`- (classModule.IsInterface \|\| classModule.Annotations.Any(annotation => annotation is InterfaceAnnotation)))`
	`96`	`+ (classModule.IsInterface \|\| classModule.Annotations.Any(annotation => annotation.Annotation is InterfaceAnnotation)))`
`97`	`97`	`{`
`98`	`98`	`return InterfaceIcon;`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ var isUserForm = component.Declaration.QualifiedModuleName.ComponentType == VBEditor.SafeComWrappers.ComponentType.UserForm;`
`101`	`102`	`return DeclarationIcons.ContainsKey(component.Declaration.DeclarationType)`
`102`		`- ? DeclarationIcons[component.Declaration.DeclarationType]`
	`103`	`+ ? DeclarationIcons[isUserForm ? DeclarationType.UserForm : component.Declaration.DeclarationType]`
`103`	`104`	`: ExceptionIcon;`
`104`	`105`	`default:`
`105`	`106`	`return value is ICodeExplorerNode node &&`
`106`	`107`	`node.Declaration != null &&`
`107`	`108`	`DeclarationIcons.ContainsKey(node.Declaration.DeclarationType)`
`108`		`- ? node.Declaration.Annotations.Any(a => a is TestMethodAnnotation)`
	`109`	`+ ? node.Declaration.Annotations.Any(a => a.Annotation is TestMethodAnnotation)`
`109`	`110`	`? TestMethodIcon`
`110`	`111`	`: DeclarationIcons[node.Declaration.DeclarationType]`
`111`	`112`	`: ExceptionIcon;`
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ private IDictionary<ClassModuleDeclaration, List<Declaration>> FindAllInterfaceM`
`243`	`243`	`{`
`244`	`244`	`return UserDeclarations(DeclarationType.ClassModule)`
`245`	`245`	`.Concat(UserDeclarations(DeclarationType.Document))`
	`246`	`+ .Concat(UserDeclarations(DeclarationType.UserForm))`
`246`	`247`	`.Cast<ClassModuleDeclaration>()`
`247`	`248`	`.Where(module => module.IsInterface)`
`248`	`249`	`.ToDictionary(`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public void Execute(IReadOnlyCollection<QualifiedModuleName> modules)`
`33`	`33`	`{`
`34`	`34`	`var toRelsolveSupertypesFor = _declarationFinder.UserDeclarations(DeclarationType.ClassModule)`
`35`	`35`	`.Concat(_declarationFinder.UserDeclarations(DeclarationType.Document))`
	`36`	`+ .Concat(_declarationFinder.UserDeclarations(DeclarationType.UserForm))`
`36`	`37`	`.Where(decl => modules.Contains(decl.QualifiedName.QualifiedModuleName))`
`37`	`38`	`.Concat(_declarationFinder.BuiltInDeclarations(DeclarationType.ClassModule));`
`38`	`39`	`foreach (var declaration in toRelsolveSupertypesFor)`