|
|
|
|
@ -22,12 +22,12 @@ using System.Linq;
@@ -22,12 +22,12 @@ using System.Linq;
|
|
|
|
|
|
|
|
|
|
using ICSharpCode.Decompiler.CSharp; |
|
|
|
|
using ICSharpCode.Decompiler.CSharp.OutputVisitor; |
|
|
|
|
using ICSharpCode.Decompiler.CSharp.Resolver; |
|
|
|
|
using ICSharpCode.Decompiler.CSharp.Syntax; |
|
|
|
|
using ICSharpCode.Decompiler.IL; |
|
|
|
|
using ICSharpCode.Decompiler.Semantics; |
|
|
|
|
using ICSharpCode.Decompiler.TypeSystem; |
|
|
|
|
using ICSharpCode.Decompiler.TypeSystem.Implementation; |
|
|
|
|
using ICSharpCode.Decompiler.Util; |
|
|
|
|
|
|
|
|
|
namespace ICSharpCode.Decompiler |
|
|
|
|
{ |
|
|
|
|
@ -255,7 +255,7 @@ namespace ICSharpCode.Decompiler
@@ -255,7 +255,7 @@ namespace ICSharpCode.Decompiler
|
|
|
|
|
} |
|
|
|
|
if (braceLevelWithinType >= 0 || nodeStack.Peek() is TypeDeclaration) |
|
|
|
|
braceLevelWithinType++; |
|
|
|
|
if (nodeStack.OfType<BlockStatement>().Count() <= 1 || settings.FoldBraces) |
|
|
|
|
if (nodeStack.PeekOrDefault() is TypeDeclaration or BlockStatement { Parent: EntityDeclaration or LocalFunctionDeclarationStatement or AnonymousMethodExpression or LambdaExpression } || settings.FoldBraces) |
|
|
|
|
{ |
|
|
|
|
output.MarkFoldStart(defaultCollapsed: !settings.ExpandMemberDefinitions && braceLevelWithinType == 1, isDefinition: braceLevelWithinType == 1); |
|
|
|
|
} |
|
|
|
|
@ -265,7 +265,7 @@ namespace ICSharpCode.Decompiler
@@ -265,7 +265,7 @@ namespace ICSharpCode.Decompiler
|
|
|
|
|
output.Write('}'); |
|
|
|
|
if (role != Roles.RBrace) |
|
|
|
|
break; |
|
|
|
|
if (nodeStack.OfType<BlockStatement>().Count() <= 1 || settings.FoldBraces) |
|
|
|
|
if (nodeStack.PeekOrDefault() is TypeDeclaration or BlockStatement { Parent: EntityDeclaration or LocalFunctionDeclarationStatement or AnonymousMethodExpression or LambdaExpression } || settings.FoldBraces) |
|
|
|
|
output.MarkFoldEnd(); |
|
|
|
|
if (braceLevelWithinType >= 0) |
|
|
|
|
braceLevelWithinType--; |
|
|
|
|
|