fix wrong selection

Andrin Meier · Andrin Meier · commit c2812d99a459 · 2016-05-08T13:11:21.000+02:00
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
@@ -154,7 +154,7 @@ private void ResolveType(ParserRuleContext context, string expression)
             var boundExpression = _bindingService.ResolveType(_moduleDeclaration, _currentParent, expression);
             if (boundExpression != null)
             {
-                _boundExpressionVisitor.AddIdentifierReferences(boundExpression, (exprCtx, identifier, declaration) => CreateReference(context, identifier, declaration, RubberduckParserState.CreateBindingSelection(context, boundExpression.Context)));
+                _boundExpressionVisitor.AddIdentifierReferences(boundExpression, (exprCtx, identifier, declaration) => CreateReference(context, identifier, declaration, RubberduckParserState.CreateBindingSelection(context, exprCtx)));
             }
         }
 
@@ -447,9 +447,9 @@ public void Resolve(VBAParser.ForNextStmtContext context)
             if (firstExpression != null)
             {
                 // each iteration counts as an assignment
-                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context), true));
+                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx), true));
                 // each iteration also counts as a plain usage
-                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context)));
+                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx)));
             }
             for (int exprIndex = 1; exprIndex < context.valueStmt().Count; exprIndex++)
             {
@@ -463,9 +463,9 @@ public void Resolve(VBAParser.ForEachStmtContext context)
             if (firstExpression != null)
             {
                 // each iteration counts as an assignment
-                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context), true));
+                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx), true));
                 // each iteration also counts as a plain usage
-                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context)));
+                _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx)));
             }
 
             for (int exprIndex = 1; exprIndex < context.valueStmt().Count; exprIndex++)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private void ResolveType(ParserRuleContext context, string expression)`
`154`	`154`	`var boundExpression = _bindingService.ResolveType(_moduleDeclaration, _currentParent, expression);`
`155`	`155`	`if (boundExpression != null)`
`156`	`156`	`{`
`157`		`- _boundExpressionVisitor.AddIdentifierReferences(boundExpression, (exprCtx, identifier, declaration) => CreateReference(context, identifier, declaration, RubberduckParserState.CreateBindingSelection(context, boundExpression.Context)));`
	`157`	`+ _boundExpressionVisitor.AddIdentifierReferences(boundExpression, (exprCtx, identifier, declaration) => CreateReference(context, identifier, declaration, RubberduckParserState.CreateBindingSelection(context, exprCtx)));`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`@@ -447,9 +447,9 @@ public void Resolve(VBAParser.ForNextStmtContext context)`
`447`	`447`	`if (firstExpression != null)`
`448`	`448`	`{`
`449`	`449`	`// each iteration counts as an assignment`
`450`		`- _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context), true));`
	`450`	`+ _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx), true));`
`451`	`451`	`// each iteration also counts as a plain usage`
`452`		`- _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context)));`
	`452`	`+ _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx)));`
`453`	`453`	`}`
`454`	`454`	`for (int exprIndex = 1; exprIndex < context.valueStmt().Count; exprIndex++)`
`455`	`455`	`{`
`@@ -463,9 +463,9 @@ public void Resolve(VBAParser.ForEachStmtContext context)`
`463`	`463`	`if (firstExpression != null)`
`464`	`464`	`{`
`465`	`465`	`// each iteration counts as an assignment`
`466`		`- _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context), true));`
	`466`	`+ _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx), true));`
`467`	`467`	`// each iteration also counts as a plain usage`
`468`		`- _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], firstExpression.Context)));`
	`468`	`+ _boundExpressionVisitor.AddIdentifierReferences(firstExpression, (exprCtx, identifier, declaration) => CreateReference(context.valueStmt()[0], identifier, declaration, RubberduckParserState.CreateBindingSelection(context.valueStmt()[0], exprCtx)));`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`for (int exprIndex = 1; exprIndex < context.valueStmt().Count; exprIndex++)`