[Refactoring] Script now corrects the formatting of inserted &

replaced nodes.

ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs

@@ -739,15 +739,15 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 			
 			var lastLoc = fieldDeclaration.StartLocation;
-			curIndent.Push(IndentType.Block);
 			foreach (var initializer in fieldDeclaration.Variables) {
 				if (lastLoc.Line != initializer.StartLocation.Line) {
+					curIndent.Push(IndentType.Block);
 					FixStatementIndentation(initializer.StartLocation);
+					curIndent.Pop ();
 					lastLoc = initializer.StartLocation;
 				}
 				initializer.AcceptVisitor(this);
 			}
-			curIndent.Pop ();
 		}
 
 		public override void VisitFixedFieldDeclaration(FixedFieldDeclaration fixedFieldDeclaration)
@@ -1179,8 +1179,10 @@ namespace ICSharpCode.NRefactory.CSharp
 					nextStatementIndent = " ";
 				}
 			}
+			bool pushed = false;
 			if (policy.IndentBlocks && !(policy.AlignEmbeddedIfStatements && node is IfElseStatement && node.Parent is IfElseStatement || policy.AlignEmbeddedUsingStatements && node is UsingStatement && node.Parent is UsingStatement)) { 
 				curIndent.Push(IndentType.Block);
+				pushed = true;
 			}
 			if (isBlock) {
 				VisitBlockWithoutFixingBraces((BlockStatement)node, false);
@@ -1190,7 +1192,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 				node.AcceptVisitor(this);
 			}
-			if (policy.IndentBlocks && !(policy.AlignEmbeddedIfStatements && node is IfElseStatement && node.Parent is IfElseStatement || policy.AlignEmbeddedUsingStatements && node is UsingStatement && node.Parent is UsingStatement)) { 
+			if (pushed) { 
 				curIndent.Pop();
 			}
 			switch (braceForcement) {
@@ -2105,6 +2107,10 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		void FixStatementIndentation(TextLocation location)
 		{
+			if (location.Line < 1 || location.Column < 1) {
+				Console.WriteLine("invalid location!");
+				return;
+			}
 			int offset = document.GetOffset(location);
 			if (offset <= 0) {
 				Console.WriteLine("possible wrong offset");

ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs

@@ -82,6 +82,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				StatementBraceStyle = BraceStyle.EndOfLine,
 	
 				ElseNewLinePlacement = NewLinePlacement.SameLine,
+				ElseIfNewLinePlacement = NewLinePlacement.SameLine,
 				CatchNewLinePlacement = NewLinePlacement.SameLine,
 				FinallyNewLinePlacement = NewLinePlacement.SameLine,
 				WhileNewLinePlacement = NewLinePlacement.SameLine,

ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs

@@ -152,6 +152,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				text += Options.EolMarker;
 			InsertText(startOffset, text);
 			output.RegisterTrackedSegments(this, startOffset);
+			CorrectFormatting (node, insertNode);
 		}
 
 		public void InsertAfter(AstNode node, AstNode insertNode)
@@ -164,6 +165,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			var insertOffset = GetCurrentOffset(node.EndLocation);
 			InsertText(insertOffset, text);
 			output.RegisterTrackedSegments(this, insertOffset);
+			CorrectFormatting (node, insertNode);
 		}
 
 		public void AddTo(BlockStatement bodyStatement, AstNode insertNode)
@@ -172,6 +174,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			var output = OutputNode(1 + GetIndentLevelAt(startOffset), insertNode, true);
 			InsertText(startOffset, output.Text);
 			output.RegisterTrackedSegments(this, startOffset);
+			CorrectFormatting (null, insertNode);
 		}
 		
 		public virtual Task Link (params AstNode[] nodes)
@@ -196,6 +199,18 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			output.TrimStart ();
 			Replace (startOffset, segment.Length, output.Text);
 			output.RegisterTrackedSegments(this, startOffset);
+			CorrectFormatting (node, node);
+		}
+
+		void CorrectFormatting(AstNode node, AstNode newNode)
+		{
+			if (node is Identifier || node is IdentifierExpression || node is CSharpTokenNode || node is AstType)
+				return;
+			if (node == null || node.Parent is BlockStatement) {
+				FormatText(newNode); 
+			} else {
+				FormatText((node.Parent != null && (node.Parent is Statement || node.Parent is Expression || node.Parent is VariableInitializer)) ? node.Parent : newNode); 
+			}
 		}
 		
 		public abstract void Remove (AstNode node, bool removeEmptyLine = true);

ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddCatchTypeTests.cs

@@ -50,8 +50,7 @@ class TestClass
 	public void F()
 	{
 		try {
-		}
+		} catch (System.Exception e) {
-		catch (System.Exception e) {
 		}
 	}
 }");
@@ -107,8 +106,7 @@ class TestClass
 	public void F()
 	{
 		try {
-		}
+		} catch (Exception e) {
-		catch (Exception e) {
 		}
 	}
 }");

ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertSwitchToIfTests.cs

