From f159810013416a9124b185db14a3c443450a2a9b Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 26 Jan 2013 20:15:04 +0100 Subject: [PATCH] Remove unresolved references from new Alias*ResolveResult. --- .../Resolver/AliasNamespaceResolveResult.cs | 13 ++----------- .../Resolver/AliasTypeResolveResult.cs | 14 ++------------ .../TypeSystem/ResolvedUsingScope.cs | 4 ++-- .../TypeSystem/Implementation/SpecializedMethod.cs | 5 ----- 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/AliasNamespaceResolveResult.cs b/ICSharpCode.NRefactory.CSharp/Resolver/AliasNamespaceResolveResult.cs index ea3dfb3ae3..2d6dec1aea 100644 --- a/ICSharpCode.NRefactory.CSharp/Resolver/AliasNamespaceResolveResult.cs +++ b/ICSharpCode.NRefactory.CSharp/Resolver/AliasNamespaceResolveResult.cs @@ -1,4 +1,4 @@ -// +// // AliasResolveResult.cs // // Author: @@ -42,19 +42,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver get; private set; } - - /// - /// The namespace reference that was aliased. - /// - public TypeOrNamespaceReference Reference { - get; - private set; - } - public AliasNamespaceResolveResult(string alias, TypeOrNamespaceReference reference, NamespaceResolveResult underlyingResult) : base (underlyingResult.Namespace) + public AliasNamespaceResolveResult(string alias, NamespaceResolveResult underlyingResult) : base (underlyingResult.Namespace) { this.Alias = alias; - this.Reference = reference; } } } diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/AliasTypeResolveResult.cs b/ICSharpCode.NRefactory.CSharp/Resolver/AliasTypeResolveResult.cs index e76b9b1138..f7f639b48f 100644 --- a/ICSharpCode.NRefactory.CSharp/Resolver/AliasTypeResolveResult.cs +++ b/ICSharpCode.NRefactory.CSharp/Resolver/AliasTypeResolveResult.cs @@ -1,4 +1,4 @@ -// +// // AliasTypeResolveResult.cs // // Author: @@ -44,19 +44,9 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver private set; } - /// - /// The type reference that was aliased. - /// - public TypeOrNamespaceReference Reference { - get; - private set; - } - - public AliasTypeResolveResult(string alias, TypeOrNamespaceReference reference, TypeResolveResult underlyingResult) : base (underlyingResult.Type) + public AliasTypeResolveResult(string alias, TypeResolveResult underlyingResult) : base (underlyingResult.Type) { this.Alias = alias; - this.Reference = reference; } } - } diff --git a/ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs b/ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs index 8503c6fb14..9ba5a6568c 100644 --- a/ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs +++ b/ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs @@ -118,9 +118,9 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem for (int i = 0; i < result.Count; i++) { var rr = usingScope.UsingAliases[i].Value.Resolve(resolver); if (rr is TypeResolveResult) { - rr = new AliasTypeResolveResult (usingScope.UsingAliases[i].Key, usingScope.UsingAliases[i].Value, (TypeResolveResult)rr); + rr = new AliasTypeResolveResult (usingScope.UsingAliases[i].Key, (TypeResolveResult)rr); } else if (rr is NamespaceResolveResult) { - rr = new AliasNamespaceResolveResult (usingScope.UsingAliases[i].Key, usingScope.UsingAliases[i].Value, (NamespaceResolveResult)rr); + rr = new AliasNamespaceResolveResult (usingScope.UsingAliases[i].Key, (NamespaceResolveResult)rr); } result[i] = new KeyValuePair( usingScope.UsingAliases[i].Key, diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs b/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs index 7405106203..3fc967abef 100644 --- a/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs +++ b/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs @@ -192,11 +192,6 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation } } - public IMethod GetDefinition () - { - return methodDefinition; - } - public override string ToString() { StringBuilder b = new StringBuilder("[");