Browse Source

[Formatting] Fixed using alias declarations.

newNRvisualizers
mike 14 years ago
parent
commit
8722483b59
  1. 2
      ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
  2. 18
      ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs
  3. 4
      ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs

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

@ -237,6 +237,7 @@ namespace ICSharpCode.NRefactory.CSharp @@ -237,6 +237,7 @@ namespace ICSharpCode.NRefactory.CSharp
public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
{
FixIndentationForceNewLine(usingDeclaration.StartLocation);
if (!(usingDeclaration.PrevSibling is UsingDeclaration || usingDeclaration.PrevSibling is UsingAliasDeclaration)) {
EnsureBlankLinesBefore(usingDeclaration, policy.BlankLinesBeforeUsings);
}
@ -247,6 +248,7 @@ namespace ICSharpCode.NRefactory.CSharp @@ -247,6 +248,7 @@ namespace ICSharpCode.NRefactory.CSharp
public override void VisitUsingAliasDeclaration(UsingAliasDeclaration usingDeclaration)
{
FixIndentationForceNewLine(usingDeclaration.StartLocation);
if (!(usingDeclaration.PrevSibling is UsingDeclaration || usingDeclaration.PrevSibling is UsingAliasDeclaration)) {
EnsureBlankLinesBefore(usingDeclaration, policy.BlankLinesBeforeUsings);
}

18
ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs

@ -34,6 +34,24 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests @@ -34,6 +34,24 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
[TestFixture()]
public class TestTypeLevelIndentation : TestBase
{
[Test()]
public void TestUsingDeclarations()
{
CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
Test(policy, @" using Foo;", @"using Foo;
");
}
[Test()]
public void TestUsingAliasDeclarations()
{
CSharpFormattingOptions policy = FormattingOptionsFactory.CreateMono();
Test(policy, @" using Foo = Bar;", @"using Foo = Bar;
");
}
[Test()]
public void TestClassIndentation ()
{

4
ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests @@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
return b.ToString();
}*/
protected static IDocument GetResult(CSharpFormattingOptions policy, string input, FormattingMode mode = FormattingMode.OnTheFly)
protected static IDocument GetResult(CSharpFormattingOptions policy, string input, FormattingMode mode = FormattingMode.Intrusive)
{
input = NormalizeNewlines(input);
var document = new StringBuilderDocument(input);
@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests @@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
return document;
}
protected static IDocument Test (CSharpFormattingOptions policy, string input, string expectedOutput, FormattingMode mode = FormattingMode.OnTheFly)
protected static IDocument Test (CSharpFormattingOptions policy, string input, string expectedOutput, FormattingMode mode = FormattingMode.Intrusive)
{
expectedOutput = NormalizeNewlines(expectedOutput);
IDocument doc = GetResult(policy, input, mode);

Loading…
Cancel
Save