Browse Source

Fixed some completion tests.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
f3ea71ac68
  1. 6
      ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
  2. 7
      ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
  3. 2
      ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs

6
ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@ -1418,12 +1418,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
return Tuple.Create (tsvisitor.ParsedFile, (AstNode)expr, Unit); return Tuple.Create (tsvisitor.ParsedFile, (AstNode)expr, Unit);
} }
static void Print (AstNode node)
{
var v = new CSharpOutputVisitor (Console.Out, new CSharpFormattingOptions ());
node.AcceptVisitor (v, null);
}
Tuple<CSharpParsedFile, Expression, CompilationUnit> GetExpressionAtCursor () Tuple<CSharpParsedFile, Expression, CompilationUnit> GetExpressionAtCursor ()
{ {
if (currentMember == null && currentType == null) if (currentMember == null && currentType == null)

7
ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs

@ -340,10 +340,17 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
var navigator = new NodeListResolveVisitorNavigator (new[] { resolveNode }); var navigator = new NodeListResolveVisitorNavigator (new[] { resolveNode });
var visitor = new ResolveVisitor (csResolver, file, navigator); var visitor = new ResolveVisitor (csResolver, file, navigator);
visitor.Scan (unit); visitor.Scan (unit);
// Print (unit);
var state = visitor.GetResolverStateBefore (resolveNode); var state = visitor.GetResolverStateBefore (resolveNode);
var result = visitor.GetResolveResult (resolveNode); var result = visitor.GetResolveResult (resolveNode);
return Tuple.Create (result, state); return Tuple.Create (result, state);
} }
static void Print (AstNode node)
{
var v = new CSharpOutputVisitor (Console.Out, new CSharpFormattingOptions ());
node.AcceptVisitor (v, null);
}
#endregion #endregion
} }
} }

2
ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs

@ -119,7 +119,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
public ICompletionData CreateEntityCompletionData (ICSharpCode.NRefactory.TypeSystem.IEntity entity, string text) public ICompletionData CreateEntityCompletionData (ICSharpCode.NRefactory.TypeSystem.IEntity entity, string text)
{ {
return new CompletionData (entity.Name); return new CompletionData (text);
} }
public ICompletionData CreateTypeCompletionData (ICSharpCode.NRefactory.TypeSystem.IType type, string shortType) public ICompletionData CreateTypeCompletionData (ICSharpCode.NRefactory.TypeSystem.IType type, string shortType)

Loading…
Cancel
Save