Skip to content

Commit

Permalink
Merge pull request #48228 from dibarbet/revert_pull
Browse files Browse the repository at this point in the history
Revert "Merge pull request #47914 from CyrusNajmabadi/lspDiagnostics"
  • Loading branch information
msftbot[bot] committed Oct 2, 2020
2 parents d412e19 + 02a9e20 commit 98be2b1
Show file tree
Hide file tree
Showing 34 changed files with 911 additions and 1,134 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,7 @@ public int I
}", options: Option(CodeStyleOptions2.QualifyFieldAccess, true, NotificationOption2.Error));
}

[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.Tuples)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTuple(TestHost host)
{
var text = @"
Expand Down Expand Up @@ -1439,7 +1439,7 @@ void M()
await TestAllOptionsOffAsync(host, text, expected, index: 1);
}

[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.Tuples)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TupleWithNames(TestHost host)
{
var text = @"
Expand Down Expand Up @@ -1481,7 +1481,7 @@ void M()
await TestAllOptionsOffAsync(host, text, expected, index: 1);
}

[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.FunctionPointers)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
public async Task FunctionPointer(TestHost host)
{
var text = @"
Expand Down Expand Up @@ -1523,7 +1523,7 @@ void M()
await TestAllOptionsOffAsync(host, text, expected, index: 1);
}

[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.FunctionPointers)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
public async Task FunctionPointerWithPrivateTypeParameter(TestHost host)
{
var text = @"
Expand Down Expand Up @@ -1567,7 +1567,7 @@ void M()
await TestAllOptionsOffAsync(host, text, expected, index: 1);
}

