Merge pull request #658 from rubberduck-vba/GrammarIsFun

retailcoder · retailcoder · commit b9001d22b144 · 2015-06-25T02:30:29.000-04:00
Fixed With block resolution
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceListener.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceListener.cs
@@ -173,6 +173,7 @@ public override void EnterWithStmt(VBAParser.WithStmtContext context)
             if (qualifier != null)
             {
                 qualifier.AddReference(reference);
+                _alreadyResolved.Add(reference.Context);
             }
             _withBlockQualifiers.Push(qualifier); // note: pushes null if unresolved
         }
@@ -601,7 +602,8 @@ public override void EnterICS_B_MemberProcedureCall(VBAParser.ICS_B_MemberProced
             if (_withBlockQualifiers.Any())
             {
                 parentType = _withBlockQualifiers.Peek();
-                parentScope = Resolve(context.implicitCallStmt_InStmt(), parentType, ContextAccessorType.GetValueOrReference);
+                parentScope = Resolve(context.implicitCallStmt_InStmt(), parentType, ContextAccessorType.GetValueOrReference)
+                            ?? Resolve(context.ambiguousIdentifier(), parentType);
                 parentType = ResolveType(parentScope);
             }
             if (parentType == null)

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ public override void EnterWithStmt(VBAParser.WithStmtContext context)`
`173`	`173`	`if (qualifier != null)`
`174`	`174`	`{`
`175`	`175`	`qualifier.AddReference(reference);`
	`176`	`+ _alreadyResolved.Add(reference.Context);`
`176`	`177`	`}`
`177`	`178`	`_withBlockQualifiers.Push(qualifier); // note: pushes null if unresolved`
`178`	`179`	`}`
`@@ -601,7 +602,8 @@ public override void EnterICS_B_MemberProcedureCall(VBAParser.ICS_B_MemberProced`
`601`	`602`	`if (_withBlockQualifiers.Any())`
`602`	`603`	`{`
`603`	`604`	`parentType = _withBlockQualifiers.Peek();`
`604`		`- parentScope = Resolve(context.implicitCallStmt_InStmt(), parentType, ContextAccessorType.GetValueOrReference);`
	`605`	`+ parentScope = Resolve(context.implicitCallStmt_InStmt(), parentType, ContextAccessorType.GetValueOrReference)`
	`606`	`+ ?? Resolve(context.ambiguousIdentifier(), parentType);`
`605`	`607`	`parentType = ResolveType(parentScope);`
`606`	`608`	`}`
`607`	`609`	`if (parentType == null)`