diff options
7 files changed, 6 insertions, 6 deletions
diff --git a/main/external/nrefactory b/main/external/nrefactory -Subproject bc6375e432a67906d570e4c84f6cbc763bca7ec +Subproject bac3cc45fe057ac9c3c1971196eb034a9f9a800 diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml index 7f29ec2160..6307fa8d2d 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml @@ -65,7 +65,7 @@ THE SOFTWARE. <StatementBraceStyle>NextLine</StatementBraceStyle> <AllowIfBlockInline>False</AllowIfBlockInline> <ElseNewLinePlacement>NewLine</ElseNewLinePlacement> - <ElseIfNewLinePlacement>DoNotCare</ElseIfNewLinePlacement> + <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement> <CatchNewLinePlacement>NewLine</CatchNewLinePlacement> <FinallyNewLinePlacement>NewLine</FinallyNewLinePlacement> <WhileNewLinePlacement>DoNotCare</WhileNewLinePlacement> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml index 28dee7907e..098ea2dc93 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml @@ -65,7 +65,7 @@ THE SOFTWARE. <StatementBraceStyle>NextLineShifted2</StatementBraceStyle> <AllowIfBlockInline>False</AllowIfBlockInline> <ElseNewLinePlacement>SameLine</ElseNewLinePlacement> - <ElseIfNewLinePlacement>DoNotCare</ElseIfNewLinePlacement> + <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement> <CatchNewLinePlacement>SameLine</CatchNewLinePlacement> <FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement> <WhileNewLinePlacement>SameLine</WhileNewLinePlacement> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml index 272d5900b4..cfa6e5d5c2 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml @@ -65,7 +65,7 @@ THE SOFTWARE. <StatementBraceStyle>EndOfLine</StatementBraceStyle> <AllowIfBlockInline>False</AllowIfBlockInline> <ElseNewLinePlacement>SameLine</ElseNewLinePlacement> - <ElseIfNewLinePlacement>DoNotCare</ElseIfNewLinePlacement> + <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement> <CatchNewLinePlacement>SameLine</CatchNewLinePlacement> <FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement> <WhileNewLinePlacement>SameLine</WhileNewLinePlacement> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml index 37430efc11..1adadef47f 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml @@ -65,7 +65,7 @@ THE SOFTWARE. <StatementBraceStyle>EndOfLine</StatementBraceStyle> <AllowIfBlockInline>False</AllowIfBlockInline> <ElseNewLinePlacement>SameLine</ElseNewLinePlacement> - <ElseIfNewLinePlacement>DoNotCare</ElseIfNewLinePlacement> + <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement> <CatchNewLinePlacement>SameLine</CatchNewLinePlacement> <FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement> <WhileNewLinePlacement>SameLine</WhileNewLinePlacement> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml index d09e26afc5..2db1c3e21c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml @@ -65,7 +65,7 @@ THE SOFTWARE. <StatementBraceStyle>EndOfLine</StatementBraceStyle> <AllowIfBlockInline>False</AllowIfBlockInline> <ElseNewLinePlacement>SameLine</ElseNewLinePlacement> - <ElseIfNewLinePlacement>DoNotCare</ElseIfNewLinePlacement> + <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement> <CatchNewLinePlacement>SameLine</CatchNewLinePlacement> <FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement> <WhileNewLinePlacement>SameLine</WhileNewLinePlacement> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml index 3d6199ffd6..f23fba6049 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml @@ -65,7 +65,7 @@ THE SOFTWARE. <StatementBraceStyle>NextLineShifted</StatementBraceStyle> <AllowIfBlockInline>False</AllowIfBlockInline> <ElseNewLinePlacement>SameLine</ElseNewLinePlacement> - <ElseIfNewLinePlacement>DoNotCare</ElseIfNewLinePlacement> + <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement> <CatchNewLinePlacement>SameLine</CatchNewLinePlacement> <FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement> <WhileNewLinePlacement>SameLine</WhileNewLinePlacement> |