Browse Source

Fix some formatting issues with the C# output visitor.

newNRvisualizers
Daniel Grunwald 15 years ago
parent
commit
b6c562e9c3
  1. 10
      ICSharpCode.NRefactory/CSharp/OutputVisitor/OutputVisitor.cs

10
ICSharpCode.NRefactory/CSharp/OutputVisitor/OutputVisitor.cs

@ -205,9 +205,11 @@ namespace ICSharpCode.NRefactory.CSharp
{ {
WriteSpecialsUpToRole(identifierRole ?? AstNode.Roles.Identifier); WriteSpecialsUpToRole(identifierRole ?? AstNode.Roles.Identifier);
if (IsKeyword(identifier, currentContainerNode)) { if (IsKeyword(identifier, currentContainerNode)) {
if (lastWritten == LastWritten.KeywordOrIdentifier)
Space(); // this space is not strictly required, so we call Space()
formatter.WriteToken("@"); formatter.WriteToken("@");
} else if (lastWritten == LastWritten.KeywordOrIdentifier) { } else if (lastWritten == LastWritten.KeywordOrIdentifier) {
formatter.Space(); formatter.Space(); // this space is strictly required, so we directly call the formatter
} }
formatter.WriteIdentifier(identifier); formatter.WriteIdentifier(identifier);
lastWritten = LastWritten.KeywordOrIdentifier; lastWritten = LastWritten.KeywordOrIdentifier;
@ -1097,6 +1099,7 @@ namespace ICSharpCode.NRefactory.CSharp
WriteModifiers(delegateDeclaration.ModifierTokens); WriteModifiers(delegateDeclaration.ModifierTokens);
WriteKeyword("delegate"); WriteKeyword("delegate");
delegateDeclaration.ReturnType.AcceptVisitor(this, data); delegateDeclaration.ReturnType.AcceptVisitor(this, data);
Space();
WriteIdentifier(delegateDeclaration.Name); WriteIdentifier(delegateDeclaration.Name);
WriteTypeParameters(delegateDeclaration.TypeParameters); WriteTypeParameters(delegateDeclaration.TypeParameters);
Space(policy.BeforeDelegateDeclarationParentheses); Space(policy.BeforeDelegateDeclarationParentheses);
@ -1297,6 +1300,7 @@ namespace ICSharpCode.NRefactory.CSharp
LPar(); LPar();
Space(policy.WithinForEachParentheses); Space(policy.WithinForEachParentheses);
foreachStatement.VariableType.AcceptVisitor(this, data); foreachStatement.VariableType.AcceptVisitor(this, data);
Space();
WriteIdentifier(foreachStatement.VariableName); WriteIdentifier(foreachStatement.VariableName);
WriteKeyword("in", ForeachStatement.Roles.InKeyword); WriteKeyword("in", ForeachStatement.Roles.InKeyword);
Space(); Space();
@ -1681,6 +1685,7 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} }
CloseBrace(policy.EventBraceStyle); CloseBrace(policy.EventBraceStyle);
NewLine();
return EndNode(customEventDeclaration); return EndNode(customEventDeclaration);
} }
@ -1713,6 +1718,7 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} }
CloseBrace(policy.PropertyBraceStyle); CloseBrace(policy.PropertyBraceStyle);
NewLine();
return EndNode(indexerDeclaration); return EndNode(indexerDeclaration);
} }
@ -1722,6 +1728,7 @@ namespace ICSharpCode.NRefactory.CSharp
WriteAttributes(methodDeclaration.Attributes); WriteAttributes(methodDeclaration.Attributes);
WriteModifiers(methodDeclaration.ModifierTokens); WriteModifiers(methodDeclaration.ModifierTokens);
methodDeclaration.ReturnType.AcceptVisitor(this, data); methodDeclaration.ReturnType.AcceptVisitor(this, data);
Space();
WritePrivateImplementationType(methodDeclaration.PrivateImplementationType); WritePrivateImplementationType(methodDeclaration.PrivateImplementationType);
WriteIdentifier(methodDeclaration.Name); WriteIdentifier(methodDeclaration.Name);
WriteTypeParameters(methodDeclaration.TypeParameters); WriteTypeParameters(methodDeclaration.TypeParameters);
@ -1799,6 +1806,7 @@ namespace ICSharpCode.NRefactory.CSharp
WriteAttributes(propertyDeclaration.Attributes); WriteAttributes(propertyDeclaration.Attributes);
WriteModifiers(propertyDeclaration.ModifierTokens); WriteModifiers(propertyDeclaration.ModifierTokens);
propertyDeclaration.ReturnType.AcceptVisitor(this, data); propertyDeclaration.ReturnType.AcceptVisitor(this, data);
Space();
WritePrivateImplementationType(propertyDeclaration.PrivateImplementationType); WritePrivateImplementationType(propertyDeclaration.PrivateImplementationType);
WriteIdentifier(propertyDeclaration.Name); WriteIdentifier(propertyDeclaration.Name);
OpenBrace(policy.PropertyBraceStyle); OpenBrace(policy.PropertyBraceStyle);

Loading…
Cancel
Save