Skip to content

Commit

Permalink
Merge pull request #94 from cfognom/master
Browse files Browse the repository at this point in the history 
Rework DuplicateSelection to fix bugs.
Also moved package references to NuGet
  • Loading branch information
@justcla
justcla authored Feb 21, 2023
2 parents 3b2666f + f59388a commit 07b6e68
Show file tree
Hide file tree
Showing 3 changed files with 176 additions and 308 deletions.
146 changes: 96 additions & 50 deletions HotCommands/Commands/DuplicateSelection.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.OLE.Interop;
using Microsoft.VisualStudio.Shell;
Expand Down Expand Up @@ -52,66 +51,71 @@ public static int HandleCommand_DuplicateLines(IWpfTextView textView, IClassifie
ITextBufferUndoManager undoManager = undoManagerProvider.GetTextBufferUndoManager(textView.TextBuffer);
ITextUndoTransaction transaction = undoManager.TextBufferUndoHistory.CreateTransaction("Duplicate Lines");

List<SnapshotSpan> spans = textView.Selection.SelectedSpans.ToList();
spans.Reverse(); // Hack: Work from the last selection upward, to avoid changing buffer positions with mutli-caret
foreach (SnapshotSpan span in spans)
// This bool is to handle an annoying edge case where the selection would be expanded
// by the inserted text because the insertion happens at the end of the selection.
bool isEdgeCase_InsertExpandsSelection = false;

IMultiSelectionBroker broker = textView.GetMultiSelectionBroker();
IReadOnlyList<Selection> selections = broker.AllSelections;
Selection primarySelection = broker.PrimarySelection;
// Hack: Work from the last selection upward, to avoid changing buffer positions with mutli-caret
for (int i = selections.Count - 1; i >= 0; i--)
{
// Select all the text from the start of the first line to the end of the last line
// Find the start of the first line
SnapshotPoint startPoint = new SnapshotPoint(span.Snapshot, span.Start);
SnapshotPoint startOfFirstLine = startPoint.GetContainingLine().Start;

// Find the end of the last line
SnapshotPoint endPoint = new SnapshotPoint(span.Snapshot, span.End);
SnapshotPoint endOfLastLine = endPoint.GetContainingLine().End;
// Don't include the last line if the end point is at the very beginning!
bool endsAtLineStart = span.Length > 0 && (endPoint.GetContainingLine().Start.Position == endPoint.Position);
bool endsAtLineEnd = span.Length > 0 && (endPoint.GetContainingLine().End.Position == endPoint.Position);
if (endsAtLineStart)
{
// Return the text up to the actual endpoint, not the end of its line.
endOfLastLine = endPoint;
// Note: This means that this text contains a CRLF. Account for that later.
}
Selection selection = selections[i];

SnapshotSpan selectionSpan = selection.Extent.SnapshotSpan;
SnapshotSpan selectedLines = GetContainingLines(selectionSpan);
string textToInsert = selectedLines.GetText();

// Fetch the text from the start of first to end of last
SnapshotSpan linesToCopy = new SnapshotSpan(startOfFirstLine, endOfLastLine);
string text = linesToCopy.GetText();
bool isEndOfFile = selectedLines.End == textView.TextSnapshot.Length;

// Copy Lines Up? or Copy Lines Down?
if (isCopyUp) // ie. CopyLinesUp
SnapshotPoint insertPos;
if (isCopyUp)
{
// Always start with a new line (CR/LF)
if (!endsAtLineStart)
{
text = Environment.NewLine + text; // Note: This does not detect the line endings of the current file.
}
insertPos = selectedLines.End;

// Insert the text on a new line after the last line - TODO (CopyLinesUp)
int insertPosn = endOfLastLine.Position;
textView.TextBuffer.Insert(insertPosn, text); // (CopyLinesUp)
isEdgeCase_InsertExpandsSelection |= selectionSpan.End == insertPos;

// Hack: Fix the selection, if the selection ended at the end of a line or start of new line.
if (endsAtLineStart || endsAtLineEnd)
{
// Hack: Only works for single-selection. TODO: Fix for multi-selection.
if (spans.Count < 2)
{
editorOperations.ExtendSelection(endPoint);
}
}
// Case when there is no trailing new-line chars in the selected lines.
if (isEndOfFile) textToInsert = Environment.NewLine + textToInsert;
}
else // ie. CopyLinesDown
else // (isCopyDown)
{
insertPos = selectedLines.Start;

// Case when there is no trailing new-line chars in the selected lines.
if (isEndOfFile) textToInsert = textToInsert + Environment.NewLine;
}

textView.TextBuffer.Insert(insertPos, textToInsert);
}

if (isEdgeCase_InsertExpandsSelection)
{
// Translate selections to newest snapshot with negative tracking mode for the
// end point so that they are not expanded due to the recent insertions.
var targetSnapshot = textView.TextSnapshot;
var newSelections = new Selection[selections.Count];
int primarySelectionIndex = 0;
for (int i = 0; i < newSelections.Length; i++)
{
// Always end with a new line (CR/LF)
if (!endsAtLineStart)
Selection selection = selections[i];
if (primarySelection.Equals(selection)) primarySelectionIndex = i;
newSelections[i] = TranslateTo(
selection, targetSnapshot,
GetPointTrackingMode(selection.InsertionPoint),
GetPointTrackingMode(selection.AnchorPoint),
GetPointTrackingMode(selection.ActivePoint)
);

PointTrackingMode GetPointTrackingMode(VirtualSnapshotPoint point)
{
text += Environment.NewLine; // Note: This does not detect the line endings of the current file.
if (point.Position == point.Position.Snapshot.Length) return PointTrackingMode.Negative;
return point <= selection.Extent.Start ? PointTrackingMode.Positive : PointTrackingMode.Negative;
}

// Insert the text at the start of the first line
textView.TextBuffer.Insert(startOfFirstLine.Position, text); // (CopyLinesDown)
}

broker.SetSelectionRange(newSelections, newSelections[primarySelectionIndex]);
}

// Complete the transaction
Expand All @@ -120,6 +124,48 @@ public static int HandleCommand_DuplicateLines(IWpfTextView textView, IClassifie
return VSConstants.S_OK;
}

/// <summary>
/// Transforms a selection to a target snapshot using the provided tracking rules.
/// TODO: Move to utility class and make into extension?
/// </summary>
public static Selection TranslateTo(Selection selection, ITextSnapshot targetSnapshot, PointTrackingMode insertionPointTracking, PointTrackingMode anchorPointTracking, PointTrackingMode activePointTracking)
{
return new Selection
(
selection.InsertionPoint.TranslateTo(targetSnapshot, insertionPointTracking),
selection.AnchorPoint.TranslateTo(targetSnapshot, anchorPointTracking),
selection.ActivePoint.TranslateTo(targetSnapshot, activePointTracking),
selection.InsertionPointAffinity
);
}

/// <summary>
/// Expands span to include all lines it touches.
/// Spans ending on first char of a new line does not count as touching that line.
/// Includes any trailing new-line chars (CR/LF).
/// TODO: Move to utility class and make into extension?
/// </summary>
/// <returns> The lines that contains this span. </returns>
public static SnapshotSpan GetContainingLines(SnapshotSpan span)
{
var firstLine = span.Start.GetContainingLine();
SnapshotPoint linesStart = firstLine.Start;
SnapshotPoint linesEnd;
if (span.Length == 0)
{
linesEnd = firstLine.EndIncludingLineBreak;
}
else
{
var lastLine = span.End.GetContainingLine();
linesEnd = span.End == lastLine.Start ?
lastLine.Start
:
lastLine.EndIncludingLineBreak;
}
return new SnapshotSpan(linesStart, linesEnd);
}

// Helped by source of Microsoft.VisualStudio.Text.Editor.DragDrop.DropHandlerBase.cs in assembly Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0
public static int HandleCommand(IWpfTextView textView, IClassifier classifier, IOleCommandTarget commandTarget, IEditorOperations editorOperations, bool shiftPressed = false)
{
Expand Down
Loading

0 comments on commit 07b6e68

Please sign in to comment.