Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenable LSP pull diagnostics #48328

Merged
merged 41 commits into from
Oct 20, 2020
Merged

Reenable LSP pull diagnostics #48328

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1cadaee
Revert "Revert "Merge pull request #47914 from CyrusNajmabadi/lspDiag…
CyrusNajmabadi Oct 5, 2020
a7c6236
Merge remote-tracking branch 'upstream/master' into lspDiagnostics2
CyrusNajmabadi Oct 8, 2020
af83f65
Merge remote-tracking branch 'upstream/master' into lspDiagnostics2
CyrusNajmabadi Oct 13, 2020
55cb2e1
Remove unnecessary fields/methods for lsp push diagnostics
CyrusNajmabadi Oct 14, 2020
88bfa0d
Remove unnecessary fields/methods for lsp push diagnostics
CyrusNajmabadi Oct 14, 2020
b35167c
Add experimental flag
CyrusNajmabadi Oct 14, 2020
54502f5
Remove
CyrusNajmabadi Oct 15, 2020
0b0cbf0
Add option to switch between push/pull diagnostics.
CyrusNajmabadi Oct 15, 2020
e4e5f89
Reanme
CyrusNajmabadi Oct 15, 2020
650e11a
add ocmments
CyrusNajmabadi Oct 15, 2020
b25608c
Add tests
CyrusNajmabadi Oct 15, 2020
8ea42bd
UI option
CyrusNajmabadi Oct 15, 2020
fef7c2a
Remove test accessor
CyrusNajmabadi Oct 15, 2020
07d1dca
Cleanup usings
CyrusNajmabadi Oct 15, 2020
1b1ca2c
Merge remote-tracking branch 'upstream/master' into lspDiagnostics2
CyrusNajmabadi Oct 18, 2020
d9d7e82
Remove using
CyrusNajmabadi Oct 18, 2020
5e334c1
Add language client for diagnostics
CyrusNajmabadi Oct 18, 2020
49542f0
Merge remote-tracking branch 'upstream/master' into lspDiagnostics2
CyrusNajmabadi Oct 18, 2020
90bef7c
Make non-optional
CyrusNajmabadi Oct 18, 2020
4737fcd
Add comments
CyrusNajmabadi Oct 18, 2020
c1fdd37
Revert
CyrusNajmabadi Oct 18, 2020
fbe9c65
Add an abstraction for either reporting an array or results, or strea…
CyrusNajmabadi Oct 18, 2020
7cba654
Make threadsafe
CyrusNajmabadi Oct 19, 2020
67111a1
Remove #nullable enable
CyrusNajmabadi Oct 19, 2020
f422ad5
Docs
CyrusNajmabadi Oct 19, 2020
162fd21
Merge branch 'bufferedProgress' into lspDiagnostics2
CyrusNajmabadi Oct 19, 2020
455a733
Tweak the progress type to better support arrays and scalars.
CyrusNajmabadi Oct 19, 2020
c00d729
Merge branch 'bufferedProgress' into lspDiagnostics2
CyrusNajmabadi Oct 19, 2020
b084ea7
Merge branch 'extractMore' into lspDiagnostics2
CyrusNajmabadi Oct 19, 2020
21d4761
Merge remote-tracking branch 'upstream/master' into lspDiagnostics2
CyrusNajmabadi Oct 19, 2020
a0ed107
Remove
CyrusNajmabadi Oct 19, 2020
0a78828
Update
CyrusNajmabadi Oct 19, 2020
9a82574
Simplify
CyrusNajmabadi Oct 19, 2020
573e342
Fixup tests
CyrusNajmabadi Oct 19, 2020
2338c37
Merge remote-tracking branch 'upstream/master' into lspDiagnostics2
CyrusNajmabadi Oct 19, 2020
06b8ea0
Update src/Features/Core/Portable/Diagnostics/DiagnosticsUpdatedArgs.cs
CyrusNajmabadi Oct 19, 2020
07bbaae
Fix test
CyrusNajmabadi Oct 19, 2020
130c913
Merge branch 'lspDiagnostics2' of https://github.com/CyrusNajmabadi/r…
CyrusNajmabadi Oct 19, 2020
3c7fdb6
Fix test
CyrusNajmabadi Oct 19, 2020
c90b3ac
Fix test
CyrusNajmabadi Oct 19, 2020
5e0ee01
only enable diagnostics based on option
CyrusNajmabadi Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/EditorFeatures/CSharpTest/CodeActions/EncapsulateField/EncapsulateFieldTests.cs
View file
Open in desktop
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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.FunctionPointers)]
public async Task FunctionPointerWithPrivateTypeReturnValue(TestHost host)
{
var text = @"
Expand Down
30 changes: 15 additions & 15 deletions src/EditorFeatures/CSharpTest/CodeActions/ExtractMethod/ExtractLocalFunctionTests.cs
View file
Open in desktop
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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.OutVar)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(CompilerFeature.Patterns)]
public async Task ConflictingPatternLocals()
{
await TestInRegularAndScript1Async(
Expand Down
32 changes: 16 additions & 16 deletions src/EditorFeatures/CSharpTest/CodeActions/ExtractMethod/ExtractMethodTests.cs
View file
Open in desktop
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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.OutVar)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(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)]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
[CompilerTrait(CompilerFeature.Patterns)]
public async Task ConflictingPatternLocals()
{
await TestInRegularAndScript1Async(
Expand Down
4 changes: 2 additions & 2 deletions ...itorFeatures/CSharpTest/Completion/CompletionProviders/OverrideCompletionProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2901,7 +2901,7 @@ public virtual void Bar() {}

// 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(Test.Utilities.CompilationExtensions.EmitToArray(compilation));
var reference = MetadataReference.CreateFromImage(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(Test.Utilities.CompilationExtensions.EmitToArray(libComp));
var libRef = MetadataReference.CreateFromImage(CompilationExtensions.EmitToArray(libComp));

var project = workspace.CurrentSolution.Projects.Single();
var updatedProject = project.AddMetadataReference(libRef);
Expand Down
6 changes: 3 additions & 3 deletions ...Features/CSharpTest/Completion/CompletionProviders/SpeculativeTCompletionProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ async Task<$$>

[WorkItem(13480, "https://github.com/dotnet/roslyn/issues/13480")]
[Fact]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.LocalFunctions)]
[CompilerTrait(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")]
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.LocalFunctions)]
[CompilerTrait(CompilerFeature.LocalFunctions)]
public async Task LocalFunctionAfterAyncTask()
{
var markup = @"
Expand All @@ -951,7 +951,7 @@ async Task<$$>
}

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