@@ -61,11 +61,9 @@ class TestClass
 	{
 		if (a == 0) {
 			return 0;
-		} else
+		} else if (a == 1 || a == 2) {
-			if (a == 1 || a == 2) {
 			return 1;
-		} else
+		} else if (a == 3 || a == 4 || a == 5) {
-				if (a == 3 || a == 4 || a == 5) {
 			return 1;
 		} else {
 			return 2;
@@ -101,11 +99,9 @@ class TestClass
 	{
 		if (a == 0) {
 			return 0;
-		} else
+		} else if (a == 1 || a == 2) {
-			if (a == 1 || a == 2) {
 			return 1;
-		} else
+		} else if (a == 3 || a == 4 || a == 5) {
-				if (a == 3 || a == 4 || a == 5) {
 			return 1;
 		}
 	}
@@ -142,10 +138,8 @@ class TestClass
 	{
 		if (a == 0) {
 			int b = 1;
-		} else
+		} else if (a == 1 || a == 2) {
-			if (a == 1 || a == 2) {
+		} else if (a == 3 || a == 4 || a == 5) {
-		} else
-				if (a == 3 || a == 4 || a == 5) {
 		} else {
 		}
 	}
@@ -176,8 +170,7 @@ class TestClass
 	{
 		if (a == 0) {
 			return 0;
-		} else
+		} else if (a == (1 == 1 ? 1 : 2)) {
-			if (a == (1 == 1 ? 1 : 2)) {
 			return 1;
 		} else {
 			return 2;

ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveRedundantCatchTypeTests.cs

@@ -52,8 +52,7 @@ class TestClass
 	public void F()
 	{
 		try {
-		}
+		} catch {
-		catch {
 		}
 	}
 }");
@@ -79,8 +78,7 @@ class TestClass
 	public void F()
 	{
 		try {
-		}
+		} catch {
-		catch {
 			System.Console.WriteLine (""Hi"");
 		}
 	}

ICSharpCode.NRefactory.Tests/CSharp/CodeActions/SplitDeclarationAndAssignmentTests.cs

@@ -100,7 +100,8 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"	void Test ()" + Environment.NewLine +
 				"	{" + Environment.NewLine +
 				"		int i;" + Environment.NewLine +
-				"		for (i = 1; i < 10; i++) {}" + Environment.NewLine +
+				"		for (i = 1; i < 10; i++) {" + Environment.NewLine +
+				"		}" + Environment.NewLine +
 				"	}" + Environment.NewLine +
 				"}", result);
 		}

ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ConstantConditionIssueTests.cs

@@ -114,7 +114,8 @@ class TestClass
 {
 	void TestMethod ()
 	{
-		for (int i = 0; true; i++) ;
+		for (int i = 0; true; i++)
+			;
 	}
 }";
 			Test<ConstantConditionIssue> (input, 1, output);
@@ -128,7 +129,8 @@ class TestClass
 {
 	void TestMethod ()
 	{
-		while (1 > 0) ;
+		while (1 > 0)
+			;
 	}
 }";
 			var output = @"
@@ -136,7 +138,8 @@ class TestClass
 {
 	void TestMethod ()
 	{
-		while (true) ;
+		while (true)
+			;
 	}
 }";
 			Test<ConstantConditionIssue> (input, 1, output);

ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/ExpressionIsAlwaysOfProvidedTypeIssueTests.cs

@@ -39,7 +39,8 @@ class TestClass
 {
 	void TestMethod (" + variableType + @" x)
 	{
-		if (x is " + providedType + @") ;
+		if (x is " + providedType + @")
+			;
 	}
 }";
 			var output = @"
@@ -47,7 +48,8 @@ class TestClass
 {
 	void TestMethod (" + variableType + @" x)
 	{
-		if (x != null) ;
+		if (x != null)
+			;
 	}
 }";
 			Test<ExpressionIsAlwaysOfProvidedTypeIssue> (input, 1, output);
@@ -73,7 +75,8 @@ class TestClass
 {
 	void TestMethod<T> (T x) where T : TestClass
 	{
-		if (x is TestClass) ;
+		if (x is TestClass)
+			;
 	}
 }";
 			var output = @"
@@ -81,7 +84,8 @@ class TestClass
 {
 	void TestMethod<T> (T x) where T : TestClass
 	{
-		if (x != null) ;
+		if (x != null)
+			;
 	}
 }";
 			Test<ExpressionIsAlwaysOfProvidedTypeIssue> (input, 1, output);

ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InspectionActionTestBase.cs

@@ -59,6 +59,9 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
 			}
 			bool pass = expectedOutput == ctx.Text;
 			if (!pass) {
+				Console.WriteLine ("expected:");
+				Console.WriteLine (expectedOutput);
+				Console.WriteLine ("got:");
 				Console.WriteLine (ctx.Text);
 			}
 			Assert.AreEqual (expectedOutput, ctx.Text);

ICSharpCode.NRefactory.Tests/FormattingTests/TextEditorTestAdapter.cs

@@ -48,6 +48,9 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 			expectedOutput = NormalizeNewlines(expectedOutput);
 			IDocument doc = GetResult(policy, input, mode);
 			if (expectedOutput != doc.Text) {
+				Console.WriteLine ("expected:");
+				Console.WriteLine (expectedOutput);
+				Console.WriteLine ("got:");
 				Console.WriteLine (doc.Text);
 			}
 			Assert.AreEqual (expectedOutput, doc.Text);