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

Fixed bug in moving code lines with appended comments: Code and comment were not kept together.

pull/45/merge
Andreas Weizel 12 years ago
parent
95109a4af2
commit
74bbb274c0
1 changed files with 6 additions and 2 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. 8
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/CodeManipulation.cs

8
src/AddIns/BackendBindings/CSharpBinding/Project/Src/CodeManipulation.cs
Unescape View File

@ -158,11 +158,15 @@ namespace CSharpBinding
if (swapIndex < 0 || swapIndex >= siblings.Count) if (swapIndex < 0 || swapIndex >= siblings.Count)
return; return;
AstNode swapSibling = siblings[swapIndex]; AstNode swapSibling = siblings[swapIndex];
Selection swapSiblingSelection = ExtendSelectionToComments(editor.Document, swapSibling.StartLocation, swapSibling.EndLocation, commentsBlankLines);
if (swapSiblingSelection == null)
swapSiblingSelection = new Selection() { Start = swapSibling.StartLocation, End = swapSibling.EndLocation };
// Swap them // Swap them
string currentNodeText = editor.Document.GetText(statementSelection.Start, statementSelection.End); string currentNodeText = editor.Document.GetText(statementSelection.Start, statementSelection.End);
SwapText(editor.Document, statementSelection.Start, statementSelection.End, swapSibling.StartLocation, swapSibling.EndLocation); // SwapText(editor.Document, statementSelection.Start, statementSelection.End, swapSibling.StartLocation, swapSibling.EndLocation);
SwapText(editor.Document, statementSelection.Start, statementSelection.End, swapSiblingSelection.Start, swapSiblingSelection.End);
// Move caret to the start of moved statement // Move caret to the start of moved statement
TextLocation upperLocation = new TextLocation[] {statementSelection.Start, swapSibling.StartLocation}.Min(); TextLocation upperLocation = new TextLocation[] {statementSelection.Start, swapSiblingSelection.Start}.Min();
if (direction == MoveStatementDirection.Up) if (direction == MoveStatementDirection.Up)
editor.Caret.Location = upperLocation; editor.Caret.Location = upperLocation;
else { else {

Write Preview
Loading…
Cancel
Save