Sync with vs-editor-core@4d02fdddf

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Editor/Text/Impl/EditorOperations/EditorOperations.cs b/src/Editor/Text/Impl/EditorOperations/EditorOperations.cs
index 2791b72..3b44210 100644
--- a/src/Editor/Text/Impl/EditorOperations/EditorOperations.cs
+++ b/src/Editor/Text/Impl/EditorOperations/EditorOperations.cs
@@ -5255,9 +5255,9 @@ namespace Microsoft.VisualStudio.Text.Operations.Implementation
                         // lines themsleves (unlike in JoinSelectedLines),
                         // so this is much nicer!
                         var l = string.Concat(text);
-                        var span = Span.FromBounds(lines.First().Start, lines.Last().End);
+                        var span2 = Span.FromBounds(lines.First().Start, lines.Last().End);
 
-                        return ReplaceHelper(span, l);
+                        return ReplaceHelper(span2, l);
                     }, SelectionUpdate.Ignore, true);
                 });
             }
@@ -5343,9 +5343,9 @@ namespace Microsoft.VisualStudio.Text.Operations.Implementation
                         // moved the starting point, to match the first non-whitespace
                         // character, so we can just create a new span which will
                         // be used for replacing
-                        var span = Span.FromBounds(startPosition,
+                        var span2 = Span.FromBounds(startPosition,
                         lastLine.EndIncludingLineBreak.Position);
-                        return ReplaceHelper(span, newLine);
+                        return ReplaceHelper(span2, newLine);
                     }, SelectionUpdate.Ignore, true);
                 });
             }