pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Renamed CSharpFormattingPolicy to CSharpFormattingOptions.

newNRvisualizers
Mike Krüger 15 years ago
parent
92df3e5640
commit
16715bb854
17 changed files with 227 additions and 227 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ICSharpCode.NRefactory.Demo/MainForm.cs
  2. 4
      ICSharpCode.NRefactory.Tests/CSharp/InsertParenthesesVisitorTests.cs
  3. 4
      ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
  4. 14
      ICSharpCode.NRefactory.Tests/FormattingTests/TestBlankLineFormatting.cs
  5. 32
      ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
  6. 16
      ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
  7. 168
      ICSharpCode.NRefactory.Tests/FormattingTests/TestSpacingVisitor.cs
  8. 120
      ICSharpCode.NRefactory.Tests/FormattingTests/TestStatementIndentation.cs
  9. 40
      ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs
  10. 6
      ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs
  11. 2
      ICSharpCode.NRefactory/CSharp/Ast/Expressions/Expression.cs
  12. 4
      ICSharpCode.NRefactory/CSharp/Ast/PatternMatching/Pattern.cs
  13. 2
      ICSharpCode.NRefactory/CSharp/Ast/Statements/Statement.cs
  14. 4
      ICSharpCode.NRefactory/CSharp/Formatter/AstFormattingVisitor.cs
  15. 24
      ICSharpCode.NRefactory/CSharp/Formatter/CSharpFormattingOptions.cs
  16. 6
      ICSharpCode.NRefactory/CSharp/OutputVisitor/OutputVisitor.cs
  17. 4
      ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj

4
ICSharpCode.NRefactory.Demo/MainForm.cs
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under MIT X11 license (for details please see \doc\license.txt) // This code is distributed under MIT X11 license (for details please see \doc\license.txt)
using System; using System;
@ -126,7 +126,7 @@ namespace ICSharpCode.NRefactory.Demo
void CSharpGenerateCodeButtonClick(object sender, EventArgs e) void CSharpGenerateCodeButtonClick(object sender, EventArgs e)
{ {
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
OutputVisitor output = new OutputVisitor(w, new CSharpFormattingPolicy()); OutputVisitor output = new OutputVisitor(w, new CSharpFormattingOptions());
compilationUnit.AcceptVisitor(output, null); compilationUnit.AcceptVisitor(output, null);
csharpCodeTextBox.Text = w.ToString(); csharpCodeTextBox.Text = w.ToString();
} }

4
ICSharpCode.NRefactory.Tests/CSharp/InsertParenthesesVisitorTests.cs
Unescape View File

@ -10,12 +10,12 @@ namespace ICSharpCode.NRefactory.CSharp
[TestFixture] [TestFixture]
public class InsertParenthesesVisitorTests public class InsertParenthesesVisitorTests
{ {
CSharpFormattingPolicy policy; CSharpFormattingOptions policy;
[SetUp] [SetUp]
public void SetUp() public void SetUp()
{ {
policy = new CSharpFormattingPolicy(); policy = new CSharpFormattingOptions();
} }
string InsertReadable(Expression expr) string InsertReadable(Expression expr)

4
ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) 2010 AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2010 AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under MIT X11 license (for details please see \doc\license.txt) // This code is distributed under MIT X11 license (for details please see \doc\license.txt)
using System; using System;
@ -100,7 +100,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
static string ToCSharp(AstNode node) static string ToCSharp(AstNode node)
{ {
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
node.AcceptVisitor(new OutputVisitor(w, new CSharpFormattingPolicy()), null); node.AcceptVisitor(new OutputVisitor(w, new CSharpFormattingOptions()), null);
return w.ToString(); return w.ToString();
} }
} }

14
ICSharpCode.NRefactory.Tests/FormattingTests/TestBlankLineFormatting.cs
Unescape View File

