|
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.ConflictMarkerResolution;
using Microsoft.CodeAnalysis.CSharp.ConflictMarkerResolution;
using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.CodeAnalysis.Testing;
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ConflictMarkerResolution
{
using VerifyCS = CSharpCodeFixVerifier<EmptyDiagnosticAnalyzer, CSharpResolveConflictMarkerCodeFixProvider>;
[Trait(Traits.Feature, Traits.Features.CodeActionsResolveConflictMarker)]
public class ConflictMarkerResolutionTests
{
[Fact]
public async Task TestTakeTop1()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBottom1()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBoth1()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 2,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBothEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyTop_TakeTop()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyTop_TakeBottom()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyBottom_TakeTop()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyBottom_TakeBottom()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeTop_WhitespaceInSection()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBottom1_WhitespaceInSection()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBoth_WhitespaceInSection()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 2,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBothEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23847")]
public async Task TestTakeTop_TopCommentedOut()
{
var source = """
public class Class1
{
public void M()
{
/*
<<<<<<< dest
* a thing
*/
{|CS8300:=======|}
* another thing
*/
{|CS8300:>>>>>>>|} source
// */
}
}
""";
var fixedSource = """
public class Class1
{
public void M()
{
/*
* a thing
*/
// */
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23847")]
public async Task TestTakeTop_SecondMiddleAndBottomCommentedOut()
{
var source = """
public class Class1
{
public void M()
{
{|CS8300:<<<<<<<|} dest
/*
* a thing
=======
*
* another thing
>>>>>>> source
*/
}
}
""";
var fixedSource = """
public class Class1
{
public void M()
{
/*
* a thing
*/
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23847")]
public async Task TestTakeTop_TopInString()
{
var source = """
class X {
void x() {
var x = @"
<<<<<<< working copy
a";
{|CS8300:=======|}
b";
{|CS8300:>>>>>>>|} merge rev
}
}
""";
var fixedSource = """
class X {
void x() {
var x = @"
a";
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23847")]
public async Task TestTakeBottom_TopInString()
{
var source = """
class X {
void x() {
var x = @"
<<<<<<< working copy
a";
{|CS8300:=======|}
b";
{|CS8300:>>>>>>>|} merge rev
}
}
""";
var fixedSource = """
class X {
void x() {
var x = @"
b";
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23847")]
public async Task TestMissingWithMiddleMarkerAtTopOfFile()
{
var source = """
{|CS8300:=======|}
class X {
}
{|CS8300:>>>>>>>|} merge rev
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = source,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/23847")]
public async Task TestMissingWithMiddleMarkerAtBottomOfFile()
{
var source = """
{|CS8300:<<<<<<<|} working copy
class X {
}
{|CS8300:=======|}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = source,
}.RunAsync();
}
[Fact]
public async Task TestMissingWithFirstMiddleMarkerAtBottomOfFile()
{
var source = """
{|CS8300:<<<<<<<|} working copy
class X {
}
{|CS8300:||||||||}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = source,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/21107")]
public async Task TestFixAll1()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
}
{|CS8300:=======|}
class Program2
{
}
{|CS8300:>>>>>>>|} This is theirs!
{|CS8300:<<<<<<<|} This is mine!
class Program3
{
}
{|CS8300:=======|}
class Program4
{
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
}
class Program3
{
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 2,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/21107")]
public async Task TestFixAll2()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
}
{|CS8300:=======|}
class Program2
{
}
{|CS8300:>>>>>>>|} This is theirs!
{|CS8300:<<<<<<<|} This is mine!
class Program3
{
}
{|CS8300:=======|}
class Program4
{
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
}
class Program4
{
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 2,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/21107")]
public async Task TestFixAll3()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
}
{|CS8300:=======|}
class Program2
{
}
{|CS8300:>>>>>>>|} This is theirs!
{|CS8300:<<<<<<<|} This is mine!
class Program3
{
}
{|CS8300:=======|}
class Program4
{
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
}
class Program2
{
}
class Program3
{
}
class Program4
{
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 2,
CodeActionIndex = 2,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBothEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeTop_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBottom1_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBoth1_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 2,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBothEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyTop_TakeTop_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyTop_TakeBottom_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
static void Main2(string[] args)
{
Program2 p;
Console.WriteLine("Their section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyBottom_TakeTop_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestEmptyBottom_TakeBottom_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
static void Main(string[] args)
{
Program p;
Console.WriteLine("My section");
}
}
{|CS8300:||||||||} Baseline!
class Removed { }
{|CS8300:=======|}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeTop_TopCommentedOut_WithBaseline()
{
var source = """
public class Class1
{
public void M()
{
/*
<<<<<<< dest
* a thing
*/
{|CS8300:||||||||} Baseline!
* previous thing
*/
{|CS8300:=======|}
* another thing
*/
{|CS8300:>>>>>>>|} source
// */
}
}
""";
var fixedSource = """
public class Class1
{
public void M()
{
/*
* a thing
*/
// */
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeTop_FirstMiddleAndSecondMiddleAndBottomCommentedOut()
{
var source = """
public class Class1
{
public void M()
{
{|CS8300:<<<<<<<|} dest
/*
* a thing
|||||||| Baseline!
* previous thing
=======
*
* another thing
>>>>>>> source
*/
}
}
""";
var fixedSource = """
public class Class1
{
public void M()
{
/*
* a thing
*/
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeTop_TopInString_WithBaseline()
{
var source = """
class X {
void x() {
var x = @"
<<<<<<< working copy
a";
{|CS8300:||||||||} baseline
previous";
{|CS8300:=======|}
b";
{|CS8300:>>>>>>>|} merge rev
}
}
""";
var fixedSource = """
class X {
void x() {
var x = @"
a";
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestTakeBottom_TopInString_WithBaseline()
{
var source = """
class X {
void x() {
var x = @"
<<<<<<< working copy
a";
{|CS8300:||||||||} baseline
previous";
{|CS8300:=======|}
b";
{|CS8300:>>>>>>>|} merge rev
}
}
""";
var fixedSource = """
class X {
void x() {
var x = @"
b";
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 1,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestMissingWithFirstMiddleMarkerAtTopOfFile()
{
var source = """
{|CS8300:||||||||} baseline
{|CS8300:=======|}
class X {
}
{|CS8300:>>>>>>>|} merge rev
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = source,
}.RunAsync();
}
[Fact]
public async Task TestFixAll1_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
}
{|CS8300:||||||||} baseline
class Removed { }
{|CS8300:=======|}
class Program2
{
}
{|CS8300:>>>>>>>|} This is theirs!
{|CS8300:<<<<<<<|} This is mine!
class Program3
{
}
{|CS8300:||||||||} baseline
class Removed2 { }
{|CS8300:=======|}
class Program4
{
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
}
class Program3
{
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 2,
CodeActionIndex = 0,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeTopEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestFixAll2_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
}
{|CS8300:||||||||} baseline
class Removed { }
{|CS8300:=======|}
class Program2
{
}
{|CS8300:>>>>>>>|} This is theirs!
{|CS8300:<<<<<<<|} This is mine!
class Program3
{
}
{|CS8300:||||||||} baseline
class Removed2 { }
{|CS8300:=======|}
class Program4
{
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program2
{
}
class Program4
{
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 2,
CodeActionIndex = 1,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBottomEquivalenceKey,
}.RunAsync();
}
[Fact]
public async Task TestFixAll3_WithBaseline()
{
var source = """
using System;
namespace N
{
{|CS8300:<<<<<<<|} This is mine!
class Program
{
}
{|CS8300:||||||||} baseline
class Removed { }
{|CS8300:=======|}
class Program2
{
}
{|CS8300:>>>>>>>|} This is theirs!
{|CS8300:<<<<<<<|} This is mine!
class Program3
{
}
{|CS8300:||||||||} baseline
class Removed2 { }
{|CS8300:=======|}
class Program4
{
}
{|CS8300:>>>>>>>|} This is theirs!
}
""";
var fixedSource = """
using System;
namespace N
{
class Program
{
}
class Program2
{
}
class Program3
{
}
class Program4
{
}
}
""";
await new VerifyCS.Test
{
TestCode = source,
FixedCode = fixedSource,
NumberOfIncrementalIterations = 2,
CodeActionIndex = 2,
CodeActionEquivalenceKey = AbstractResolveConflictMarkerCodeFixProvider.TakeBothEquivalenceKey,
}.RunAsync();
}
}
}
|