diff --git a/src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs b/src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs index 7d0edd93c59234378fbdac81b0c9274d04688897..eebe4a0a83f1f937873dc962fefd975aff188df8 100644 --- a/src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs +++ b/src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs @@ -99,7 +99,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context) return true; } - private bool TryGetConflictLines( + private static bool TryGetConflictLines( SourceText text, int position, out TextLine startLine, out TextLine middleLine, out TextLine endLine) { @@ -127,7 +127,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context) } } - private bool TryFindLineForwards(TextLine startLine, char ch, out TextLine foundLine) + private static bool TryFindLineForwards(TextLine startLine, char ch, out TextLine foundLine) { var text = startLine.Text!; var lines = text.Lines; @@ -145,7 +145,7 @@ private bool TryFindLineForwards(TextLine startLine, char ch, out TextLine found return false; } - private bool TryFindLineBackwards(TextLine startLine, char ch, out TextLine foundLine) + private static bool TryFindLineBackwards(TextLine startLine, char ch, out TextLine foundLine) { var text = startLine.Text!; var lines = text.Lines; @@ -163,7 +163,7 @@ private bool TryFindLineBackwards(TextLine startLine, char ch, out TextLine foun return false; } - private bool IsConflictMarker(TextLine currentLine, char ch) + private static bool IsConflictMarker(TextLine currentLine, char ch) { var text = currentLine.Text!; var currentLineStart = currentLine.Start; @@ -220,7 +220,7 @@ private bool IsConflictMarker(TextLine currentLine, char ch) context.Diagnostics); } - private async Task AddEditsAsync( + private static async Task AddEditsAsync( Document document, int startPos, int equalsPos, int endPos, Action, int, int, int> addEdits, CancellationToken cancellationToken) @@ -277,13 +277,13 @@ private bool IsConflictMarker(TextLine currentLine, char ch) edits.Add(new TextChange(TextSpan.FromBounds(endPos, bottomEnd), "")); } - private Task TakeTopAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken) + private static Task TakeTopAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken) => AddEditsAsync(document, startPos, equalsPos, endPos, AddTopEdits, cancellationToken); - private Task TakeBottomAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken) + private static Task TakeBottomAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken) => AddEditsAsync(document, startPos, equalsPos, endPos, AddBottomEdits, cancellationToken); - private Task TakeBothAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken) + private static Task TakeBothAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken) => AddEditsAsync(document, startPos, equalsPos, endPos, AddBothEdits, cancellationToken); private static int GetEndIncludingLineBreak(SourceText text, int position)