From 6c4de0b98be1c8e4c944fd40da883c811e555f24 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrus.najmabadi@gmail.com>
Date: Thu, 19 Mar 2020 17:41:53 -0700
Subject: [PATCH] make static

---
 .../AbstractConflictMarkerCodeFixProvider.cs     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs b/src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs
index 7d0edd93c59..eebe4a0a83f 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<Document> AddEditsAsync(
+        private static async Task<Document> AddEditsAsync(
             Document document, int startPos, int equalsPos, int endPos,
             Action<SourceText, ArrayBuilder<TextChange>, 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<Document> TakeTopAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken)
+        private static Task<Document> TakeTopAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken)
             => AddEditsAsync(document, startPos, equalsPos, endPos, AddTopEdits, cancellationToken);
 
-        private Task<Document> TakeBottomAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken)
+        private static Task<Document> TakeBottomAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken)
             => AddEditsAsync(document, startPos, equalsPos, endPos, AddBottomEdits, cancellationToken);
 
-        private Task<Document> TakeBothAsync(Document document, int startPos, int equalsPos, int endPos, CancellationToken cancellationToken)
+        private static Task<Document> 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)
-- 
GitLab