pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed blank line formatting bug.

newNRvisualizers
Mike Krüger 15 years ago
parent
1e4a1d911c
commit
cb114b8d29
1 changed files with 25 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      ICSharpCode.NRefactory/CSharp/Formatter/AstFormattingVisitor.cs

43
ICSharpCode.NRefactory/CSharp/Formatter/AstFormattingVisitor.cs
Unescape View File

@ -74,7 +74,7 @@ namespace ICSharpCode.NRefactory.CSharp
this.curIndent.TabSize = this.data.TabSize; this.curIndent.TabSize = this.data.TabSize;
CorrectBlankLines = true; CorrectBlankLines = true;
} }
public override object VisitCompilationUnit (CompilationUnit unit, object data) public override object VisitCompilationUnit (CompilationUnit unit, object data)
{ {
base.VisitCompilationUnit (unit, data); base.VisitCompilationUnit (unit, data);
@ -90,11 +90,20 @@ namespace ICSharpCode.NRefactory.CSharp
do { do {
line++; line++;
} while (line < data.LineCount && data.GetEditableLength (line) == data.GetIndentation (line).Length); } while (line < data.LineCount && data.GetEditableLength (line) == data.GetIndentation (line).Length);
var start = data.GetLineEndOffset (loc.Line); var start = data.LocationToOffset (node.EndLocation.Line, node.EndLocation.Column);
int foundBlankLines = line - loc.Line - 1;
StringBuilder sb = new StringBuilder (); StringBuilder sb = new StringBuilder ();
for (int i = 0; i < blankLines; i++) for (int i = 0; i < blankLines - foundBlankLines; i++)
sb.Append (data.EolMarker); sb.Append (data.EolMarker);
int removedChars = line < data.LineCount ? data.GetLineOffset (line) - start : 0;
int ws = start;
while (ws < data.Length && IsSpacing (data.GetCharAt (ws)))
ws++;
int removedChars = ws - start;
if (foundBlankLines > blankLines)
removedChars += data.GetLineEndOffset (loc.Line + foundBlankLines - blankLines) - data.GetLineEndOffset (loc.Line);
AddChange (start, removedChars, sb.ToString ()); AddChange (start, removedChars, sb.ToString ());
} }
@ -107,7 +116,6 @@ namespace ICSharpCode.NRefactory.CSharp
do { do {
line--; line--;
} while (line > 0 && data.GetEditableLength (line) == data.GetIndentation (line).Length); } while (line > 0 && data.GetEditableLength (line) == data.GetIndentation (line).Length);
int end = data.GetLineOffset (loc.Line); int end = data.GetLineOffset (loc.Line);
int start = line >= 1 ? data.GetLineEndOffset (line) : 0; int start = line >= 1 ? data.GetLineEndOffset (line) : 0;
StringBuilder sb = new StringBuilder (); StringBuilder sb = new StringBuilder ();
@ -118,20 +126,20 @@ namespace ICSharpCode.NRefactory.CSharp
public override object VisitUsingDeclaration (UsingDeclaration usingDeclaration, object data) public override object VisitUsingDeclaration (UsingDeclaration usingDeclaration, object data)
{ {
if (!(usingDeclaration.NextSibling is UsingDeclaration || usingDeclaration.NextSibling is UsingAliasDeclaration))
EnsureBlankLinesAfter (usingDeclaration, policy.BlankLinesAfterUsings);
if (!(usingDeclaration.PrevSibling is UsingDeclaration || usingDeclaration.PrevSibling is UsingAliasDeclaration)) if (!(usingDeclaration.PrevSibling is UsingDeclaration || usingDeclaration.PrevSibling is UsingAliasDeclaration))
EnsureBlankLinesBefore (usingDeclaration, policy.BlankLinesBeforeUsings); EnsureBlankLinesBefore (usingDeclaration, policy.BlankLinesBeforeUsings);
if (!(usingDeclaration.NextSibling is UsingDeclaration || usingDeclaration.NextSibling is UsingAliasDeclaration))
EnsureBlankLinesAfter (usingDeclaration, policy.BlankLinesAfterUsings);
return null; return null;
} }
public override object VisitUsingAliasDeclaration (UsingAliasDeclaration usingDeclaration, object data) public override object VisitUsingAliasDeclaration (UsingAliasDeclaration usingDeclaration, object data)
{ {
if (!(usingDeclaration.NextSibling is UsingDeclaration || usingDeclaration.NextSibling is UsingAliasDeclaration))
EnsureBlankLinesAfter (usingDeclaration, policy.BlankLinesAfterUsings);
if (!(usingDeclaration.PrevSibling is UsingDeclaration || usingDeclaration.PrevSibling is UsingAliasDeclaration)) if (!(usingDeclaration.PrevSibling is UsingDeclaration || usingDeclaration.PrevSibling is UsingAliasDeclaration))
EnsureBlankLinesBefore (usingDeclaration, policy.BlankLinesBeforeUsings); EnsureBlankLinesBefore (usingDeclaration, policy.BlankLinesBeforeUsings);
if (!(usingDeclaration.NextSibling is UsingDeclaration || usingDeclaration.NextSibling is UsingAliasDeclaration))
EnsureBlankLinesAfter (usingDeclaration, policy.BlankLinesAfterUsings);
return null; return null;
} }
@ -528,12 +536,12 @@ namespace ICSharpCode.NRefactory.CSharp
} }
return base.VisitFieldDeclaration (fieldDeclaration, data); return base.VisitFieldDeclaration (fieldDeclaration, data);
} }
public override object VisitFixedFieldDeclaration (FixedFieldDeclaration fixedFieldDeclaration, object data) public override object VisitFixedFieldDeclaration (FixedFieldDeclaration fixedFieldDeclaration, object data)
{ {
FixIndentationForceNewLine (fixedFieldDeclaration.StartLocation); FixIndentationForceNewLine (fixedFieldDeclaration.StartLocation);
FormatCommas (fixedFieldDeclaration, policy.SpaceBeforeFieldDeclarationComma, policy.SpaceAfterFieldDeclarationComma); FormatCommas (fixedFieldDeclaration, policy.SpaceBeforeFieldDeclarationComma, policy.SpaceAfterFieldDeclarationComma);
if (fixedFieldDeclaration.NextSibling is FieldDeclaration || fixedFieldDeclaration.NextSibling is FixedFieldDeclaration ) { if (fixedFieldDeclaration.NextSibling is FieldDeclaration || fixedFieldDeclaration.NextSibling is FixedFieldDeclaration) {
EnsureBlankLinesAfter (fixedFieldDeclaration, policy.BlankLinesBetweenFields); EnsureBlankLinesAfter (fixedFieldDeclaration, policy.BlankLinesBetweenFields);
} else if (IsMember (fixedFieldDeclaration.NextSibling)) { } else if (IsMember (fixedFieldDeclaration.NextSibling)) {
EnsureBlankLinesAfter (fixedFieldDeclaration, policy.BlankLinesBetweenMembers); EnsureBlankLinesAfter (fixedFieldDeclaration, policy.BlankLinesBetweenMembers);
@ -952,8 +960,8 @@ namespace ICSharpCode.NRefactory.CSharp
return; return;
} }
} }
// Console.WriteLine ("offset={0}, removedChars={1}, insertedText={2}", offset, removedChars , insertedText == null ? "<null>" : insertedText.Replace("\n", "\\n").Replace("\t", "\\t").Replace(" ", ".")); //Console.WriteLine ("offset={0}, removedChars={1}, insertedText={2}", offset, removedChars, insertedText == null ? "<null>" : insertedText.Replace ("\n", "\\n").Replace ("\t", "\\t").Replace (" ", "."));
// Console.WriteLine (Environment.StackTrace); //Console.WriteLine (Environment.StackTrace);
changes.Add (new Change (offset, removedChars, insertedText)); changes.Add (new Change (offset, removedChars, insertedText));
} }
@ -1556,13 +1564,13 @@ namespace ICSharpCode.NRefactory.CSharp
void FixIndentation (AstLocation location, int relOffset) void FixIndentation (AstLocation location, int relOffset)
{ {
if (location.Line < 0 || location.Line >= data.LineCount) { if (location.Line < 1 || location.Line > data.LineCount) {
Console.WriteLine ("Invalid location " + location); Console.WriteLine ("Invalid location " + location);
Console.WriteLine (Environment.StackTrace); Console.WriteLine (Environment.StackTrace);
return; return;
} }
string lineIndent = data.GetIndentation (location.Line); string lineIndent = data.GetIndentation (location.Line);
string indentString = this.curIndent.IndentString; string indentString = this.curIndent.IndentString;
if (indentString != lineIndent && location.Column - 1 + relOffset == lineIndent.Length) { if (indentString != lineIndent && location.Column - 1 + relOffset == lineIndent.Length) {
AddChange (data.GetLineOffset (location.Line), lineIndent.Length, indentString); AddChange (data.GetLineOffset (location.Line), lineIndent.Length, indentString);
@ -1573,9 +1581,9 @@ namespace ICSharpCode.NRefactory.CSharp
{ {
string lineIndent = data.GetIndentation (location.Line); string lineIndent = data.GetIndentation (location.Line);
string indentString = this.curIndent.IndentString; string indentString = this.curIndent.IndentString;
if (indentString != lineIndent && location.Column - 1 == lineIndent.Length) { if (location.Column - 1 == lineIndent.Length) {
AddChange (data.GetLineOffset (location.Line), lineIndent.Length, indentString); AddChange (data.GetLineOffset (location.Line), lineIndent.Length, indentString);
} else { } else {
int offset = data.LocationToOffset (location.Line, location.Column); int offset = data.LocationToOffset (location.Line, location.Column);
int start = SearchWhitespaceLineStart (offset); int start = SearchWhitespaceLineStart (offset);
if (start > 0) { if (start > 0) {
@ -1593,4 +1601,3 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} }
} }

Write Preview
Loading…
Cancel
Save