Browse Source

Added banner style brace style.

newNRvisualizers
mike 14 years ago
parent
commit
c22e11db8a
  1. 21
      ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
  2. 3
      ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs

21
ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs

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

3
ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs

@ -37,7 +37,8 @@ namespace ICSharpCode.NRefactory.CSharp
EndOfLineWithoutSpace, EndOfLineWithoutSpace,
NextLine, NextLine,
NextLineShifted, NextLineShifted,
NextLineShifted2 NextLineShifted2,
BannerStyle
} }
public enum BraceForcement public enum BraceForcement

Loading…
Cancel
Save