* Src/PrettyPrinter/CSharp/OutputFormatter.cs:

* Src/PrettyPrinter/CSharp/PrettyPrintOptions.cs:
* Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs: Added place on new
  line options.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3856 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

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

@@ -986,6 +986,10 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		#region Statements
 		
 		void OutputBlock(BlockStatement blockStatement, BraceStyle braceStyle)
+		{
+			OutputBlock(blockStatement, braceStyle, true);
+		}
+		void OutputBlock(BlockStatement blockStatement, BraceStyle braceStyle, bool emitEndingNewLine)
 		{
 			BeginVisit(blockStatement);
 			if (blockStatement.IsNull) {
@@ -1003,7 +1007,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					if (!outputFormatter.LastCharacterIsNewLine)
 						outputFormatter.NewLine();
 				}
-				outputFormatter.EndBrace(this.prettyPrintOptions.IndentBlocks);
+				outputFormatter.EndBrace (this.prettyPrintOptions.IndentBlocks, emitEndingNewLine);
 			}
 			EndVisit(blockStatement);
 		}
@@ -1261,7 +1265,11 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			}
 			
 			if (ifElseStatement.HasElseStatements) {
+				if (prettyPrintOptions.PlaceElseOnNewLine) {
 					outputFormatter.Indent();
+				} else {
+					outputFormatter.Space();
+				}
 				outputFormatter.PrintToken(Tokens.Else);
 				PrintIfSection(ifElseStatement.FalseStatement);
 			}
@@ -1271,6 +1279,12 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		
 		void PrintIfSection(List<Statement> statements)
 		{
+			if (statements.Count == 1 && (statements[0] is BlockStatement)) {
+				OutputBlock((BlockStatement)statements[0], 
+				            prettyPrintOptions.StatementBraceStyle, 
+				            prettyPrintOptions.PlaceElseOnNewLine);
+				return;
+			}
 			if (statements.Count != 1 || !(statements[0] is BlockStatement)) {
 				outputFormatter.Space();
 			}
@@ -1290,7 +1304,11 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		
 		public override object TrackedVisitElseIfSection(ElseIfSection elseIfSection, object data)
 		{
+			if (prettyPrintOptions.PlaceElseOnNewLine) {
 				outputFormatter.Indent();
+			} else {
+				outputFormatter.Space();
+			}
 			outputFormatter.PrintToken(Tokens.Else);
 			outputFormatter.Space();
 			outputFormatter.PrintToken(Tokens.If);
@@ -1307,7 +1325,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			}
 			outputFormatter.PrintToken(Tokens.CloseParenthesis);
 			
-			WriteEmbeddedStatement(elseIfSection.EmbeddedStatement);
+			WriteEmbeddedStatement(elseIfSection.EmbeddedStatement, prettyPrintOptions.PlaceElseOnNewLine);
 			
 			return null;
 		}
@@ -1371,9 +1389,14 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		}
 		
 		void WriteEmbeddedStatement (Statement statement)
