From fa5e7e504551fe7ab549e2fa727637357e3761d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Wed, 26 Oct 2011 12:11:57 +0200 Subject: [PATCH] Fixed potential resolve issue. Note: That doesn't really fix the problem - only 90% of the cases. The partial class representation could need a change. --- .../Completion/CSharpCompletionEngine.cs | 4 +++- .../Completion/CSharpCompletionEngineBase.cs | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs index 0244fd0e02..cb2c268071 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs @@ -1217,7 +1217,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion { if (type == null || type.DeclaringType != null) return type; - var result = ctx.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameterCount, StringComparer.Ordinal); + var result = ctx.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameterCount, StringComparer.Ordinal) ?? type; + if (result.GetParts ().Count == 1) + return type; // Console.WriteLine ("result:"+ result); return result; } diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs index 0875495057..9c80de254e 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs @@ -203,8 +203,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion if (!didAppendSemicolon) wrapper.Append (';'); } - Console.WriteLine ("1111111111"); - Console.WriteLine (wrapper); } protected CompilationUnit ParseStub (string continuation, bool appendSemicolon = true)