added DeclarationFinderTests (failing/ignored)

Author: retailcoder

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -157,7 +157,6 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
                 implementableMembers.ToDictionary(item => item.Context, item => item.Members)), true);
         }
 
-        private QualifiedSelection _lastSelection;
         public Declaration FindSelectedDeclaration(ICodePane activeCodePane)
         {
             if (activeCodePane == null || activeCodePane.IsWrappingNullReference)
@@ -171,7 +170,6 @@ public Declaration FindSelectedDeclaration(ICodePane activeCodePane)
                 return null;
             }
 
-            _lastSelection = qualifiedSelection.Value;
             var selection = qualifiedSelection.Value.Selection;
 
             // statistically we'll be on an IdentifierReference more often than on a Declaration:

Rubberduck.VBEEditor/Selection.cs

@@ -4,6 +4,8 @@ namespace Rubberduck.VBEditor
 {
     public struct Selection : IEquatable<Selection>, IComparable<Selection>
     {
+        public Selection(int line, int column) : this(line, column, line, column) { }
+
         public Selection(int startLine, int startColumn, int endLine, int endColumn)
         {
             _startLine = startLine;

RubberduckTests/RubberduckTests.csproj

@@ -102,6 +102,7 @@
     <Compile Include="SmartIndenter\VerticalSpacingTests.cs" />
     <Compile Include="Symbols\AccessibilityCheckTests.cs" />
     <Compile Include="Symbols\ClassModuleDeclarationTests.cs" />
+    <Compile Include="Symbols\DeclarationFinderTests.cs" />
     <Compile Include="Symbols\ProjectDeclarationTests.cs" />
     <Compile Include="Symbols\ConstantDeclarationTests.cs" />
     <Compile Include="Symbols\ProceduralModuleDeclarationTests.cs" />

RubberduckTests/Symbols/DeclarationFinderTests.cs

@@ -0,0 +1,71 @@
+using System.Linq;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.VBA;
+using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.SafeComWrappers;
+using RubberduckTests.Mocks;
+
+namespace RubberduckTests.Symbols
+{
+    [TestClass]
+    public class DeclarationFinderTests
+    {
+        [TestMethod]
+        [Ignore] // ref. https://github.com/rubberduck-vba/Rubberduck/issues/2330
+        public void FiendishlyAmbiguousNameSelectsSmallestScopedDeclaration()
+        {
+            var code = @"
+Option Explicit
+
+Public Sub foo()
+    Dim foo As Long
+    foo = 42
+    Debug.Print foo
+End Sub
+";
+            var vbe = new MockVbeBuilder()
+                .ProjectBuilder("foo", ProjectProtection.Unprotected)
+                .AddComponent("foo", ComponentType.StandardModule, code, new Selection(6, 6))
+                .MockVbeBuilder()
+                .Build();
+
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState(vbe.Object));
+            parser.Parse(new CancellationTokenSource());
+
+            var expected = parser.State.AllDeclarations.Single(item => item.DeclarationType == DeclarationType.Variable);
+            var actual = parser.State.DeclarationFinder.FindSelectedDeclaration(vbe.Object.ActiveCodePane);
+
+            Assert.AreEqual(expected, actual, "Expected {0}, resolved to {1}", expected.DeclarationType, actual.DeclarationType);
+        }
+
+        [TestMethod]
+        [Ignore] // bug: this test should pass... it's not all that evil
+        public void AmbiguousNameSelectsSmallestScopedDeclaration()
+        {
+            var code = @"
+Option Explicit
+
+Public Sub foo()
+    Dim foo As Long
+    foo = 42
+    Debug.Print foo
+End Sub
+";
+            var vbe = new MockVbeBuilder()
+                .ProjectBuilder("TestProject", ProjectProtection.Unprotected)
+                .AddComponent("TestModule", ComponentType.StandardModule, code, new Selection(6, 6))
+                .MockVbeBuilder()
+                .Build();
+
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState(vbe.Object));
+            parser.Parse(new CancellationTokenSource());
+
+            var expected = parser.State.AllDeclarations.Single(item => item.DeclarationType == DeclarationType.Variable);
+            var actual = parser.State.DeclarationFinder.FindSelectedDeclaration(vbe.Object.ActiveCodePane);
+
+            Assert.AreEqual(expected, actual, "Expected {0}, resolved to {1}", expected.DeclarationType, actual.DeclarationType);
+        }
+    }
+}