Browse Source

[Formatting] Added null check.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
6d1e90bdc6
  1. 20
      ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs

20
ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs

@ -863,10 +863,12 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} else { } else {
foreach (var arg in parameters) { foreach (var arg in parameters) {
if (methodCallArgumentWrapping == Wrapping.DoNotWrap) { if (arg.PrevSibling != null) {
ForceSpacesBeforeRemoveNewLines(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma); if (methodCallArgumentWrapping == Wrapping.DoNotWrap) {
} else { ForceSpacesBeforeRemoveNewLines(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma);
ForceSpacesBefore(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma); } else {
ForceSpacesBefore(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma);
}
} }
arg.AcceptVisitor(this); arg.AcceptVisitor(this);
} }
@ -1764,10 +1766,12 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} else { } else {
foreach (var arg in arguments) { foreach (var arg in arguments) {
if (methodCallArgumentWrapping == Wrapping.DoNotWrap) { if (arg.PrevSibling != null) {
ForceSpacesBeforeRemoveNewLines(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma); if (methodCallArgumentWrapping == Wrapping.DoNotWrap) {
} else { ForceSpacesBeforeRemoveNewLines(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma);
ForceSpacesBefore(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma); } else {
ForceSpacesBefore(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma);
}
} }
arg.AcceptVisitor(this); arg.AcceptVisitor(this);
} }

Loading…
Cancel
Save