@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBlankLinesAfterUsings () public void TestBlankLinesAfterUsings ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesAfterUsings = 2; policy.BlankLinesAfterUsings = 2;
var adapter = Test (policy, @"using System; var adapter = Test (policy, @"using System;
@ -65,7 +65,7 @@ namespace Test
[Test()] [Test()]
public void TestBlankLinesBeforeUsings () public void TestBlankLinesBeforeUsings ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesAfterUsings = 0; policy.BlankLinesAfterUsings = 0;
policy.BlankLinesBeforeUsings = 2; policy.BlankLinesBeforeUsings = 2;
@ -94,7 +94,7 @@ namespace Test
[Test()] [Test()]
public void TestBlankLinesBeforeFirstDeclaration () public void TestBlankLinesBeforeFirstDeclaration ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesBeforeFirstDeclaration = 2; policy.BlankLinesBeforeFirstDeclaration = 2;
var adapter = Test (policy, @"namespace Test var adapter = Test (policy, @"namespace Test
@ -125,7 +125,7 @@ namespace Test
[Test()] [Test()]
public void TestBlankLinesBetweenTypes () public void TestBlankLinesBetweenTypes ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesBetweenTypes = 1; policy.BlankLinesBetweenTypes = 1;
var adapter = Test (policy, @"namespace Test var adapter = Test (policy, @"namespace Test
@ -173,7 +173,7 @@ namespace Test
[Test()] [Test()]
public void TestBlankLinesBetweenFields () public void TestBlankLinesBetweenFields ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesBetweenFields = 1; policy.BlankLinesBetweenFields = 1;
var adapter = Test (policy, @"class Test var adapter = Test (policy, @"class Test
@ -203,7 +203,7 @@ namespace Test
[Test()] [Test()]
public void TestBlankLinesBetweenEventFields () public void TestBlankLinesBetweenEventFields ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesBetweenEventFields = 1; policy.BlankLinesBetweenEventFields = 1;
var adapter = Test (policy, @"class Test var adapter = Test (policy, @"class Test
@ -234,7 +234,7 @@ namespace Test
[Test()] [Test()]
public void TestBlankLinesBetweenMembers () public void TestBlankLinesBetweenMembers ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.BlankLinesBetweenMembers = 1; policy.BlankLinesBetweenMembers = 1;
var adapter = Test (policy,@"class Test var adapter = Test (policy,@"class Test

32
ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
Unescape View File

@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestNamespaceBraceStyle () public void TestNamespaceBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.NamespaceBraceStyle = BraceStyle.EndOfLine; policy.NamespaceBraceStyle = BraceStyle.EndOfLine;
policy.ClassBraceStyle = BraceStyle.DoNotChange; policy.ClassBraceStyle = BraceStyle.DoNotChange;
@ -67,7 +67,7 @@ namespace B {
[Test()] [Test()]
public void TestClassBraceStlye () public void TestClassBraceStlye ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, Test (policy,
@ -79,7 +79,7 @@ namespace B {
[Test()] [Test()]
public void TestStructBraceStyle () public void TestStructBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StructBraceStyle = BraceStyle.NextLine; policy.StructBraceStyle = BraceStyle.NextLine;
Test (policy, Test (policy,
@ -92,7 +92,7 @@ namespace B {
[Test()] [Test()]
public void TestInterfaceBraceStyle () public void TestInterfaceBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.InterfaceBraceStyle = BraceStyle.NextLine; policy.InterfaceBraceStyle = BraceStyle.NextLine;
Test (policy, Test (policy,
@ -105,7 +105,7 @@ namespace B {
[Test()] [Test()]
public void TestEnumBraceStyle () public void TestEnumBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.EnumBraceStyle = BraceStyle.NextLineShifted; policy.EnumBraceStyle = BraceStyle.NextLineShifted;
Test (policy, @"enum Test { Test (policy, @"enum Test {
@ -120,7 +120,7 @@ namespace B {
[Test()] [Test()]
public void TestMethodBraceStlye () public void TestMethodBraceStlye ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.MethodBraceStyle = BraceStyle.NextLine; policy.MethodBraceStyle = BraceStyle.NextLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -138,7 +138,7 @@ namespace B {
[Test()] [Test()]
public void TestConstructorBraceStyle () public void TestConstructorBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ConstructorBraceStyle = BraceStyle.NextLine; policy.ConstructorBraceStyle = BraceStyle.NextLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -156,7 +156,7 @@ namespace B {
[Test()] [Test()]
public void TestDestructorBraceStyle () public void TestDestructorBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.DestructorBraceStyle = BraceStyle.NextLine; policy.DestructorBraceStyle = BraceStyle.NextLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -174,7 +174,7 @@ namespace B {
[Test()] [Test()]
public void TestPropertyBraceStyle () public void TestPropertyBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyBraceStyle = BraceStyle.NextLine; policy.PropertyBraceStyle = BraceStyle.NextLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -197,7 +197,7 @@ namespace B {
[Test()] [Test()]
public void TestPropertyGetBraceStyle () public void TestPropertyGetBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyGetBraceStyle = BraceStyle.NextLine; policy.PropertyGetBraceStyle = BraceStyle.NextLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -225,7 +225,7 @@ namespace B {
public void TestAllowPropertyGetBlockInline () public void TestAllowPropertyGetBlockInline ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyBraceStyle = BraceStyle.DoNotChange; policy.PropertyBraceStyle = BraceStyle.DoNotChange;
policy.AllowPropertyGetBlockInline = true; policy.AllowPropertyGetBlockInline = true;
policy.AllowPropertySetBlockInline = false; policy.AllowPropertySetBlockInline = false;
@ -265,7 +265,7 @@ namespace B {
[Test()] [Test()]
public void TestAllowPropertySetBlockInline () public void TestAllowPropertySetBlockInline ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyBraceStyle = BraceStyle.DoNotChange; policy.PropertyBraceStyle = BraceStyle.DoNotChange;
policy.AllowPropertyGetBlockInline = false; policy.AllowPropertyGetBlockInline = false;
policy.AllowPropertySetBlockInline = true; policy.AllowPropertySetBlockInline = true;
@ -305,7 +305,7 @@ namespace B {
[Test()] [Test()]
public void TestPropertySetBraceStyle () public void TestPropertySetBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertySetBraceStyle = BraceStyle.NextLine; policy.PropertySetBraceStyle = BraceStyle.NextLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -332,7 +332,7 @@ namespace B {
[Test()] [Test()]
public void TestEventBraceStyle () public void TestEventBraceStyle ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.EventBraceStyle = BraceStyle.NextLine; policy.EventBraceStyle = BraceStyle.NextLine;
policy.EventAddBraceStyle = BraceStyle.NextLine; policy.EventAddBraceStyle = BraceStyle.NextLine;
policy.EventRemoveBraceStyle = BraceStyle.NextLine; policy.EventRemoveBraceStyle = BraceStyle.NextLine;
@ -363,7 +363,7 @@ namespace B {
[Test()] [Test()]
public void TestAllowEventAddBlockInline () public void TestAllowEventAddBlockInline ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.AllowEventAddBlockInline = true; policy.AllowEventAddBlockInline = true;
policy.AllowEventRemoveBlockInline = false; policy.AllowEventRemoveBlockInline = false;
@ -388,7 +388,7 @@ namespace B {
[Test()] [Test()]
public void TestAllowEventRemoveBlockInline () public void TestAllowEventRemoveBlockInline ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.AllowEventAddBlockInline = false; policy.AllowEventAddBlockInline = false;
policy.AllowEventRemoveBlockInline = true; policy.AllowEventRemoveBlockInline = true;

16
ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
Unescape View File

@ -40,7 +40,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBug325187 () public void TestBug325187 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceElseOnNewLine = true; policy.PlaceElseOnNewLine = true;
TestStatementFormatting (policy, TestStatementFormatting (policy,
@ -62,7 +62,7 @@ Console.WriteLine (""Bad indent"");",
[Test()] [Test()]
public void TestBug415469 () public void TestBug415469 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
TestStatementFormatting (policy, TestStatementFormatting (policy,
@"switch (condition) { @"switch (condition) {
@ -86,7 +86,7 @@ case CONDITION2:
[Test()] [Test()]
public void TestBug540043 () public void TestBug540043 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
TestStatementFormatting (policy, TestStatementFormatting (policy,
@"using (IDisposable a = null) @"using (IDisposable a = null)
@ -105,7 +105,7 @@ using (IDisposable b = null) {
[Test()] [Test()]
public void TestBug655635 () public void TestBug655635 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
TestStatementFormatting (policy, TestStatementFormatting (policy,
@"try { @"try {
@ -121,7 +121,7 @@ using (IDisposable b = null) {
}"); }");
} }
void TestStatementFormatting (CSharpFormattingPolicy policy, string input, string expectedOutput) void TestStatementFormatting (CSharpFormattingOptions policy, string input, string expectedOutput)
{ {
var result = GetResult (policy, @"class Test var result = GetResult (policy, @"class Test
{ {
@ -143,7 +143,7 @@ using (IDisposable b = null) {
[Test()] [Test()]
public void TestBug659675 () public void TestBug659675 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
TestStatementFormatting (policy, "@string=@int;", "@string = @int;"); TestStatementFormatting (policy, "@string=@int;", "@string = @int;");
} }
@ -153,7 +153,7 @@ using (IDisposable b = null) {
[Test()] [Test()]
public void TestBug670213 () public void TestBug670213 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.MethodBraceStyle = BraceStyle.EndOfLine; policy.MethodBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -176,7 +176,7 @@ using (IDisposable b = null) {
[Test()] [Test()]
public void TestBug677261 () public void TestBug677261 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ConstructorBraceStyle = BraceStyle.EndOfLine; policy.ConstructorBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test Test (policy, @"class Test

168
ICSharpCode.NRefactory.Tests/FormattingTests/TestSpacingVisitor.cs
Unescape View File

@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestFieldSpacesBeforeComma1 () public void TestFieldSpacesBeforeComma1 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
policy.SpaceBeforeFieldDeclarationComma = false; policy.SpaceBeforeFieldDeclarationComma = false;
policy.SpaceAfterFieldDeclarationComma = false; policy.SpaceAfterFieldDeclarationComma = false;
@ -53,7 +53,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestFieldSpacesBeforeComma2 () public void TestFieldSpacesBeforeComma2 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
policy.SpaceBeforeFieldDeclarationComma = true; policy.SpaceBeforeFieldDeclarationComma = true;
policy.SpaceAfterFieldDeclarationComma = true; policy.SpaceAfterFieldDeclarationComma = true;
@ -69,7 +69,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestFixedFieldSpacesBeforeComma () public void TestFixedFieldSpacesBeforeComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
policy.SpaceAfterFieldDeclarationComma = true; policy.SpaceAfterFieldDeclarationComma = true;
policy.SpaceBeforeFieldDeclarationComma = true; policy.SpaceBeforeFieldDeclarationComma = true;
@ -85,7 +85,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestConstFieldSpacesBeforeComma () public void TestConstFieldSpacesBeforeComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
policy.SpaceAfterFieldDeclarationComma = false; policy.SpaceAfterFieldDeclarationComma = false;
policy.SpaceBeforeFieldDeclarationComma = false; policy.SpaceBeforeFieldDeclarationComma = false;
@ -101,7 +101,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeMethodDeclarationParentheses () public void TestBeforeMethodDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodDeclarationParentheses = true; policy.SpaceBeforeMethodDeclarationParentheses = true;
Test (policy, @"public abstract class Test Test (policy, @"public abstract class Test
@ -117,7 +117,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeConstructorDeclarationParenthesesDestructorCase () public void TestBeforeConstructorDeclarationParenthesesDestructorCase ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeConstructorDeclarationParentheses = true; policy.SpaceBeforeConstructorDeclarationParentheses = true;
Test (policy, @"class Test Test (policy, @"class Test
@ -134,7 +134,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
}"); }");
} }
static void TestBinaryOperator (CSharpFormattingPolicy policy, string op) static void TestBinaryOperator (CSharpFormattingOptions policy, string op)
{ {
var result = GetResult (policy, "class Test { void TestMe () { result = left" + op + "right; } }"); var result = GetResult (policy, "class Test { void TestMe () { result = left" + op + "right; } }");
@ -148,7 +148,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundMultiplicativeOperator () public void TestSpacesAroundMultiplicativeOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundMultiplicativeOperator = true; policy.SpaceAroundMultiplicativeOperator = true;
TestBinaryOperator (policy, "*"); TestBinaryOperator (policy, "*");
@ -158,7 +158,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundShiftOperator () public void TestSpacesAroundShiftOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundShiftOperator = true; policy.SpaceAroundShiftOperator = true;
TestBinaryOperator (policy, "<<"); TestBinaryOperator (policy, "<<");
TestBinaryOperator (policy, ">>"); TestBinaryOperator (policy, ">>");
@ -167,7 +167,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundAdditiveOperator () public void TestSpacesAroundAdditiveOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundAdditiveOperator = true; policy.SpaceAroundAdditiveOperator = true;
TestBinaryOperator (policy, "+"); TestBinaryOperator (policy, "+");
@ -177,7 +177,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundBitwiseOperator () public void TestSpacesAroundBitwiseOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundBitwiseOperator = true; policy.SpaceAroundBitwiseOperator = true;
TestBinaryOperator (policy, "&"); TestBinaryOperator (policy, "&");
@ -188,7 +188,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundRelationalOperator () public void TestSpacesAroundRelationalOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundRelationalOperator = true; policy.SpaceAroundRelationalOperator = true;
TestBinaryOperator (policy, "<"); TestBinaryOperator (policy, "<");
@ -200,7 +200,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundEqualityOperator () public void TestSpacesAroundEqualityOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundEqualityOperator = true; policy.SpaceAroundEqualityOperator = true;
TestBinaryOperator (policy, "=="); TestBinaryOperator (policy, "==");
@ -210,7 +210,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAroundLogicalOperator () public void TestSpacesAroundLogicalOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundLogicalOperator = true; policy.SpaceAroundLogicalOperator = true;
TestBinaryOperator (policy, "&&"); TestBinaryOperator (policy, "&&");
@ -220,7 +220,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestConditionalOperator () public void TestConditionalOperator ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeConditionalOperatorCondition = true; policy.SpaceBeforeConditionalOperatorCondition = true;
policy.SpaceAfterConditionalOperatorCondition = true; policy.SpaceAfterConditionalOperatorCondition = true;
policy.SpaceBeforeConditionalOperatorSeparator = true; policy.SpaceBeforeConditionalOperatorSeparator = true;
@ -256,7 +256,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeMethodCallParenthesesSpace () public void TestBeforeMethodCallParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodCallParentheses = true; policy.SpaceBeforeMethodCallParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -288,7 +288,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinMethodCallParenthesesSpace () public void TestWithinMethodCallParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceWithinMethodCallParentheses = true; policy.SpaceWithinMethodCallParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -318,7 +318,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeIfParenthesesSpace () public void TestBeforeIfParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeIfParentheses = true; policy.SpaceBeforeIfParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -335,7 +335,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinIfParenthesesSpace () public void TestWithinIfParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinIfParentheses = true; policy.SpacesWithinIfParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -352,7 +352,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeWhileParenthesesSpace () public void TestBeforeWhileParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeWhileParentheses = true; policy.SpaceBeforeWhileParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -369,7 +369,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinWhileParenthesesSpace () public void TestWithinWhileParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinWhileParentheses = true; policy.SpacesWithinWhileParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -387,7 +387,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeForParenthesesSpace () public void TestBeforeForParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeForParentheses = true; policy.SpaceBeforeForParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -404,7 +404,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinForParenthesesSpace () public void TestWithinForParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinForParentheses = true; policy.SpacesWithinForParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -421,7 +421,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeForeachParenthesesSpace () public void TestBeforeForeachParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeForeachParentheses = true; policy.SpaceBeforeForeachParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -438,7 +438,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinForeachParenthesesSpace () public void TestWithinForeachParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinForeachParentheses = true; policy.SpacesWithinForeachParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -455,7 +455,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeCatchParenthesesSpace () public void TestBeforeCatchParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeCatchParentheses = true; policy.SpaceBeforeCatchParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -472,7 +472,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinCatchParenthesesSpace () public void TestWithinCatchParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinCatchParentheses = true; policy.SpacesWithinCatchParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -489,7 +489,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestBeforeLockParenthesesSpace () public void TestBeforeLockParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeLockParentheses = true; policy.SpaceBeforeLockParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -506,7 +506,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestWithinLockParenthesesSpace () public void TestWithinLockParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinLockParentheses = true; policy.SpacesWithinLockParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -523,7 +523,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAfterForSemicolon () public void TestSpacesAfterForSemicolon ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAfterForSemicolon = true; policy.SpaceAfterForSemicolon = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -541,7 +541,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesBeforeForSemicolon () public void TestSpacesBeforeForSemicolon ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeForSemicolon = true; policy.SpaceBeforeForSemicolon = true;
policy.SpaceAfterForSemicolon = false; policy.SpaceAfterForSemicolon = false;
@ -560,7 +560,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestSpacesAfterTypecast () public void TestSpacesAfterTypecast ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAfterTypecast = true; policy.SpaceAfterTypecast = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -578,7 +578,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeUsingParenthesesSpace () public void TestBeforeUsingParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeUsingParentheses = true; policy.SpaceBeforeUsingParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -595,7 +595,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinUsingParenthesesSpace () public void TestWithinUsingParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinUsingParentheses = true; policy.SpacesWithinUsingParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -609,7 +609,7 @@ return (Test)null;
Assert.AreEqual (@"( a )", result.GetTextAt (i1, i2 - i1)); Assert.AreEqual (@"( a )", result.GetTextAt (i1, i2 - i1));
} }
static void TestAssignmentOperator (CSharpFormattingPolicy policy, string op) static void TestAssignmentOperator (CSharpFormattingOptions policy, string op)
{ {
var result = GetResult (policy, "class Test { void TestMe () { left" + op + "right; } }"); var result = GetResult (policy, "class Test { void TestMe () { left" + op + "right; } }");
@ -623,7 +623,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAroundAssignmentSpace () public void TestAroundAssignmentSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundAssignment = true; policy.SpaceAroundAssignment = true;
TestAssignmentOperator (policy, "="); TestAssignmentOperator (policy, "=");
@ -642,7 +642,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAroundAssignmentSpaceInDeclarations () public void TestAroundAssignmentSpaceInDeclarations ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAroundAssignment = true; policy.SpaceAroundAssignment = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
void TestMe () void TestMe ()
@ -659,7 +659,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeSwitchParenthesesSpace () public void TestBeforeSwitchParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeSwitchParentheses = true; policy.SpaceBeforeSwitchParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -676,7 +676,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinSwitchParenthesesSpace () public void TestWithinSwitchParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinSwitchParentheses = true; policy.SpacesWithinSwitchParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -693,7 +693,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinParenthesesSpace () public void TestWithinParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinParentheses = true; policy.SpacesWithinParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -710,7 +710,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinMethodDeclarationParenthesesSpace () public void TestWithinMethodDeclarationParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceWithinMethodDeclarationParentheses = true; policy.SpaceWithinMethodDeclarationParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -726,7 +726,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinCastParenthesesSpace () public void TestWithinCastParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinCastParentheses = true; policy.SpacesWithinCastParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -743,7 +743,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinSizeOfParenthesesSpace () public void TestWithinSizeOfParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinSizeOfParentheses = true; policy.SpacesWithinSizeOfParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -760,7 +760,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeSizeOfParentheses () public void TestBeforeSizeOfParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeSizeOfParentheses = true; policy.SpaceBeforeSizeOfParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -777,7 +777,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinTypeOfParenthesesSpace () public void TestWithinTypeOfParenthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinTypeOfParentheses = true; policy.SpacesWithinTypeOfParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -794,7 +794,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeTypeOfParentheses () public void TestBeforeTypeOfParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeTypeOfParentheses = true; policy.SpaceBeforeTypeOfParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -812,7 +812,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinCheckedExpressionParanthesesSpace () public void TestWithinCheckedExpressionParanthesesSpace ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinCheckedExpressionParantheses = true; policy.SpacesWithinCheckedExpressionParantheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -841,7 +841,7 @@ return (Test)null;
[Test()] [Test()]
public void TestSpaceBeforeNewParentheses () public void TestSpaceBeforeNewParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeNewParentheses = true; policy.SpaceBeforeNewParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -858,7 +858,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinNewParentheses () public void TestWithinNewParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinNewParentheses = true; policy.SpacesWithinNewParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -875,7 +875,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBetweenEmptyNewParentheses () public void TestBetweenEmptyNewParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesBetweenEmptyNewParentheses = true; policy.SpacesBetweenEmptyNewParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -892,7 +892,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeNewParameterComma () public void TestBeforeNewParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeNewParameterComma = true; policy.SpaceBeforeNewParameterComma = true;
policy.SpaceAfterNewParameterComma = false; policy.SpaceAfterNewParameterComma = false;
@ -910,7 +910,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterNewParameterComma () public void TestAfterNewParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAfterNewParameterComma = true; policy.SpaceAfterNewParameterComma = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -927,7 +927,7 @@ return (Test)null;
[Test()] [Test()]
public void TestFieldDeclarationComma () public void TestFieldDeclarationComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeFieldDeclarationComma = false; policy.SpaceBeforeFieldDeclarationComma = false;
policy.SpaceAfterFieldDeclarationComma = true; policy.SpaceAfterFieldDeclarationComma = true;
@ -955,7 +955,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeMethodDeclarationParameterComma () public void TestBeforeMethodDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodDeclarationParameterComma = true; policy.SpaceBeforeMethodDeclarationParameterComma = true;
policy.SpaceAfterMethodDeclarationParameterComma = false; policy.SpaceAfterMethodDeclarationParameterComma = false;
@ -976,7 +976,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterMethodDeclarationParameterComma () public void TestAfterMethodDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodDeclarationParameterComma = false; policy.SpaceBeforeMethodDeclarationParameterComma = false;
policy.SpaceAfterMethodDeclarationParameterComma = true; policy.SpaceAfterMethodDeclarationParameterComma = true;
@ -997,7 +997,7 @@ return (Test)null;
[Test()] [Test()]
public void TestSpacesInLambdaExpression () public void TestSpacesInLambdaExpression ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinWhileParentheses = true; policy.SpacesWithinWhileParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -1014,7 +1014,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeLocalVariableDeclarationComma () public void TestBeforeLocalVariableDeclarationComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeLocalVariableDeclarationComma = true; policy.SpaceBeforeLocalVariableDeclarationComma = true;
policy.SpaceAfterLocalVariableDeclarationComma = false; policy.SpaceAfterLocalVariableDeclarationComma = false;
@ -1041,7 +1041,7 @@ return (Test)null;
[Test()] [Test()]
public void TestLocalVariableDeclarationComma () public void TestLocalVariableDeclarationComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeLocalVariableDeclarationComma = true; policy.SpaceBeforeLocalVariableDeclarationComma = true;
policy.SpaceAfterLocalVariableDeclarationComma = true; policy.SpaceAfterLocalVariableDeclarationComma = true;
@ -1071,7 +1071,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeConstructorDeclarationParentheses () public void TestBeforeConstructorDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeConstructorDeclarationParentheses = true; policy.SpaceBeforeConstructorDeclarationParentheses = true;
var result = GetResult (policy, @"class Test var result = GetResult (policy, @"class Test
@ -1092,7 +1092,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeConstructorDeclarationParameterComma () public void TestBeforeConstructorDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeConstructorDeclarationParameterComma = true; policy.SpaceBeforeConstructorDeclarationParameterComma = true;
policy.SpaceAfterConstructorDeclarationParameterComma = false; policy.SpaceAfterConstructorDeclarationParameterComma = false;
@ -1115,7 +1115,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterConstructorDeclarationParameterComma () public void TestAfterConstructorDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeConstructorDeclarationParameterComma = false; policy.SpaceBeforeConstructorDeclarationParameterComma = false;
policy.SpaceAfterConstructorDeclarationParameterComma = true; policy.SpaceAfterConstructorDeclarationParameterComma = true;
@ -1136,7 +1136,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinConstructorDeclarationParentheses () public void TestWithinConstructorDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceWithinConstructorDeclarationParentheses = true; policy.SpaceWithinConstructorDeclarationParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -1152,7 +1152,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBetweenEmptyConstructorDeclarationParentheses () public void TestBetweenEmptyConstructorDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBetweenEmptyConstructorDeclarationParentheses = true; policy.SpaceBetweenEmptyConstructorDeclarationParentheses = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -1171,7 +1171,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeDelegateDeclarationParentheses () public void TestBeforeDelegateDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeDelegateDeclarationParentheses = true; policy.SpaceBeforeDelegateDeclarationParentheses = true;
var result = GetResult (policy, @"delegate void Test();"); var result = GetResult (policy, @"delegate void Test();");
@ -1182,7 +1182,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeDelegateDeclarationParenthesesComplex () public void TestBeforeDelegateDeclarationParenthesesComplex ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeDelegateDeclarationParentheses = true; policy.SpaceBeforeDelegateDeclarationParentheses = true;
var result = GetResult (policy, "delegate void TestDelegate\t\t\t();"); var result = GetResult (policy, "delegate void TestDelegate\t\t\t();");
@ -1193,7 +1193,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeDelegateDeclarationParameterComma () public void TestBeforeDelegateDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeDelegateDeclarationParameterComma = true; policy.SpaceBeforeDelegateDeclarationParameterComma = true;
policy.SpaceAfterDelegateDeclarationParameterComma = false; policy.SpaceAfterDelegateDeclarationParameterComma = false;
@ -1213,7 +1213,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterDelegateDeclarationParameterComma () public void TestAfterDelegateDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeDelegateDeclarationParameterComma = false; policy.SpaceBeforeDelegateDeclarationParameterComma = false;
policy.SpaceAfterDelegateDeclarationParameterComma = true; policy.SpaceAfterDelegateDeclarationParameterComma = true;
@ -1233,7 +1233,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinDelegateDeclarationParentheses () public void TestWithinDelegateDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceWithinDelegateDeclarationParentheses = true; policy.SpaceWithinDelegateDeclarationParentheses = true;
var result = GetResult (policy, @"delegate void Test (int a);"); var result = GetResult (policy, @"delegate void Test (int a);");
@ -1245,7 +1245,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBetweenEmptyDelegateDeclarationParentheses () public void TestBetweenEmptyDelegateDeclarationParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBetweenEmptyDelegateDeclarationParentheses = true; policy.SpaceBetweenEmptyDelegateDeclarationParentheses = true;
var result = GetResult (policy, @"delegate void Test();"); var result = GetResult (policy, @"delegate void Test();");
@ -1260,7 +1260,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeMethodCallParentheses () public void TestBeforeMethodCallParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodCallParentheses = true; policy.SpaceBeforeMethodCallParentheses = true;
var result = GetResult (policy, @"class FooBar var result = GetResult (policy, @"class FooBar
@ -1283,7 +1283,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeMethodCallParameterComma () public void TestBeforeMethodCallParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodCallParameterComma = true; policy.SpaceBeforeMethodCallParameterComma = true;
policy.SpaceAfterMethodCallParameterComma = false; policy.SpaceAfterMethodCallParameterComma = false;
@ -1308,7 +1308,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterMethodCallParameterComma () public void TestAfterMethodCallParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeMethodCallParameterComma = false; policy.SpaceBeforeMethodCallParameterComma = false;
policy.SpaceAfterMethodCallParameterComma = true; policy.SpaceAfterMethodCallParameterComma = true;
@ -1333,7 +1333,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinMethodCallParentheses () public void TestWithinMethodCallParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceWithinMethodCallParentheses = true; policy.SpaceWithinMethodCallParentheses = true;
var result = GetResult (policy, @"class FooBar var result = GetResult (policy, @"class FooBar
@ -1351,7 +1351,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBetweenEmptyMethodCallParentheses () public void TestBetweenEmptyMethodCallParentheses ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBetweenEmptyMethodCallParentheses = true; policy.SpaceBetweenEmptyMethodCallParentheses = true;
var result = GetResult (policy, @"class FooBar var result = GetResult (policy, @"class FooBar
@ -1373,7 +1373,7 @@ return (Test)null;
public void TestBeforeIndexerDeclarationBracket () public void TestBeforeIndexerDeclarationBracket ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeIndexerDeclarationBracket = true; policy.SpaceBeforeIndexerDeclarationBracket = true;
var result = GetResult (policy, @"class FooBar var result = GetResult (policy, @"class FooBar
@ -1397,7 +1397,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeIndexerDeclarationParameterComma () public void TestBeforeIndexerDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeIndexerDeclarationParameterComma = true; policy.SpaceBeforeIndexerDeclarationParameterComma = true;
policy.SpaceAfterIndexerDeclarationParameterComma = false; policy.SpaceAfterIndexerDeclarationParameterComma = false;
@ -1418,7 +1418,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterIndexerDeclarationParameterComma () public void TestAfterIndexerDeclarationParameterComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAfterIndexerDeclarationParameterComma = true; policy.SpaceAfterIndexerDeclarationParameterComma = true;
var result = GetResult (policy, @"class FooBar var result = GetResult (policy, @"class FooBar
@ -1437,7 +1437,7 @@ return (Test)null;
[Test()] [Test()]
public void TestWithinIndexerDeclarationBracket () public void TestWithinIndexerDeclarationBracket ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceWithinIndexerDeclarationBracket = true; policy.SpaceWithinIndexerDeclarationBracket = true;
var result = GetResult (policy, @"class FooBar var result = GetResult (policy, @"class FooBar
@ -1460,7 +1460,7 @@ return (Test)null;
[Test()] [Test()]
public void TestSpacesWithinBrackets () public void TestSpacesWithinBrackets ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesWithinBrackets = true; policy.SpacesWithinBrackets = true;
policy.SpacesBeforeBrackets = false; policy.SpacesBeforeBrackets = false;
@ -1484,7 +1484,7 @@ return (Test)null;
[Test()] [Test()]
public void TestSpacesBeforeBrackets () public void TestSpacesBeforeBrackets ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpacesBeforeBrackets = true; policy.SpacesBeforeBrackets = true;
var result = GetResult (policy, @"class Test var result = GetResult (policy, @"class Test
@ -1508,7 +1508,7 @@ return (Test)null;
[Test()] [Test()]
public void TestBeforeBracketComma () public void TestBeforeBracketComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeBracketComma = true; policy.SpaceBeforeBracketComma = true;
policy.SpaceAfterBracketComma = false; policy.SpaceAfterBracketComma = false;
@ -1527,7 +1527,7 @@ return (Test)null;
[Test()] [Test()]
public void TestAfterBracketComma () public void TestAfterBracketComma ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceAfterBracketComma = true; policy.SpaceAfterBracketComma = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -1547,7 +1547,7 @@ return (Test)null;
[Test()] [Test()]
public void TestSpacesBeforeArrayDeclarationBrackets () public void TestSpacesBeforeArrayDeclarationBrackets ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.SpaceBeforeArrayDeclarationBrackets = true; policy.SpaceBeforeArrayDeclarationBrackets = true;
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
@ -1567,7 +1567,7 @@ return (Test)null;
[Test()] [Test()]
public void TestRemoveWhitespacesBeforeSemicolon () public void TestRemoveWhitespacesBeforeSemicolon ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
var result = GetResult (policy, @"class Test { var result = GetResult (policy, @"class Test {
void TestMe () void TestMe ()
{ {

120
ICSharpCode.NRefactory.Tests/FormattingTests/TestStatementIndentation.cs
Unescape View File

@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestInvocationIndentation () public void TestInvocationIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, Test (policy,
@ -58,7 +58,7 @@ this.TestMethod ();
[Test()] [Test()]
public void TestIndentBlocks () public void TestIndentBlocks ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentBlocks = true; policy.IndentBlocks = true;
var adapter = Test (policy, var adapter = Test (policy,
@ -94,7 +94,7 @@ this.TestMethod ();
[Test()] [Test()]
public void TestBreakIndentation () public void TestBreakIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, Test (policy,
@ -115,7 +115,7 @@ this.TestMethod ();
[Test()] [Test()]
public void TestCheckedIndentation () public void TestCheckedIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -137,7 +137,7 @@ checked {
[Test()] [Test()]
public void TestBaseIndentation () public void TestBaseIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -156,7 +156,7 @@ checked {
[Test()] [Test()]
public void TestUncheckedIndentation () public void TestUncheckedIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -178,7 +178,7 @@ unchecked {
[Test()] [Test()]
public void TestContinueIndentation () public void TestContinueIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -198,7 +198,7 @@ continue;
[Test()] [Test()]
public void TestEmptyStatementIndentation () public void TestEmptyStatementIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -217,7 +217,7 @@ continue;
[Test()] [Test()]
public void TestFixedStatementIndentation () public void TestFixedStatementIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -239,7 +239,7 @@ fixed (object* obj = &obj)
[Test()] [Test()]
public void TestFixedForcementAdd () public void TestFixedForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.FixedBraceForcement = BraceForcement.AddBraces; policy.FixedBraceForcement = BraceForcement.AddBraces;
@ -269,7 +269,7 @@ fixed (object* obj = &obj)
[Test()] [Test()]
public void TestForeachIndentation () public void TestForeachIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -292,7 +292,7 @@ foreach (var obj in col) {
[Test()] [Test()]
public void TestForIndentation () public void TestForIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -314,7 +314,7 @@ for (;;) {
[Test()] [Test()]
public void TestGotoIndentation () public void TestGotoIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -334,7 +334,7 @@ goto label;
[Test()] [Test()]
public void TestReturnIndentation () public void TestReturnIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -354,7 +354,7 @@ return;
[Test()] [Test()]
public void TestLockIndentation () public void TestLockIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -376,7 +376,7 @@ lock (this) {
[Test()] [Test()]
public void TestThrowIndentation () public void TestThrowIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -397,7 +397,7 @@ throw new NotSupportedException ();
[Test()] [Test()]
public void TestUnsafeIndentation () public void TestUnsafeIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -420,7 +420,7 @@ unsafe {
[Test()] [Test()]
public void TestUsingIndentation () public void TestUsingIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -442,7 +442,7 @@ using (var o = new MyObj()) {
[Test()] [Test()]
public void TestUsingForcementAdd () public void TestUsingForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.UsingBraceForcement = BraceForcement.AddBraces; policy.UsingBraceForcement = BraceForcement.AddBraces;
@ -472,7 +472,7 @@ using (var o = new MyObj()) {
[Test()] [Test()]
public void TestUsingForcementDoNotChange () public void TestUsingForcementDoNotChange ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.UsingBraceForcement = BraceForcement.DoNotChange; policy.UsingBraceForcement = BraceForcement.DoNotChange;
@ -501,7 +501,7 @@ using (var o = new MyObj()) {
[Test()] [Test()]
public void TestUsingAlignment () public void TestUsingAlignment ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.AlignEmbeddedUsingStatements = true; policy.AlignEmbeddedUsingStatements = true;
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -535,7 +535,7 @@ using (var o = new MyObj()) {
[Test()] [Test()]
public void TestVariableDeclarationIndentation () public void TestVariableDeclarationIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -555,7 +555,7 @@ Test a;
[Test()] [Test()]
public void TestConstantVariableDeclarationIndentation () public void TestConstantVariableDeclarationIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -575,7 +575,7 @@ const int a = 5;
[Test()] [Test()]
public void TestYieldIndentation () public void TestYieldIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -595,7 +595,7 @@ yield return null;
[Test()] [Test()]
public void TestWhileIndentation () public void TestWhileIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -618,7 +618,7 @@ while (true)
[Test()] [Test()]
public void TestDoWhileIndentation () public void TestDoWhileIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test { Test (policy, @"class Test {
@ -640,7 +640,7 @@ do {
[Test()] [Test()]
public void TestForeachBracketPlacement () public void TestForeachBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
Test (policy, @"class Test Test (policy, @"class Test
@ -663,7 +663,7 @@ do {
[Test()] [Test()]
public void TestForeachBracketPlacement2 () public void TestForeachBracketPlacement2 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLineShifted2; policy.StatementBraceStyle = BraceStyle.NextLineShifted2;
Test (policy, @"class Test Test (policy, @"class Test
@ -688,7 +688,7 @@ do {
[Test()] [Test()]
public void TestForEachBraceForcementAdd () public void TestForEachBraceForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLine; policy.StatementBraceStyle = BraceStyle.NextLine;
policy.ForEachBraceForcement = BraceForcement.AddBraces; policy.ForEachBraceForcement = BraceForcement.AddBraces;
@ -720,7 +720,7 @@ do {
[Test()] [Test()]
public void TestForBraceForcementAdd () public void TestForBraceForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLine; policy.StatementBraceStyle = BraceStyle.NextLine;
policy.ForBraceForcement = BraceForcement.AddBraces; policy.ForBraceForcement = BraceForcement.AddBraces;
@ -753,7 +753,7 @@ do {
[Test()] [Test()]
public void TestForEachBraceForcementRemove () public void TestForEachBraceForcementRemove ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLine; policy.StatementBraceStyle = BraceStyle.NextLine;
policy.ForEachBraceForcement = BraceForcement.RemoveBraces; policy.ForEachBraceForcement = BraceForcement.RemoveBraces;
@ -790,7 +790,7 @@ do {
[Test()] [Test()]
public void TestIfBracketPlacement () public void TestIfBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -814,7 +814,7 @@ do {
[Test()] [Test()]
public void TestAllowIfBlockInline () public void TestAllowIfBlockInline ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.AllowIfBlockInline = true; policy.AllowIfBlockInline = true;
@ -884,7 +884,7 @@ do {
[Test()] [Test()]
public void TestIfElseBracketPlacement () public void TestIfElseBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -909,7 +909,7 @@ do {
[Test()] [Test()]
public void TestIfForcementRemove () public void TestIfForcementRemove ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLine; policy.StatementBraceStyle = BraceStyle.NextLine;
policy.IfElseBraceForcement = BraceForcement.RemoveBraces; policy.IfElseBraceForcement = BraceForcement.RemoveBraces;
@ -947,7 +947,7 @@ do {
[Test()] [Test()]
public void TestIfAlignment () public void TestIfAlignment ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.AlignEmbeddedIfStatements = true; policy.AlignEmbeddedIfStatements = true;
policy.ClassBraceStyle = BraceStyle.EndOfLine; policy.ClassBraceStyle = BraceStyle.EndOfLine;
@ -981,7 +981,7 @@ if (b) {
[Test()] [Test()]
public void TestIfForcementAdd () public void TestIfForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.IfElseBraceForcement = BraceForcement.AddBraces; policy.IfElseBraceForcement = BraceForcement.AddBraces;
@ -1008,7 +1008,7 @@ if (b) {
[Test()] [Test()]
public void TestIfForcementWithComment () public void TestIfForcementWithComment ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.IfElseBraceForcement = BraceForcement.AddBraces; policy.IfElseBraceForcement = BraceForcement.AddBraces;
@ -1036,7 +1036,7 @@ if (b) {
[Test()] [Test()]
public void TestIfElseForcementAdd () public void TestIfElseForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.IfElseBraceForcement = BraceForcement.AddBraces; policy.IfElseBraceForcement = BraceForcement.AddBraces;
@ -1067,7 +1067,7 @@ if (b) {
[Test()] [Test()]
public void TestIfElseIFForcementAdd () public void TestIfElseIFForcementAdd ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.IfElseBraceForcement = BraceForcement.AddBraces; policy.IfElseBraceForcement = BraceForcement.AddBraces;
@ -1098,7 +1098,7 @@ if (b) {
[Test()] [Test()]
public void TestElseOnNewLine () public void TestElseOnNewLine ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceElseOnNewLine = true; policy.PlaceElseOnNewLine = true;
Test (policy, @"class Test Test (policy, @"class Test
@ -1129,7 +1129,7 @@ if (b) {
[Test()] [Test()]
public void TestElseIfOnNewLine () public void TestElseIfOnNewLine ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceElseIfOnNewLine = true; policy.PlaceElseIfOnNewLine = true;
Test (policy, @"class Test Test (policy, @"class Test
@ -1160,7 +1160,7 @@ if (b) {
[Test()] [Test()]
public void TestElseOnNewLineOff () public void TestElseOnNewLineOff ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceElseOnNewLine = false; policy.PlaceElseOnNewLine = false;
Test (policy, @"class Test Test (policy, @"class Test
@ -1191,7 +1191,7 @@ if (b) {
[Test()] [Test()]
public void TestSimpleIfElseComment () public void TestSimpleIfElseComment ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
policy.PlaceElseIfOnNewLine = false; // for simple statements it must be new line. policy.PlaceElseIfOnNewLine = false; // for simple statements it must be new line.
@ -1218,7 +1218,7 @@ if (b) {
[Test()] [Test()]
public void TestWhileForcementRemove () public void TestWhileForcementRemove ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLine; policy.StatementBraceStyle = BraceStyle.NextLine;
policy.WhileBraceForcement = BraceForcement.RemoveBraces; policy.WhileBraceForcement = BraceForcement.RemoveBraces;
@ -1256,7 +1256,7 @@ if (b) {
[Test()] [Test()]
public void TestFixedBracketPlacement () public void TestFixedBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.NextLineShifted; policy.StatementBraceStyle = BraceStyle.NextLineShifted;
policy.FixedBraceForcement = BraceForcement.AddBraces; policy.FixedBraceForcement = BraceForcement.AddBraces;
@ -1285,7 +1285,7 @@ if (b) {
[Test()] [Test()]
public void TestForBracketPlacement () public void TestForBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace; policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace;
Test (policy, @"class Test Test (policy, @"class Test
@ -1309,7 +1309,7 @@ if (b) {
[Test()] [Test()]
public void TestCheckedBracketPlacement () public void TestCheckedBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace; policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace;
@ -1334,7 +1334,7 @@ if (b) {
[Test()] [Test()]
public void TestUncheckedBracketPlacement () public void TestUncheckedBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace; policy.StatementBraceStyle = BraceStyle.EndOfLineWithoutSpace;
@ -1359,7 +1359,7 @@ if (b) {
[Test()] [Test()]
public void TestLockBracketPlacement () public void TestLockBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -1387,7 +1387,7 @@ if (b) {
[Test()] [Test()]
public void TestUnsafeBracketPlacement () public void TestUnsafeBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -1415,7 +1415,7 @@ if (b) {
[Test()] [Test()]
public void TestUsingBracketPlacement () public void TestUsingBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -1443,7 +1443,7 @@ if (b) {
[Test()] [Test()]
public void TestWhileBracketPlacement () public void TestWhileBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -1471,7 +1471,7 @@ if (b) {
[Test()] [Test()]
public void TestDoWhileBracketPlacement () public void TestDoWhileBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -1499,7 +1499,7 @@ if (b) {
[Test()] [Test()]
public void TestSwitchFormatting1 () public void TestSwitchFormatting1 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentSwitchBody = true; policy.IndentSwitchBody = true;
policy.IndentCaseBody = true; policy.IndentCaseBody = true;
@ -1532,7 +1532,7 @@ if (b) {
[Test()] [Test()]
public void TestSwitchFormatting2 () public void TestSwitchFormatting2 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentSwitchBody = false; policy.IndentSwitchBody = false;
policy.IndentCaseBody = false; policy.IndentCaseBody = false;
@ -1565,7 +1565,7 @@ if (b) {
[Test()] [Test()]
public void TestTryCatchBracketPlacement () public void TestTryCatchBracketPlacement ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.StatementBraceStyle = BraceStyle.EndOfLine; policy.StatementBraceStyle = BraceStyle.EndOfLine;
@ -1592,7 +1592,7 @@ if (b) {
[Test()] [Test()]
public void TestPlaceCatchOnNewLine () public void TestPlaceCatchOnNewLine ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceCatchOnNewLine = true; policy.PlaceCatchOnNewLine = true;
@ -1624,7 +1624,7 @@ if (b) {
[Test()] [Test()]
public void TestPlaceFinallyOnNewLine () public void TestPlaceFinallyOnNewLine ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceFinallyOnNewLine = true; policy.PlaceFinallyOnNewLine = true;
Test (policy, @"class Test Test (policy, @"class Test
@ -1655,7 +1655,7 @@ if (b) {
[Test()] [Test()]
public void TestPlaceWhileOnNewLine () public void TestPlaceWhileOnNewLine ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PlaceWhileOnNewLine = true; policy.PlaceWhileOnNewLine = true;

40
ICSharpCode.NRefactory.Tests/FormattingTests/TestTypeLevelIndentation.cs
Unescape View File

@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestClassIndentation () public void TestClassIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.DoNotChange; policy.ClassBraceStyle = BraceStyle.DoNotChange;
Test (policy, Test (policy,
@ -49,7 +49,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestClassIndentationInNamespaces () public void TestClassIndentationInNamespaces ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.NamespaceBraceStyle = BraceStyle.EndOfLine; policy.NamespaceBraceStyle = BraceStyle.EndOfLine;
policy.ClassBraceStyle = BraceStyle.DoNotChange; policy.ClassBraceStyle = BraceStyle.DoNotChange;
@ -63,7 +63,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
[Test()] [Test()]
public void TestNoIndentationInNamespaces () public void TestNoIndentationInNamespaces ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.NamespaceBraceStyle = BraceStyle.EndOfLine; policy.NamespaceBraceStyle = BraceStyle.EndOfLine;
policy.ClassBraceStyle = BraceStyle.DoNotChange; policy.ClassBraceStyle = BraceStyle.DoNotChange;
policy.IndentNamespaceBody = false; policy.IndentNamespaceBody = false;
@ -78,7 +78,7 @@ class Test {}
[Test()] [Test()]
public void TestClassIndentationInNamespacesCase2 () public void TestClassIndentationInNamespacesCase2 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.NamespaceBraceStyle = BraceStyle.NextLine; policy.NamespaceBraceStyle = BraceStyle.NextLine;
policy.ClassBraceStyle = BraceStyle.NextLine; policy.ClassBraceStyle = BraceStyle.NextLine;
policy.ConstructorBraceStyle = BraceStyle.NextLine; policy.ConstructorBraceStyle = BraceStyle.NextLine;
@ -108,7 +108,7 @@ namespace MonoDevelop.CSharp.Formatting
[Test()] [Test()]
public void TestIndentClassBody () public void TestIndentClassBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentClassBody = true; policy.IndentClassBody = true;
Test (policy, Test (policy,
@"class Test @"class Test
@ -134,7 +134,7 @@ Test a;
[Test()] [Test()]
public void TestIndentInterfaceBody () public void TestIndentInterfaceBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentInterfaceBody = true; policy.IndentInterfaceBody = true;
Test (policy, Test (policy,
@ -159,7 +159,7 @@ Test Foo ();
[Test()] [Test()]
public void TestIndentStructBody () public void TestIndentStructBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentStructBody = true; policy.IndentStructBody = true;
Test (policy, Test (policy,
@ -184,7 +184,7 @@ Test Foo ();
[Test()] [Test()]
public void TestIndentEnumBody () public void TestIndentEnumBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentEnumBody = true; policy.IndentEnumBody = true;
Test (policy, Test (policy,
@ -209,7 +209,7 @@ A
[Test()] [Test()]
public void TestIndentMethodBody () public void TestIndentMethodBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentMethodBody = true; policy.IndentMethodBody = true;
Test (policy, Test (policy,
@ -252,7 +252,7 @@ A
[Test()] [Test()]
public void TestIndentMethodBodyOperatorCase () public void TestIndentMethodBodyOperatorCase ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentMethodBody = true; policy.IndentMethodBody = true;
var adapter = Test (policy, var adapter = Test (policy,
@ -286,7 +286,7 @@ A
[Test()] [Test()]
public void TestIndentPropertyBody () public void TestIndentPropertyBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentPropertyBody = true; policy.IndentPropertyBody = true;
var adapter = Test (policy, var adapter = Test (policy,
@ -319,7 +319,7 @@ set;
[Test()] [Test()]
public void TestIndentPropertyOneLine () public void TestIndentPropertyOneLine ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyFormatting = PropertyFormatting.AllowOneLine; policy.PropertyFormatting = PropertyFormatting.AllowOneLine;
policy.AllowPropertyGetBlockInline = true; policy.AllowPropertyGetBlockInline = true;
policy.AllowPropertySetBlockInline = true; policy.AllowPropertySetBlockInline = true;
@ -338,7 +338,7 @@ set;
[Test()] [Test()]
public void TestIndentPropertyOneLineCase2 () public void TestIndentPropertyOneLineCase2 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyFormatting = PropertyFormatting.AllowOneLine; policy.PropertyFormatting = PropertyFormatting.AllowOneLine;
policy.AllowPropertyGetBlockInline = true; policy.AllowPropertyGetBlockInline = true;
policy.AllowPropertySetBlockInline = true; policy.AllowPropertySetBlockInline = true;
@ -357,7 +357,7 @@ set;
[Test()] [Test()]
public void TestIndentPropertyBodyIndexerCase () public void TestIndentPropertyBodyIndexerCase ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentPropertyBody = true; policy.IndentPropertyBody = true;
var adapter = Test (policy, var adapter = Test (policy,
@ -402,7 +402,7 @@ set {
[Test()] [Test()]
public void TestPropertyAlignment () public void TestPropertyAlignment ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyFormatting = PropertyFormatting.AllowOneLine; policy.PropertyFormatting = PropertyFormatting.AllowOneLine;
var adapter = Test (policy, var adapter = Test (policy,
@"class Test @"class Test
@ -435,7 +435,7 @@ set {
[Test()] [Test()]
public void TestIndentNamespaceBody () public void TestIndentNamespaceBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.ClassBraceStyle = BraceStyle.DoNotChange; policy.ClassBraceStyle = BraceStyle.DoNotChange;
policy.NamespaceBraceStyle = BraceStyle.EndOfLine; policy.NamespaceBraceStyle = BraceStyle.EndOfLine;
policy.IndentNamespaceBody = true; policy.IndentNamespaceBody = true;
@ -458,7 +458,7 @@ class FooBar {}
[Test()] [Test()]
public void TestMethodIndentation () public void TestMethodIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.MethodBraceStyle = BraceStyle.DoNotChange; policy.MethodBraceStyle = BraceStyle.DoNotChange;
Test (policy, Test (policy,
@ -475,7 +475,7 @@ MyType TestMethod () {}
[Test()] [Test()]
public void TestPropertyIndentation () public void TestPropertyIndentation ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.PropertyBraceStyle = BraceStyle.DoNotChange; policy.PropertyBraceStyle = BraceStyle.DoNotChange;
Test (policy, Test (policy,
@ -491,7 +491,7 @@ MyType TestMethod () {}
[Test()] [Test()]
public void TestPropertyIndentationCase2 () public void TestPropertyIndentationCase2 ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
Test (policy, Test (policy,
@"class Test @"class Test
@ -514,7 +514,7 @@ set;
[Test()] [Test()]
public void TestIndentEventBody () public void TestIndentEventBody ()
{ {
CSharpFormattingPolicy policy = new CSharpFormattingPolicy (); CSharpFormattingOptions policy = new CSharpFormattingOptions ();
policy.IndentEventBody = true; policy.IndentEventBody = true;
var adapter = Test (policy, var adapter = Test (policy,

6
ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs
Unescape View File

@ -221,7 +221,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
public abstract class TestBase public abstract class TestBase
{ {
protected static ITextEditorAdapter GetResult (CSharpFormattingPolicy policy, string input) protected static ITextEditorAdapter GetResult (CSharpFormattingOptions policy, string input)
{ {
var adapter = new TextEditorTestAdapter (input); var adapter = new TextEditorTestAdapter (input);
var visitior = new AstFormattingVisitor (policy, adapter); var visitior = new AstFormattingVisitor (policy, adapter);
@ -233,7 +233,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
return adapter; return adapter;
} }
protected static ITextEditorAdapter Test (CSharpFormattingPolicy policy, string input, string expectedOutput) protected static ITextEditorAdapter Test (CSharpFormattingOptions policy, string input, string expectedOutput)
{ {
var adapter = new TextEditorTestAdapter (input); var adapter = new TextEditorTestAdapter (input);
var visitior = new AstFormattingVisitor (policy, adapter); var visitior = new AstFormattingVisitor (policy, adapter);
@ -245,7 +245,7 @@ namespace ICSharpCode.NRefactory.FormattingTests
return adapter; return adapter;
} }
protected static void Continue (CSharpFormattingPolicy policy, ITextEditorAdapter adapter, string expectedOutput) protected static void Continue (CSharpFormattingOptions policy, ITextEditorAdapter adapter, string expectedOutput)
{ {
var visitior = new AstFormattingVisitor (policy, adapter); var visitior = new AstFormattingVisitor (policy, adapter);

2
ICSharpCode.NRefactory/CSharp/Ast/Expressions/Expression.cs
Unescape View File

@ -57,7 +57,7 @@ namespace ICSharpCode.NRefactory.CSharp
if (IsNull) if (IsNull)
return "Null"; return "Null";
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
AcceptVisitor(new OutputVisitor(w, new CSharpFormattingPolicy()), null); AcceptVisitor(new OutputVisitor(w, new CSharpFormattingOptions()), null);
return w.ToString(); return w.ToString();
} }

4
ICSharpCode.NRefactory/CSharp/Ast/PatternMatching/Pattern.cs
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under MIT X11 license (for details please see \doc\license.txt) // This code is distributed under MIT X11 license (for details please see \doc\license.txt)
using System; using System;
@ -88,7 +88,7 @@ namespace ICSharpCode.NRefactory.CSharp.PatternMatching
public override string ToString() public override string ToString()
{ {
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
AcceptVisitor(new OutputVisitor(w, new CSharpFormattingPolicy()), null); AcceptVisitor(new OutputVisitor(w, new CSharpFormattingOptions()), null);
return w.ToString(); return w.ToString();
} }
} }

2
ICSharpCode.NRefactory/CSharp/Ast/Statements/Statement.cs
Unescape View File

@ -92,7 +92,7 @@ namespace ICSharpCode.NRefactory.CSharp
if (IsNull) if (IsNull)
return "Null"; return "Null";
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
AcceptVisitor(new OutputVisitor(w, new CSharpFormattingPolicy()), null); AcceptVisitor(new OutputVisitor(w, new CSharpFormattingOptions()), null);
string text = w.ToString().TrimEnd().Replace("\t", "").Replace(w.NewLine, " "); string text = w.ToString().TrimEnd().Replace("\t", "").Replace(w.NewLine, " ");
if (text.Length > 100) if (text.Length > 100)
return text.Substring(0, 97) + "..."; return text.Substring(0, 97) + "...";

4
ICSharpCode.NRefactory/CSharp/Formatter/AstFormattingVisitor.cs
Unescape View File

@ -33,7 +33,7 @@ namespace ICSharpCode.NRefactory.CSharp
{ {
public class AstFormattingVisitor : DepthFirstAstVisitor<object, object> public class AstFormattingVisitor : DepthFirstAstVisitor<object, object>
{ {
CSharpFormattingPolicy policy; CSharpFormattingOptions policy;
ITextEditorAdapter data; ITextEditorAdapter data;
List<Change> changes = new List<Change> (); List<Change> changes = new List<Change> ();
Indent curIndent = new Indent (); Indent curIndent = new Indent ();
@ -66,7 +66,7 @@ namespace ICSharpCode.NRefactory.CSharp
set; set;
} }
public AstFormattingVisitor (CSharpFormattingPolicy policy, ITextEditorAdapter data) public AstFormattingVisitor (CSharpFormattingOptions policy, ITextEditorAdapter data)
{ {
this.policy = policy; this.policy = policy;
this.data = data; this.data = data;

24
ICSharpCode.NRefactory/CSharp/Formatter/CSharpFormattingPolicy.cs → ICSharpCode.NRefactory/CSharp/Formatter/CSharpFormattingOptions.cs
Unescape View File

@ -1,5 +1,5 @@
// //
// CSharpFormattingPolicy.cs // CSharpFormattingOptions.cs
// //
// Author: // Author:
// Mike Krüger <mkrueger@novell.com> // Mike Krüger <mkrueger@novell.com>
@ -60,7 +60,7 @@ namespace ICSharpCode.NRefactory.CSharp
ForceNewLine ForceNewLine
} }
public class CSharpFormattingPolicy public class CSharpFormattingOptions
{ {
public string Name { public string Name {
get; get;
@ -72,9 +72,9 @@ namespace ICSharpCode.NRefactory.CSharp
set; set;
} }
public CSharpFormattingPolicy Clone () public CSharpFormattingOptions Clone ()
{ {
return (CSharpFormattingPolicy)MemberwiseClone (); return (CSharpFormattingOptions)MemberwiseClone ();
} }
#region Indentation #region Indentation
@ -766,7 +766,7 @@ namespace ICSharpCode.NRefactory.CSharp
#endregion #endregion
public CSharpFormattingPolicy () public CSharpFormattingOptions ()
{ {
IndentNamespaceBody = true; IndentNamespaceBody = true;
IndentClassBody = IndentInterfaceBody = IndentStructBody = IndentEnumBody = true; IndentClassBody = IndentInterfaceBody = IndentStructBody = IndentEnumBody = true;
@ -880,22 +880,22 @@ namespace ICSharpCode.NRefactory.CSharp
BlankLinesBetweenMembers = 1; BlankLinesBetweenMembers = 1;
} }
/*public static CSharpFormattingPolicy Load (FilePath selectedFile) /*public static CSharpFormattingOptions Load (FilePath selectedFile)
{ {
using (var stream = System.IO.File.OpenRead (selectedFile)) { using (var stream = System.IO.File.OpenRead (selectedFile)) {
return Load (stream); return Load (stream);
} }
} }
public static CSharpFormattingPolicy Load (System.IO.Stream input) public static CSharpFormattingOptions Load (System.IO.Stream input)
{ {
CSharpFormattingPolicy result = new CSharpFormattingPolicy (); CSharpFormattingOptions result = new CSharpFormattingOptions ();
result.Name = "noname"; result.Name = "noname";
using (XmlTextReader reader = new XmlTextReader (input)) { using (XmlTextReader reader = new XmlTextReader (input)) {
while (reader.Read ()) { while (reader.Read ()) {
if (reader.NodeType == XmlNodeType.Element) { if (reader.NodeType == XmlNodeType.Element) {
if (reader.LocalName == "Property") { if (reader.LocalName == "Property") {
var info = typeof(CSharpFormattingPolicy).GetProperty (reader.GetAttribute ("name")); var info = typeof(CSharpFormattingOptions).GetProperty (reader.GetAttribute ("name"));
string valString = reader.GetAttribute ("value"); string valString = reader.GetAttribute ("value");
object value; object value;
if (info.PropertyType == typeof(bool)) { if (info.PropertyType == typeof(bool)) {
@ -926,7 +926,7 @@ namespace ICSharpCode.NRefactory.CSharp
writer.IndentChar = '\t'; writer.IndentChar = '\t';
writer.WriteStartElement ("FormattingProfile"); writer.WriteStartElement ("FormattingProfile");
writer.WriteAttributeString ("name", Name); writer.WriteAttributeString ("name", Name);
foreach (PropertyInfo info in typeof (CSharpFormattingPolicy).GetProperties ()) { foreach (PropertyInfo info in typeof (CSharpFormattingOptions).GetProperties ()) {
if (info.GetCustomAttributes (false).Any (o => o.GetType () == typeof(ItemPropertyAttribute))) { if (info.GetCustomAttributes (false).Any (o => o.GetType () == typeof(ItemPropertyAttribute))) {
writer.WriteStartElement ("Property"); writer.WriteStartElement ("Property");
writer.WriteAttributeString ("name", info.Name); writer.WriteAttributeString ("name", info.Name);
@ -938,9 +938,9 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} }
public bool Equals (CSharpFormattingPolicy other) public bool Equals (CSharpFormattingOptions other)
{ {
foreach (PropertyInfo info in typeof (CSharpFormattingPolicy).GetProperties ()) { foreach (PropertyInfo info in typeof (CSharpFormattingOptions).GetProperties ()) {
if (info.GetCustomAttributes (false).Any (o => o.GetType () == typeof(ItemPropertyAttribute))) { if (info.GetCustomAttributes (false).Any (o => o.GetType () == typeof(ItemPropertyAttribute))) {
object val = info.GetValue (this, null); object val = info.GetValue (this, null);
object otherVal = info.GetValue (other, null); object otherVal = info.GetValue (other, null);

6
ICSharpCode.NRefactory/CSharp/OutputVisitor/OutputVisitor.cs
Unescape View File

@ -20,7 +20,7 @@ namespace ICSharpCode.NRefactory.CSharp
public class OutputVisitor : IPatternAstVisitor<object, object> public class OutputVisitor : IPatternAstVisitor<object, object>
{ {
readonly IOutputFormatter formatter; readonly IOutputFormatter formatter;
readonly CSharpFormattingPolicy policy; readonly CSharpFormattingOptions policy;
readonly Stack<AstNode> containerStack = new Stack<AstNode>(); readonly Stack<AstNode> containerStack = new Stack<AstNode>();
readonly Stack<AstNode> positionStack = new Stack<AstNode>(); readonly Stack<AstNode> positionStack = new Stack<AstNode>();
@ -42,7 +42,7 @@ namespace ICSharpCode.NRefactory.CSharp
Division Division
} }
public OutputVisitor(TextWriter textWriter, CSharpFormattingPolicy formattingPolicy) public OutputVisitor(TextWriter textWriter, CSharpFormattingOptions formattingPolicy)
{ {
if (textWriter == null) if (textWriter == null)
throw new ArgumentNullException("textWriter"); throw new ArgumentNullException("textWriter");
@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp
this.policy = formattingPolicy; this.policy = formattingPolicy;
} }
public OutputVisitor(IOutputFormatter formatter, CSharpFormattingPolicy formattingPolicy) public OutputVisitor(IOutputFormatter formatter, CSharpFormattingOptions formattingPolicy)
{ {
if (formatter == null) if (formatter == null)
throw new ArgumentNullException("formatter"); throw new ArgumentNullException("formatter");

4
ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
Unescape View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</ProjectGuid> <ProjectGuid>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</ProjectGuid>
@ -157,7 +157,6 @@
<Compile Include="CSharp\Ast\TypeMembers\ParameterDeclaration.cs" /> <Compile Include="CSharp\Ast\TypeMembers\ParameterDeclaration.cs" />
<Compile Include="CSharp\Ast\TypeMembers\PropertyDeclaration.cs" /> <Compile Include="CSharp\Ast\TypeMembers\PropertyDeclaration.cs" />
<Compile Include="CSharp\Ast\TypeMembers\VariableInitializer.cs" /> <Compile Include="CSharp\Ast\TypeMembers\VariableInitializer.cs" />
<Compile Include="CSharp\Formatter\CSharpFormattingPolicy.cs" />
<Compile Include="CSharp\Formatter\Indent.cs" /> <Compile Include="CSharp\Formatter\Indent.cs" />
<Compile Include="CSharp\OutputVisitor\InsertParenthesesVisitor.cs" /> <Compile Include="CSharp\OutputVisitor\InsertParenthesesVisitor.cs" />
<Compile Include="CSharp\OutputVisitor\IOutputFormatter.cs" /> <Compile Include="CSharp\OutputVisitor\IOutputFormatter.cs" />
@ -350,6 +349,7 @@
<Compile Include="CSharp\Ast\TypeMembers\FixedFieldDeclaration.cs" /> <Compile Include="CSharp\Ast\TypeMembers\FixedFieldDeclaration.cs" />
<Compile Include="CSharp\Ast\TypeMembers\FixedVariableInitializer.cs" /> <Compile Include="CSharp\Ast\TypeMembers\FixedVariableInitializer.cs" />
<Compile Include="CSharp\Ast\GeneralScope\ExternAliasDeclaration.cs" /> <Compile Include="CSharp\Ast\GeneralScope\ExternAliasDeclaration.cs" />
<Compile Include="CSharp\Formatter\CSharpFormattingOptions.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="CSharp\" /> <Folder Include="CSharp\" />

Write Preview
Loading…
Cancel
Save