From 74e7a2180c90a04166f6bf7091e832c33ac39f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Tue, 18 Sep 2012 10:33:25 +0200 Subject: [PATCH] Removed obsolete hack. --- .../CodeCompletion/CodeCompletionBugTests.cs | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs index 9269d10223..e6c38affee 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs @@ -153,36 +153,18 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion return new CompletionData (entity.Name); } - string GetShortType(IType type) - { - var dt = state.CurrentTypeDefinition; - var declaring = type.DeclaringType != null ? type.DeclaringType.GetDefinition() : null; - if (declaring != null) { - while (dt != null) { - if (dt.Equals(declaring)) { - builder.AlwaysUseShortTypeNames = true; - break; - } - dt = dt.DeclaringTypeDefinition; - } - } - var shortType = builder.ConvertType(type); - return shortType.GetText(); - } - - public ICompletionData CreateTypeCompletionData (ICSharpCode.NRefactory.TypeSystem.IType type, bool fullName, bool isInAttributeContext) { - string name = fullName ? GetShortType(type) : type.Name; + string name = fullName ? builder.ConvertType(type).GetText() : type.Name; if (isInAttributeContext && name.EndsWith("Attribute") && name.Length > "Attribute".Length) { name = name.Substring(0, name.Length - "Attribute".Length); } return new CompletionData (name); } + public ICompletionData CreateMemberCompletionData(IType type, IEntity member) { - string name = GetShortType(type); - Console.WriteLine("name:"+name); + string name = builder.ConvertType(type).GetText(); return new CompletionData (name + "."+ member.Name); }