From 23f118ac93119ddaee82f296099bd42e971e74af Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Mon, 16 Jul 2018 20:28:38 +0200
Subject: [PATCH] Fix incorrect display of constructors in tree view.

---
 ILSpy/Languages/CSharpLanguage.cs | 20 +++++++++++---------
 ILSpy/Languages/Language.cs       |  6 ++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ILSpy/Languages/CSharpLanguage.cs b/ILSpy/Languages/CSharpLanguage.cs
index db2cd4d2b..2f38c139b 100644
--- a/ILSpy/Languages/CSharpLanguage.cs
+++ b/ILSpy/Languages/CSharpLanguage.cs
@@ -502,18 +502,18 @@ namespace ICSharpCode.ILSpy
 			if (method == null)
 				throw new ArgumentNullException(nameof(method));
 			string name;
+			if (includeDeclaringTypeName) {
+				name = TypeToString(method.DeclaringTypeDefinition, includeNamespace: includeNamespaceOfDeclaringTypeName) + ".";
+			} else {
+				name = "";
+			}
 			if (method.IsConstructor) {
-				name = TypeToString(method.DeclaringTypeDefinition, includeNamespace: includeNamespaceOfDeclaringTypeName);
+				name += TypeToString(method.DeclaringTypeDefinition, false);
 			} else {
-				if (includeDeclaringTypeName) {
-					name = TypeToString(method.DeclaringTypeDefinition, includeNamespace: includeNamespaceOfDeclaringTypeName) + ".";
-				} else {
-					name = "";
-				}
 				name += method.Name;
 			}
 			int i = 0;
-			var buffer = new System.Text.StringBuilder(name);
+			var buffer = new StringBuilder(name);
 
 			if (method.TypeParameters.Count > 0) {
 				buffer.Append('<');
@@ -537,8 +537,10 @@ namespace ICSharpCode.ILSpy
 			}
 
 			buffer.Append(')');
-			buffer.Append(" : ");
-			buffer.Append(TypeToStringInternal(method.ReturnType, includeNamespace));
+			if (!method.IsConstructor) {
+				buffer.Append(" : ");
+				buffer.Append(TypeToStringInternal(method.ReturnType, includeNamespace));
+			}
 			return buffer.ToString();
 		}
 
diff --git a/ILSpy/Languages/Language.cs b/ILSpy/Languages/Language.cs
index 254d62b99..ebee994ec 100644
--- a/ILSpy/Languages/Language.cs
+++ b/ILSpy/Languages/Language.cs
@@ -221,8 +221,10 @@ namespace ICSharpCode.ILSpy
 				i++;
 			}
 			buffer.Append(')');
-			buffer.Append(" : ");
-			buffer.Append(TypeToString(method.ReturnType, includeNamespace));
+			if (!method.IsConstructor) {
+				buffer.Append(" : ");
+				buffer.Append(TypeToString(method.ReturnType, includeNamespace));
+			}
 			return buffer.ToString();
 		}