Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into Issue1851

Hosch250 · Hosch250 · commit acee81352960 · 2016-06-17T16:57:58.000-05:00
diff --git a/RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs b/RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs
@@ -36,7 +36,9 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             }
 
             var matches = BuiltInDeclarations.Where(item =>
-                Targets.Contains(item.IdentifierName)).ToList();
+                        Targets.Contains(item.IdentifierName) &&
+                        item.ParentScope == "EXCEL.EXE;Excel._Global" &&
+                        item.AsTypeName == "Range").ToList();
 
             var issues = matches.Where(item => item.References.Any())
                 .SelectMany(declaration => declaration.References);
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -676,7 +676,7 @@
                                   IsCheckable="True" />
                         <MenuItem Name="SortBySelection"
                                   Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center" 
-                                  Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_BySelection}"
+                                  Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_ByCodeOrder}"
                                   IsChecked="{Binding SortBySelection, UpdateSourceTrigger=PropertyChanged}" 
                                   Command="{Binding SetSelectionSortCommand}"
                                   CommandParameter="{Binding ElementName=SortBySelection, Path=IsChecked}"
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1578,8 +1578,8 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="SortStyle_ByType" xml:space="preserve">
     <value>By type</value>
   </data>
-  <data name="SortStyle_BySelection" xml:space="preserve">
-    <value>By selection</value>
+  <data name="SortStyle_ByCodeOrder" xml:space="preserve">
+    <value>By code order</value>
   </data>
   <data name="CodeExplorer_RefreshComponent" xml:space="preserve">
     <value>Refresh component</value>
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerControl.xaml b/RetailCoder.VBE/UI/UnitTesting/TestExplorerControl.xaml
@@ -258,10 +258,10 @@
 
         <CollectionViewSource x:Key="ResultsByModule" Source="{Binding Model.Tests}">
             <CollectionViewSource.SortDescriptions>
-                <componentModel:SortDescription PropertyName="QualifiedMemberName.QualifiedModuleName.Name" />
+                <componentModel:SortDescription PropertyName="Declaration.QualifiedName.QualifiedModuleName.Name" />
             </CollectionViewSource.SortDescriptions>
             <CollectionViewSource.GroupDescriptions>
-                <PropertyGroupDescription PropertyName="QualifiedMemberName.QualifiedModuleName.Name" />
+                <PropertyGroupDescription PropertyName="Declaration.QualifiedName.QualifiedModuleName.Name" />
             </CollectionViewSource.GroupDescriptions>
         </CollectionViewSource>
 
@@ -584,7 +584,8 @@
                     <controls:GroupingGrid ItemsSource="{Binding Source={StaticResource ResultsByOutcome}}"
                                            SelectedItem="{Binding SelectedTest}"
                                            ShowGroupingItemCount="True"
-                                           Visibility="{Binding IsChecked, ElementName=GroupByOutcome, Converter={StaticResource BoolToVisibility}}" Margin="-1,0,1,0">
+                                           Visibility="{Binding IsChecked, ElementName=GroupByOutcome, Converter={StaticResource BoolToVisibility}}"
+                                           Margin="-1,0,1,0">
                         <DataGrid.Columns>
                             <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Outcome}">
                                 <DataGridTemplateColumn.CellTemplate>
@@ -612,8 +613,8 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_QualifiedModuleName}" Binding="{Binding QualifiedMemberName.QualifiedModuleName}" />
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_MethodName}" Binding="{Binding QualifiedMemberName.MemberName}" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_QualifiedModuleName}" Binding="{Binding Declaration.QualifiedName.QualifiedModuleName}" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_MethodName}" Binding="{Binding Declaration.QualifiedName.MemberName}" />
                             <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Message}" Binding="{Binding Result.Output}" Width="*" />
                             <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Duration}" Binding="{Binding Result.Duration, StringFormat={}{0}ms}" />
                         </DataGrid.Columns>
diff --git a/Rubberduck.Parsing/Binding/DefaultBindingContext.cs b/Rubberduck.Parsing/Binding/DefaultBindingContext.cs
@@ -119,6 +119,11 @@ private IExpressionBinding Visit(Declaration module, Declaration parent, VBAPars
             return new SimpleNameDefaultBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression, Identifier.GetName(expression.identifier()), statementContext);
         }
 
+        private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.IdentifierValueContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)
+        {
+            return new SimpleNameDefaultBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression, Identifier.GetName(expression), statementContext);
+        }
+
         private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.MemberAccessExprContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)
         {
             dynamic lExpression = expression.lExpression();
diff --git a/Rubberduck.Parsing/Symbols/ClassModuleDeclaration.cs b/Rubberduck.Parsing/Symbols/ClassModuleDeclaration.cs
@@ -104,6 +104,19 @@ public bool IsGlobalClassModule
                     attributeIsGlobalClassModule = value.Single() == "True";
                 }
                 _isGlobal = attributeIsGlobalClassModule;
