Browse Source

Fixed formatting tests.

pull/32/merge
Mike Krüger 12 years ago
parent
commit
37e401152f
  1. 3
      ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
  2. 8
      ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Expressions.cs

3
ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs

@ -176,7 +176,8 @@ namespace ICSharpCode.NRefactory.CSharp @@ -176,7 +176,8 @@ namespace ICSharpCode.NRefactory.CSharp
BlankLinesBetweenFields = 0,
BlankLinesBetweenEventFields = 0,
BlankLinesBetweenMembers = 1,
AlignToFirstIndexerParameter = true,
AlignToFirstMethodCallParameter = true,
KeepCommentsAtFirstColumn = true,
ChainedMethodCallWrapping = Wrapping.DoNotChange,
MethodCallArgumentWrapping = Wrapping.DoNotChange,

8
ICSharpCode.NRefactory.CSharp/Formatter/FormattingVisitor_Expressions.cs

@ -226,12 +226,18 @@ namespace ICSharpCode.NRefactory.CSharp @@ -226,12 +226,18 @@ namespace ICSharpCode.NRefactory.CSharp
bool wrapMethodCall = DoWrap(methodCallArgumentWrapping, rParToken, arguments.Count);
if (wrapMethodCall && arguments.Any()) {
if (newLineAferMethodCallOpenParentheses || !doAlignToFirstArgument) {
if (newLineAferMethodCallOpenParentheses) {
curIndent.Push(IndentType.Continuation);
foreach (var arg in arguments) {
FixStatementIndentation(arg.StartLocation);
}
curIndent.Pop();
} else if (!doAlignToFirstArgument) {
curIndent.Push(IndentType.Continuation);
foreach (var arg in arguments.Skip (1)) {
FixStatementIndentation(arg.StartLocation);
}
curIndent.Pop();
} else {
int extraSpaces = arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
curIndent.ExtraSpaces += extraSpaces;

Loading…
Cancel
Save