[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.FunctionPointers)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
public async Task FunctionPointerWithPrivateTypeReturnValue(TestHost host)
{
var text = @"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleDeclarationWithNames()
{
await TestInRegularAndScript1Async(
Expand All @@ -960,7 +960,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleDeclarationWithSomeNames()
{
await TestInRegularAndScript1Async(
Expand All @@ -987,7 +987,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleWith1Arity()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1016,7 +1016,7 @@ static void NewMethod(ValueTuple<int> y)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleLiteralWithNames()
{
await TestInRegularAndScript1Async(
Expand All @@ -1043,7 +1043,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleDeclarationAndLiteralWithNames()
{
await TestInRegularAndScript1Async(
Expand All @@ -1070,7 +1070,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleIntoVar()
{
await TestInRegularAndScript1Async(
Expand All @@ -1097,7 +1097,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task RefactorWithoutSystemValueTuple()
{
await TestInRegularAndScript1Async(
Expand All @@ -1124,7 +1124,7 @@ static void Main(string[] args)
}", CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestTupleWithNestedNamedTuple()
{
// This is not the best refactoring, but this is an edge case
Expand Down Expand Up @@ -1152,7 +1152,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestDeconstruction()
{
await TestInRegularAndScript1Async(
Expand All @@ -1179,7 +1179,7 @@ static void Main(string[] args)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestDeconstruction2()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1209,7 +1209,7 @@ static int NewMethod()
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
[CompilerTrait(CompilerFeature.OutVar)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.OutVar)]
public async Task TestOutVar()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1240,7 +1240,7 @@ static void NewMethod(int i, out int r, out int y)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task TestIsPattern()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1271,7 +1271,7 @@ static void NewMethod(int i, out int r, out int y)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task TestOutVarAndIsPattern()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1302,7 +1302,7 @@ static void NewMethod(out int r, out int y, out int z)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task ConflictingOutVarLocals()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1343,7 +1343,7 @@ static void NewMethod(out int r, out int y)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task ConflictingPatternLocals()
{
await TestInRegularAndScript1Async(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ private static void NewMethod(out Construct obj1, out Construct obj2, out Constr
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTuple()
{
Expand Down Expand Up @@ -949,7 +949,7 @@ private static (int, int) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTupleDeclarationWithNames()
{
Expand Down Expand Up @@ -977,7 +977,7 @@ private static (int a, int b) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTupleDeclarationWithSomeNames()
{
Expand Down Expand Up @@ -1005,7 +1005,7 @@ private static (int a, int) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(18311, "https://github.com/dotnet/roslyn/issues/18311")]
public async Task TestTupleWith1Arity()
{
Expand Down Expand Up @@ -1035,7 +1035,7 @@ private static void NewMethod(ValueTuple<int> y)
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTupleLiteralWithNames()
{
Expand Down Expand Up @@ -1063,7 +1063,7 @@ private static (int, int) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTupleDeclarationAndLiteralWithNames()
{
Expand Down Expand Up @@ -1091,7 +1091,7 @@ private static (int a, int b) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTupleIntoVar()
{
Expand Down Expand Up @@ -1119,7 +1119,7 @@ private static (int c, int d) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task RefactorWithoutSystemValueTuple()
{
Expand Down Expand Up @@ -1147,7 +1147,7 @@ private static (int c, int d) NewMethod()
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[WorkItem(11196, "https://github.com/dotnet/roslyn/issues/11196")]
public async Task TestTupleWithNestedNamedTuple()
{
Expand Down Expand Up @@ -1176,7 +1176,7 @@ private static (int, int, int, int, int, int, int, string, string) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestDeconstruction()
{
await TestInRegularAndScript1Async(
Expand All @@ -1203,7 +1203,7 @@ private static (int, int) NewMethod()
}" + TestResources.NetFX.ValueTuple.tuplelib_cs);
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
public async Task TestDeconstruction2()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1233,7 +1233,7 @@ private static int NewMethod()
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
[CompilerTrait(CompilerFeature.OutVar)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.OutVar)]
public async Task TestOutVar()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1264,7 +1264,7 @@ private static void NewMethod(int i, out int r, out int y)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task TestIsPattern()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1295,7 +1295,7 @@ private static void NewMethod(int i, out int r, out int y)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task TestOutVarAndIsPattern()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1326,7 +1326,7 @@ private static void NewMethod(out int r, out int y, out int z)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task ConflictingOutVarLocals()
{
await TestInRegularAndScript1Async(
Expand Down Expand Up @@ -1367,7 +1367,7 @@ private static void NewMethod(out int r, out int y)
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
[CompilerTrait(CompilerFeature.Patterns)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
public async Task ConflictingPatternLocals()
{
await TestInRegularAndScript1Async(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2901,7 +2901,7 @@ public class Class1

// CompilationExtensions is in the Microsoft.CodeAnalysis.Test.Utilities namespace
// which has a "Traits" type that conflicts with the one in Roslyn.Test.Utilities
var reference = MetadataReference.CreateFromImage(CompilationExtensions.EmitToArray(compilation));
var reference = MetadataReference.CreateFromImage(Test.Utilities.CompilationExtensions.EmitToArray(compilation));
var p1 = workspace.CurrentSolution.Projects.First(p => p.Name == "P1");
var updatedP1 = p1.AddMetadataReference(reference);
workspace.ChangeSolution(updatedP1.Solution);
Expand Down Expand Up @@ -2952,7 +2952,7 @@ public override void M(in int x)
var origComp = await workspace.CurrentSolution.Projects.Single().GetCompilationAsync();
var options = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Latest);
var libComp = origComp.RemoveAllSyntaxTrees().AddSyntaxTrees(CSharpSyntaxTree.ParseText(before, options: options));
var libRef = MetadataReference.CreateFromImage(CompilationExtensions.EmitToArray(libComp));
var libRef = MetadataReference.CreateFromImage(Test.Utilities.CompilationExtensions.EmitToArray(libComp));

var project = workspace.CurrentSolution.Projects.Single();
var updatedProject = project.AddMetadataReference(libRef);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ class Program

[WorkItem(13480, "https://github.com/dotnet/roslyn/issues/13480")]
[Fact]
[CompilerTrait(CompilerFeature.LocalFunctions)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.LocalFunctions)]
public async Task LocalFunctionReturnType()
{
var markup = @"
Expand All @@ -936,7 +936,7 @@ public void M()
}

[Fact(Skip = "https://github.com/dotnet/roslyn/issues/14525")]
[CompilerTrait(CompilerFeature.LocalFunctions)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.LocalFunctions)]
public async Task LocalFunctionAfterAyncTask()
{
var markup = @"
Expand All @@ -951,7 +951,7 @@ public void M()
}

[Fact(Skip = "https://github.com/dotnet/roslyn/issues/14525")]
[CompilerTrait(CompilerFeature.LocalFunctions)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.LocalFunctions)]
public async Task LocalFunctionAfterAsync()
{
var markup = @"
Expand Down
Loading

0 comments on commit 98be2b1

Please sign in to comment.