+
+                if (!_isGlobal.Value)
+                {
+                    foreach (var type in Subtypes)
+                    {
+                        if (type is ClassModuleDeclaration && ((ClassModuleDeclaration) type).IsGlobalClassModule)
+                        {
+                            _isGlobal = true;
+                            break;
+                        }
+                    }
+                }
+
                 return _isGlobal.Value;
             }
         }
diff --git a/Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs b/Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs
@@ -207,6 +207,11 @@ public List<Declaration> GetDeclarationsForReference(Reference reference)
                     attributes.AddPredeclaredIdTypeAttribute();
                 }
 
+                if (typeAttributes.wTypeFlags.HasFlag(TYPEFLAGS.TYPEFLAG_FAPPOBJECT))
+                {
+                    attributes.AddGlobalClassAttribute();
+                }
+
                 Declaration moduleDeclaration;
                 switch (typeDeclarationType)
                 {
diff --git a/Rubberduck.Parsing/VBA/Attributes.cs b/Rubberduck.Parsing/VBA/Attributes.cs
@@ -39,5 +39,10 @@ public void AddPredeclaredIdTypeAttribute()
         {
             Add("VB_PredeclaredId", new[] {"True"});
         }
+
+        public void AddGlobalClassAttribute()
+        {
+            Add("VB_GlobalNamespace", new[] {"True"});
+        }
     }
 }
diff --git a/RubberduckTests/Grammar/ResolverTests.cs b/RubberduckTests/Grammar/ResolverTests.cs
@@ -1957,6 +1957,26 @@ End Sub
             Assert.AreEqual(4, declaration.References.Count());
         }
 
+        [TestMethod]
+        public void FieldLengthStmt_IsReferenceToLocalVariable()
+        {
+            // arrange
+            var code = @"
+Public Sub Test()
+    Const Len As Integer = 4
+    Dim a As String * Len
+End Sub
+";
+            // act
+            var state = Resolve(code);
+
+            // assert
+            var declaration = state.AllUserDeclarations.Single(item =>
+                item.DeclarationType == DeclarationType.Constant && item.IdentifierName == "Len");
+
+            Assert.AreEqual(1, declaration.References.Count());
+        }
+
         // Ignored because handling forms/hierarchies is an open issue.
         [Ignore]
         [TestMethod]

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`var matches = BuiltInDeclarations.Where(item =>`
`39`		`- Targets.Contains(item.IdentifierName)).ToList();`
	`39`	`+ Targets.Contains(item.IdentifierName) &&`
	`40`	`+ item.ParentScope == "EXCEL.EXE;Excel._Global" &&`
	`41`	`+ item.AsTypeName == "Range").ToList();`
`40`	`42`
`41`	`43`	`var issues = matches.Where(item => item.References.Any())`
`42`	`44`	`.SelectMany(declaration => declaration.References);`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,11 @@ private IExpressionBinding Visit(Declaration module, Declaration parent, VBAPars`
`119`	`119`	`return new SimpleNameDefaultBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression, Identifier.GetName(expression.identifier()), statementContext);`
`120`	`120`	`}`
`121`	`121`
	`122`	`+ private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.IdentifierValueContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)`
	`123`	`+ {`
	`124`	`+ return new SimpleNameDefaultBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression, Identifier.GetName(expression), statementContext);`
	`125`	`+ }`
	`126`	`+`
`122`	`127`	`private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.MemberAccessExprContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)`
`123`	`128`	`{`
`124`	`129`	`dynamic lExpression = expression.lExpression();`
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,11 @@ public List<Declaration> GetDeclarationsForReference(Reference reference)`
`207`	`207`	`attributes.AddPredeclaredIdTypeAttribute();`
`208`	`208`	`}`
`209`	`209`
	`210`	`+ if (typeAttributes.wTypeFlags.HasFlag(TYPEFLAGS.TYPEFLAG_FAPPOBJECT))`
	`211`	`+ {`
	`212`	`+ attributes.AddGlobalClassAttribute();`
	`213`	`+ }`
	`214`	`+`
`210`	`215`	`Declaration moduleDeclaration;`
`211`	`216`	`switch (typeDeclarationType)`
`212`	`217`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,10 @@ public void AddPredeclaredIdTypeAttribute()`
`39`	`39`	`{`
`40`	`40`	`Add("VB_PredeclaredId", new[] {"True"});`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ public void AddGlobalClassAttribute()`
	`44`	`+ {`
	`45`	`+ Add("VB_GlobalNamespace", new[] {"True"});`
	`46`	`+ }`
`42`	`47`	`}`
`43`	`48`	`}`