Extend ShowDeclaringType option to nested types.

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) {

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>