From 482d6dec9399646b93f291b58cbcbb33d18914f3 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Mon, 9 Jul 2018 17:46:12 +0200 Subject: [PATCH] Remove isIndexer parameter from PropertyToString, always use IProperty.IsIndexer --- ILSpy/Languages/CSharpLanguage.cs | 4 ++-- ILSpy/Languages/Language.cs | 2 +- ILSpy/SearchStrategies.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ILSpy/Languages/CSharpLanguage.cs b/ILSpy/Languages/CSharpLanguage.cs index a8e7954aa..cc84718d7 100644 --- a/ILSpy/Languages/CSharpLanguage.cs +++ b/ILSpy/Languages/CSharpLanguage.cs @@ -440,12 +440,12 @@ namespace ICSharpCode.ILSpy return TypeToStringInternal(field.DeclaringTypeDefinition, includeNamespace) + "." + simple; } - public override string PropertyToString(IProperty property, bool includeTypeName, bool includeNamespace, bool? isIndexer = null) + public override string PropertyToString(IProperty property, bool includeTypeName, bool includeNamespace) { if (property == null) throw new ArgumentNullException(nameof(property)); var buffer = new System.Text.StringBuilder(); - if (isIndexer.Value) { + if (property.IsIndexer) { if (property.IsExplicitInterfaceImplementation) { string name = property.Name; int index = name.LastIndexOf('.'); diff --git a/ILSpy/Languages/Language.cs b/ILSpy/Languages/Language.cs index 3763abeff..20d258f99 100644 --- a/ILSpy/Languages/Language.cs +++ b/ILSpy/Languages/Language.cs @@ -180,7 +180,7 @@ namespace ICSharpCode.ILSpy return GetDisplayName(field, includeTypeName, includeNamespace) + " : " + TypeToString(field.ReturnType, includeNamespace); } - public virtual string PropertyToString(IProperty property, bool includeTypeName, bool includeNamespace, bool? isIndexer = null) + public virtual string PropertyToString(IProperty property, bool includeTypeName, bool includeNamespace) { if (property == null) throw new ArgumentNullException(nameof(property)); diff --git a/ILSpy/SearchStrategies.cs b/ILSpy/SearchStrategies.cs index 907d72145..0b1ea3f0c 100644 --- a/ILSpy/SearchStrategies.cs +++ b/ILSpy/SearchStrategies.cs @@ -167,7 +167,7 @@ namespace ICSharpCode.ILSpy case IField f: return language.FieldToString(f, fullName, fullName); case IProperty p: - return language.PropertyToString(p, fullName, fullName, p.IsIndexer); + return language.PropertyToString(p, fullName, fullName); case IMethod m: return language.MethodToString(m, fullName, fullName); case IEvent e: