From 7f697b373bba0ad012b9e83301197df228e7adc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Fri, 21 Oct 2011 15:58:22 +0200 Subject: [PATCH] Fixed resolver usage. --- .../Completion/CSharpCompletionEngine.cs | 4 ++-- .../Completion/CSharpCompletionEngineBase.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs index 78c9320a33..d5b01ed744 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs @@ -386,11 +386,11 @@ namespace ICSharpCode.NRefactory.CSharp.Completion nodes.Add (n.Parent); var navigator = new NodeListResolveVisitorNavigator (nodes); var visitor = new ResolveVisitor (csResolver, identifierStart.Item1, navigator); - identifierStart.Item3.AcceptVisitor (visitor, null); + visitor.Scan (identifierStart.Item3); csResolver = visitor.GetResolverStateBefore (n); // add attribute properties. if (n.Parent is ICSharpCode.NRefactory.CSharp.Attribute) { - var resolved = visitor.Resolve (n.Parent); + var resolved = visitor.GetResolveResult (n.Parent); if (resolved != null && resolved.Type != null) { foreach (var property in resolved.Type.GetProperties (ctx).Where (p => p.Accessibility == Accessibility.Public)) { contextList.AddMember (property); diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs index 9c9ad3ea98..1212ee28bf 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs @@ -339,9 +339,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion var csResolver = new CSharpResolver (ctx, System.Threading.CancellationToken.None); var navigator = new NodeListResolveVisitorNavigator (new[] { resolveNode }); var visitor = new ResolveVisitor (csResolver, file, navigator); - unit.AcceptVisitor (visitor, null); - var result = visitor.Resolve (resolveNode); + visitor.Scan (unit); var state = visitor.GetResolverStateBefore (resolveNode); + var result = visitor.GetResolveResult (resolveNode); return Tuple.Create (result, state); } #endregion