|
|
|
|
@ -801,6 +801,7 @@ namespace ICSharpCode.NRefactory.CSharp
@@ -801,6 +801,7 @@ namespace ICSharpCode.NRefactory.CSharp
|
|
|
|
|
case BraceStyle.EndOfLineWithoutSpace: |
|
|
|
|
startBrace = "{"; |
|
|
|
|
break; |
|
|
|
|
case BraceStyle.BannerStyle: |
|
|
|
|
case BraceStyle.EndOfLine: |
|
|
|
|
startBrace = " {"; |
|
|
|
|
break; |
|
|
|
|
@ -882,6 +883,7 @@ namespace ICSharpCode.NRefactory.CSharp
@@ -882,6 +883,7 @@ namespace ICSharpCode.NRefactory.CSharp
|
|
|
|
|
case BraceStyle.NextLine: |
|
|
|
|
startBrace = this.EolMarker + curIndent.IndentString + "}"; |
|
|
|
|
break; |
|
|
|
|
case BraceStyle.BannerStyle: |
|
|
|
|
case BraceStyle.NextLineShifted2: |
|
|
|
|
case BraceStyle.NextLineShifted: |
|
|
|
|
startBrace = this.EolMarker + curIndent.IndentString + curIndent.SingleIndent + "}"; |
|
|
|
|
@ -916,7 +918,7 @@ namespace ICSharpCode.NRefactory.CSharp
@@ -916,7 +918,7 @@ namespace ICSharpCode.NRefactory.CSharp
|
|
|
|
|
startIndent = ""; |
|
|
|
|
endIndent = IsLineIsEmptyUpToEol (rbraceOffset) ? curIndent.IndentString : this.EolMarker + curIndent.IndentString; |
|
|
|
|
break; |
|
|
|
|
case BraceStyle.EndOfLine: |
|
|
|
|
case BraceStyle.BannerStyle: |
|
|
|
|
var prevNode = lbrace.GetPrevNode (); |
|
|
|
|
if (prevNode is Comment) { |
|
|
|
|
// delete old bracket
|
|
|
|
|
@ -931,6 +933,23 @@ namespace ICSharpCode.NRefactory.CSharp
@@ -931,6 +933,23 @@ namespace ICSharpCode.NRefactory.CSharp
|
|
|
|
|
} else { |
|
|
|
|
startIndent = " "; |
|
|
|
|
} |
|
|
|
|
endIndent = IsLineIsEmptyUpToEol (rbraceOffset) ? curIndent.IndentString + curIndent.SingleIndent : this.EolMarker + curIndent.IndentString + curIndent.SingleIndent; |
|
|
|
|
break; |
|
|
|
|
case BraceStyle.EndOfLine: |
|
|
|
|
prevNode = lbrace.GetPrevNode (); |
|
|
|
|
if (prevNode is Comment) { |
|
|
|
|
// delete old bracket
|
|
|
|
|
AddChange (whitespaceStart, lbraceOffset - whitespaceStart + 1, ""); |
|
|
|
|
|
|
|
|
|
while (prevNode is Comment) { |
|
|
|
|
prevNode = prevNode.GetPrevNode (); |
|
|
|
|
} |
|
|
|
|
whitespaceStart = document.GetOffset (prevNode.EndLocation); |
|
|
|
|
lbraceOffset = whitespaceStart; |
|
|
|
|
startIndent = " {"; |
|
|
|
|
} else { |
|
|
|
|
startIndent = " "; |
|
|
|
|
} |
|
|
|
|
endIndent = IsLineIsEmptyUpToEol (rbraceOffset) ? curIndent.IndentString : this.EolMarker + curIndent.IndentString; |
|
|
|
|
break; |
|
|
|
|
case BraceStyle.NextLine: |
|
|
|
|
|