+		{
+			WriteEmbeddedStatement (statement, true);
+		}
+		
+		void WriteEmbeddedStatement (Statement statement, bool emitEndingNewLine)
 		{
 			if (statement is BlockStatement) {
-				TrackVisit(statement, prettyPrintOptions.StatementBraceStyle);
+				OutputBlock((BlockStatement)statement, prettyPrintOptions.StatementBraceStyle, emitEndingNewLine);
 			} else {
 				++outputFormatter.IndentationLevel;
 				outputFormatter.NewLine();
@@ -1593,10 +1616,14 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				outputFormatter.PrintToken(Tokens.Do);
 			}
 			
-			WriteEmbeddedStatement(doLoopStatement.EmbeddedStatement);
+			WriteEmbeddedStatement(doLoopStatement.EmbeddedStatement, prettyPrintOptions.PlaceWhileOnNewLine);
 			
 			if (doLoopStatement.ConditionPosition == ConditionPosition.End) {
+				if (prettyPrintOptions.PlaceWhileOnNewLine) {
 					outputFormatter.Indent();
+				} else {
+					outputFormatter.Space();
+				}
 				PrintLoopCheck(doLoopStatement);
 				outputFormatter.PrintToken(Tokens.Semicolon);
 				outputFormatter.NewLine();
@@ -1694,23 +1721,34 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		public override object TrackedVisitTryCatchStatement(TryCatchStatement tryCatchStatement, object data)
 		{
 			outputFormatter.PrintToken(Tokens.Try);
-			WriteEmbeddedStatement(tryCatchStatement.StatementBlock);
 			
-			foreach (CatchClause catchClause in tryCatchStatement.CatchClauses) {
+			WriteEmbeddedStatement (tryCatchStatement.StatementBlock, prettyPrintOptions.PlaceCatchOnNewLine);
-				TrackVisit(catchClause, data);
+			for (int i = 0 ; i < tryCatchStatement.CatchClauses.Count; i++) {
+				TrackVisit(tryCatchStatement.CatchClauses[i], i == tryCatchStatement.CatchClauses.Count - 1);
 			}
 			
 			if (!tryCatchStatement.FinallyBlock.IsNull) {
+				if (prettyPrintOptions.PlaceFinallyOnNewLine) {
+	//				if (!prettyPrintOptions.PlaceCatchOnNewLine) 
+	//					outputFormatter.NewLine ();
 					outputFormatter.Indent();
+				} else {
+					outputFormatter.Space();
+				}
 				outputFormatter.PrintToken(Tokens.Finally);
 				WriteEmbeddedStatement(tryCatchStatement.FinallyBlock);
 			}
+			
 			return null;
 		}
 		
 		public override object TrackedVisitCatchClause(CatchClause catchClause, object data)
 		{
+			if (prettyPrintOptions.PlaceCatchOnNewLine) {
 				outputFormatter.Indent();
+			} else {
+				outputFormatter.Space();
+			}
 			outputFormatter.PrintToken(Tokens.Catch);
 			
 			if (!catchClause.TypeReference.IsNull) {
@@ -1731,7 +1769,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				}
 				outputFormatter.PrintToken(Tokens.CloseParenthesis);
 			}
-			WriteEmbeddedStatement(catchClause.StatementBlock);
+			WriteEmbeddedStatement(catchClause.StatementBlock, ((bool)data) ? prettyPrintOptions.PlaceFinallyOnNewLine : prettyPrintOptions.PlaceCatchOnNewLine);
 			return null;
 		}
 		

src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/OutputFormatter.cs

@@ -88,6 +88,11 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		}
 		
 		public void EndBrace (bool indent)
+		{
+			EndBrace (indent, true);
+		}
+		
+		public void EndBrace (bool indent, bool emitNewLine)
 		{
 			BraceStyle style = (BraceStyle)braceStack.Pop();
 			switch (style) {
@@ -98,11 +103,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 						--IndentationLevel;
 					Indent();
 					PrintToken(Tokens.CloseCurlyBrace);
+					if (emitNewLine)
 						NewLine();
 					break;
 				case BraceStyle.NextLineShifted:
 					Indent();
 					PrintToken(Tokens.CloseCurlyBrace);
+					if (emitNewLine)
 						NewLine();
 					if (indent)
 						--IndentationLevel;
@@ -112,6 +119,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 						--IndentationLevel;
 					Indent();
 					PrintToken(Tokens.CloseCurlyBrace);
+					if (emitNewLine)
 						NewLine();
 					--IndentationLevel;
 					break;

src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/PrettyPrintOptions.cs

@@ -340,6 +340,48 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 
 		#endregion
 		
+		#region NewLines
+		bool placeCatchOnNewLine = true;
+		public bool PlaceCatchOnNewLine {
+			get {
+				return placeCatchOnNewLine;
+			}
+			set {
+				placeCatchOnNewLine  = value;
+			}
+		}
+		
+		bool placeFinallyOnNewLine = true;
+		public bool PlaceFinallyOnNewLine {
+			get {
+				return placeFinallyOnNewLine;
+			}
+			set {
+				placeFinallyOnNewLine  = value;
+			}
+		}
+		
+		bool placeElseOnNewLine = true;
+		public bool PlaceElseOnNewLine {
+			get {
+				return placeElseOnNewLine;
+			}
+			set {
+				placeElseOnNewLine  = value;
+			}
+		}
+		
+		bool placeWhileOnNewLine = true;
+		public bool PlaceWhileOnNewLine {
+			get {
+				return placeWhileOnNewLine;
+			}
+			set {
+				placeWhileOnNewLine  = value;
+			}
+		}
+		#endregion
+		
 		#region Spaces
 		
 		#region Before Parentheses