Browse Source

* Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs: Respected the

aroundassignment option in more constructs.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3850 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 17 years ago
parent
commit
92086ff64b
  1. 64
      src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs

64
src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs

@ -263,9 +263,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
public override object TrackedVisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, object data) public override object TrackedVisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, object data)
{ {
outputFormatter.PrintIdentifier(namedArgumentExpression.Name); outputFormatter.PrintIdentifier(namedArgumentExpression.Name);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
TrackVisit(namedArgumentExpression.Expression, data); TrackVisit(namedArgumentExpression.Expression, data);
return null; return null;
} }
@ -279,9 +283,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.PrintIdentifier(@using.Name); outputFormatter.PrintIdentifier(@using.Name);
if (@using.IsAlias) { if (@using.IsAlias) {
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
TrackVisit(@using.Alias, data); TrackVisit(@using.Alias, data);
} }
@ -335,9 +343,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.Indent(); outputFormatter.Indent();
outputFormatter.PrintIdentifier(f.Name); outputFormatter.PrintIdentifier(f.Name);
if (f.Initializer != null && !f.Initializer.IsNull) { if (f.Initializer != null && !f.Initializer.IsNull) {
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
TrackVisit(f.Initializer, data); TrackVisit(f.Initializer, data);
} }
if (i < typeDeclaration.Children.Count - 1) { if (i < typeDeclaration.Children.Count - 1) {
@ -527,9 +539,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.PrintToken(Tokens.CloseSquareBracket); outputFormatter.PrintToken(Tokens.CloseSquareBracket);
} }
if (!variableDeclaration.Initializer.IsNull) { if (!variableDeclaration.Initializer.IsNull) {
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
TrackVisit(variableDeclaration.Initializer, data); TrackVisit(variableDeclaration.Initializer, data);
} }
return null; return null;
@ -604,9 +620,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.PrintIdentifier(eventDeclaration.Name); outputFormatter.PrintIdentifier(eventDeclaration.Name);
if (!eventDeclaration.Initializer.IsNull) { if (!eventDeclaration.Initializer.IsNull) {
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
TrackVisit(eventDeclaration.Initializer, data); TrackVisit(eventDeclaration.Initializer, data);
} }
@ -1071,9 +1091,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.Indent(); outputFormatter.Indent();
} }
TrackVisit(eraseStatement.Expressions[i], data); TrackVisit(eraseStatement.Expressions[i], data);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Null); outputFormatter.PrintToken(Tokens.Null);
outputFormatter.PrintToken(Tokens.Semicolon); outputFormatter.PrintToken(Tokens.Semicolon);
} }
@ -1696,9 +1720,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
} else { } else {
TrackVisit(forNextStatement.LoopVariableExpression, data); TrackVisit(forNextStatement.LoopVariableExpression, data);
} }
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
TrackVisit(forNextStatement.Start, data); TrackVisit(forNextStatement.Start, data);
outputFormatter.PrintToken(Tokens.Semicolon); outputFormatter.PrintToken(Tokens.Semicolon);
outputFormatter.Space(); outputFormatter.Space();
@ -2751,9 +2779,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.PrintToken(Tokens.Let); outputFormatter.PrintToken(Tokens.Let);
outputFormatter.Space(); outputFormatter.Space();
outputFormatter.PrintIdentifier(letClause.Identifier); outputFormatter.PrintIdentifier(letClause.Identifier);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
outputFormatter.PrintToken(Tokens.Assign); outputFormatter.PrintToken(Tokens.Assign);
outputFormatter.Space(); if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
return letClause.Expression.AcceptVisitor(this, data); return letClause.Expression.AcceptVisitor(this, data);
} }

Loading…
Cancel
Save