From 7431ffe93744df28edd77fcd94d57148a562e9d0 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Mon, 6 Aug 2018 23:31:37 +0200
Subject: [PATCH] Extend ShowDeclaringType option to nested types.

---
 ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs | 4 +++-
 ICSharpCode.Decompiler/Output/IAmbience.cs                    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
index 36e4afff4..98b4cf466 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs
@@ -186,7 +186,9 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
 		{
 			TypeSystemAstBuilder astBuilder = CreateAstBuilder();
 			EntityDeclaration node = astBuilder.ConvertEntity(typeDef);
-			if (typeDef.DeclaringTypeDefinition != null) {
+			if (typeDef.DeclaringTypeDefinition != null && 
+				((ConversionFlags & ConversionFlags.ShowDeclaringType) == ConversionFlags.ShowDeclaringType ||
+				(ConversionFlags & ConversionFlags.UseFullyQualifiedEntityNames) == ConversionFlags.UseFullyQualifiedEntityNames)) {
 				WriteTypeDeclarationName(typeDef.DeclaringTypeDefinition, writer, formattingPolicy);
 				writer.WriteToken(Roles.Dot, ".");
 			} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedEntityNames) == ConversionFlags.UseFullyQualifiedEntityNames) {
diff --git a/ICSharpCode.Decompiler/Output/IAmbience.cs b/ICSharpCode.Decompiler/Output/IAmbience.cs
index 562f93372..fa6f8d0f6 100644
--- a/ICSharpCode.Decompiler/Output/IAmbience.cs
+++ b/ICSharpCode.Decompiler/Output/IAmbience.cs
@@ -45,7 +45,7 @@ namespace ICSharpCode.Decompiler.Output
 		/// </summary>
 		ShowDefinitionKeyword  = 8,
 		/// <summary>
-		/// Show the declaring type for the member
+		/// Show the declaring type for the type or member
 		/// </summary>
 		ShowDeclaringType = 0x10,
 		/// <summary>