Merge pull request #1 from retailcoder/rubberduck-vba-next

Rubberduck vba next

Author: Andrin Meier

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -144,7 +144,7 @@ private void DeclareControlsAsMembers(VBComponent form)
             // using dynamic typing here, because not only MSForms could have a Controls collection (e.g. MS-Access forms are 'document' modules).
             foreach (var control in ((dynamic)designer).Controls)
             {
-                var declaration = new Declaration(_qualifiedName.QualifyMemberName(control.Name), _parentDeclaration, _currentScopeDeclaration, "Control", true, true, Accessibility.Public, DeclarationType.Control, null, Selection.Home);
+                var declaration = new Declaration(_qualifiedName.QualifyMemberName(control.Name), _parentDeclaration, _currentScopeDeclaration, "Control", true, true, Accessibility.Public, DeclarationType.Control, null, Selection.Home, false);
                 OnNewDeclaration(declaration);
             }
         }

Rubberduck.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rubberduck", "RetailCoder.VBE\Rubberduck.csproj", "{20589DE8-432E-4359-9232-69EB070B7185}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -40,9 +40,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubberduckTests", "RubberduckTests\RubberduckTests.csproj", "{ADADE971-75E3-40C4-8C19-AB7409372F2E}"
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64

RubberduckTests/Grammar/ResolverTests.cs

@@ -1445,5 +1445,42 @@ End Sub
 
             Assert.AreEqual(1, usages.Count());
         }
+
+        [TestMethod]
+        public void GivenControlDeclaration_ResolvesUsageInCodeBehind()
+        {
+            var code = @"
+Public Sub DoSomething()
+    TextBox1.Text = ""Test""
+End Sub
+";
+            var builder = new MockVbeBuilder();
+            var project = builder.ProjectBuilder("TestProject1", vbext_ProjectProtection.vbext_pp_none);
+            var form = project.MockUserFormBuilder("Form1", code).AddControl("TextBox1").Build();
+            project.AddComponent(form);
+            builder.AddProject(project.Build());
+            var vbe = builder.Build();
+
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
+
+            parser.Parse();
+            if (parser.State.Status == ParserState.ResolverError)
+            {
+                Assert.Fail("Parser state should be 'Ready', but returns '{0}'.", parser.State.Status);
+            }
+            if (parser.State.Status != ParserState.Ready)
+            {
+                Assert.Inconclusive("Parser state should be 'Ready', but returns '{0}'.", parser.State.Status);
+            }
+
+            var declaration = parser.State.AllUserDeclarations.Single(item =>
+                item.DeclarationType == DeclarationType.Control
+                && item.IdentifierName == "TextBox1");
+
+            var usages = declaration.References.Where(item =>
+                item.ParentNonScoping.IdentifierName == "DoSomething");
+
+            Assert.AreEqual(1, usages.Count());
+        }
     }
 }

RubberduckTests/Grammar/VBAParserTests.cs

@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Symbols;
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 
 namespace RubberduckTests.Grammar
 {
@@ -249,6 +250,22 @@ private Tuple<VBAParser, ParserRuleContext> Parse(string code)
             return Tuple.Create<VBAParser, ParserRuleContext>(parser, root);
         }
 
+        [TestMethod]
+        public void GivenIfElseBlock_ParsesElseBlockAsElseStatement()
+        {
+            var code = @"
+Private Sub DoSomething()
+    If Not True Then
+        Debug.Print False
+    Else
+        Debug.Print True
+    End If
+End Sub
+";
+            var parser = Parse(code);
+            AssertTree(parser.Item1, parser.Item2, "//ifElseBlockStmt", matches => matches.Count == 1);
+        }
+
         private void AssertTree(VBAParser parser, ParserRuleContext root, string xpath)
         {
             AssertTree(parser, root, xpath, matches => matches.Count >= 1);
@@ -257,7 +274,8 @@ private void AssertTree(VBAParser parser, ParserRuleContext root, string xpath)
         private void AssertTree(VBAParser parser, ParserRuleContext root, string xpath, Predicate<ICollection<IParseTree>> assertion)
         {
             var matches = new XPath(parser, xpath).Evaluate(root);
-            Assert.IsTrue(assertion(matches));
+            var actual = matches.Count;
+            Assert.IsTrue(assertion(matches), string.Format("{0} matches found.", actual));
         }
     }
 }

RubberduckTests/Mocks/MockUserFormBuilder.cs

@@ -16,7 +16,7 @@ public class MockUserFormBuilder
         private readonly Mock<VBComponent> _component;
         private readonly MockProjectBuilder _mockProjectBuilder;
         private readonly Mock<Controls> _vbControls;
-        private readonly ICollection<Mock<Control>> _controls = new List<Mock<Control>>();
+        private readonly ICollection<Control> _controls = new List<Control>();
 
         public MockUserFormBuilder(Mock<VBComponent> component, MockProjectBuilder mockProjectBuilder)
         {
@@ -40,7 +40,7 @@ public MockUserFormBuilder AddControl(string name)
             var control = new Mock<Control>();
             control.SetupProperty(m => m.Name, name);
 
-            _controls.Add(control);
+            _controls.Add(control.Object);
             return this;
         }
 
@@ -63,14 +63,15 @@ public MockProjectBuilder MockProjectBuilder()
         public Mock<VBComponent> Build()
         {
             var designer = CreateMockDesigner();
-            _component.SetupGet(m => m.Designer).Returns(() => designer);
+            _component.SetupGet(m => m.Designer).Returns(() => designer.Object);
 
             return _component;
         }
 
         private Mock<UserForm> CreateMockDesigner()
         {
             var result = new Mock<UserForm>();
+
             result.SetupGet(m => m.Controls).Returns(() => _vbControls.Object);
 
             return result;
@@ -82,7 +83,7 @@ private Mock<Controls> CreateControlsMock()
             result.Setup(m => m.GetEnumerator()).Returns(() => _controls.GetEnumerator());
             result.As<IEnumerable>().Setup(m => m.GetEnumerator()).Returns(() => _controls.GetEnumerator());
 
-            result.Setup(m => m.Item(It.IsAny<int>())).Returns<int>(index => _controls.ElementAt(index).Object);
+            result.Setup(m => m.Item(It.IsAny<int>())).Returns<int>(index => _controls.ElementAt(index));
             result.SetupGet(m => m.Count).Returns(_controls.Count);
             return result;
         }

RubberduckTests/RubberduckTests.csproj

@@ -44,6 +44,7 @@
     <Reference Include="LibGit2Sharp">
       <HintPath>..\packages\LibGit2Sharp.0.22.0-pre20150516171636\lib\net40\LibGit2Sharp.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Vbe.Interop, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>