Skip to content

Commit 1464851

Browse files
author
msftbot[bot]
authored
Merge pull request #48217 from CyrusNajmabadi/patch-38516
Comment out a new line when return is pressed while the caret is within a // comment
2 parents 4239a7a + 2c05b36 commit 1464851

File tree

81 files changed

+1592
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1592
-110
lines changed

‎src/EditorFeatures/CSharp/SplitComment/CSharpSplitCommentService.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
6+
using System.Composition;
7+
using Microsoft.CodeAnalysis.Editor.Implementation.SplitComment;
8+
using Microsoft.CodeAnalysis.Host.Mef;
9+
10+
namespace Microsoft.CodeAnalysis.Editor.CSharp.SplitComment
11+
{
12+
[ExportLanguageService(typeof(ISplitCommentService), LanguageNames.CSharp), Shared]
13+
internal class CSharpSplitCommentService : ISplitCommentService
14+
{
15+
[ImportingConstructor]
16+
[Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
17+
public CSharpSplitCommentService()
18+
{
19+
}
20+
21+
public string CommentStart => "//";
22+
23+
public bool IsAllowed(SyntaxNode root, SyntaxTrivia trivia)
24+
=> true;
25+
}
26+
}

‎src/EditorFeatures/CSharpTest/CodeActions/EncapsulateField/EncapsulateFieldTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ public int I
13971397
}", options: Option(CodeStyleOptions2.QualifyFieldAccess, true, NotificationOption2.Error));
13981398
}
13991399

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

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

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

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

1570-
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.FunctionPointers)]
1570+
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField), CompilerTrait(CompilerFeature.FunctionPointers)]
15711571
public async Task FunctionPointerWithPrivateTypeReturnValue(TestHost host)
15721572
{
15731573
var text = @"

‎src/EditorFeatures/CSharpTest/CodeActions/ExtractMethod/ExtractLocalFunctionTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ static void Main(string[] args)
933933
}" + TestResources.NetFX.ValueTuple.tuplelib_cs, CodeActionIndex);
934934
}
935935

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

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

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

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

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

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

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

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

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

1182-
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
1182+
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction), CompilerTrait(CompilerFeature.Tuples)]
11831183
public async Task TestDeconstruction2()
11841184
{
11851185
await TestInRegularAndScript1Async(
@@ -1209,7 +1209,7 @@ static int NewMethod()
12091209
}
12101210

12111211
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
1212-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.OutVar)]
1212+
[CompilerTrait(CompilerFeature.OutVar)]
12131213
public async Task TestOutVar()
12141214
{
12151215
await TestInRegularAndScript1Async(
@@ -1240,7 +1240,7 @@ static void NewMethod(int i, out int r, out int y)
12401240
}
12411241

12421242
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
1243-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1243+
[CompilerTrait(CompilerFeature.Patterns)]
12441244
public async Task TestIsPattern()
12451245
{
12461246
await TestInRegularAndScript1Async(
@@ -1271,7 +1271,7 @@ static void NewMethod(int i, out int r, out int y)
12711271
}
12721272

12731273
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
1274-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1274+
[CompilerTrait(CompilerFeature.Patterns)]
12751275
public async Task TestOutVarAndIsPattern()
12761276
{
12771277
await TestInRegularAndScript1Async(
@@ -1302,7 +1302,7 @@ static void NewMethod(out int r, out int y, out int z)
13021302
}
13031303

13041304
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
1305-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1305+
[CompilerTrait(CompilerFeature.Patterns)]
13061306
public async Task ConflictingOutVarLocals()
13071307
{
13081308
await TestInRegularAndScript1Async(
@@ -1343,7 +1343,7 @@ static void NewMethod(out int r, out int y)
13431343
}
13441344

13451345
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractLocalFunction)]
1346-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1346+
[CompilerTrait(CompilerFeature.Patterns)]
13471347
public async Task ConflictingPatternLocals()
13481348
{
13491349
await TestInRegularAndScript1Async(

‎src/EditorFeatures/CSharpTest/CodeActions/ExtractMethod/ExtractMethodTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ private static void NewMethod(out Construct obj1, out Construct obj2, out Constr
921921
}");
922922
}
923923

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

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

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

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

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

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

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

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

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

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

1206-
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Tuples)]
1206+
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod), CompilerTrait(CompilerFeature.Tuples)]
12071207
public async Task TestDeconstruction2()
12081208
{
12091209
await TestInRegularAndScript1Async(
@@ -1233,7 +1233,7 @@ private static int NewMethod()
12331233
}
12341234

12351235
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
1236-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.OutVar)]
1236+
[CompilerTrait(CompilerFeature.OutVar)]
12371237
public async Task TestOutVar()
12381238
{
12391239
await TestInRegularAndScript1Async(
@@ -1264,7 +1264,7 @@ private static void NewMethod(int i, out int r, out int y)
12641264
}
12651265

12661266
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
1267-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1267+
[CompilerTrait(CompilerFeature.Patterns)]
12681268
public async Task TestIsPattern()
12691269
{
12701270
await TestInRegularAndScript1Async(
@@ -1295,7 +1295,7 @@ private static void NewMethod(int i, out int r, out int y)
12951295
}
12961296

12971297
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
1298-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1298+
[CompilerTrait(CompilerFeature.Patterns)]
12991299
public async Task TestOutVarAndIsPattern()
13001300
{
13011301
await TestInRegularAndScript1Async(
@@ -1326,7 +1326,7 @@ private static void NewMethod(out int r, out int y, out int z)
13261326
}
13271327

13281328
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
1329-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1329+
[CompilerTrait(CompilerFeature.Patterns)]
13301330
public async Task ConflictingOutVarLocals()
13311331
{
13321332
await TestInRegularAndScript1Async(
@@ -1367,7 +1367,7 @@ private static void NewMethod(out int r, out int y)
13671367
}
13681368

13691369
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsExtractMethod)]
1370-
[Test.Utilities.CompilerTrait(Test.Utilities.CompilerFeature.Patterns)]
1370+
[CompilerTrait(CompilerFeature.Patterns)]
13711371
public async Task ConflictingPatternLocals()
13721372
{
13731373
await TestInRegularAndScript1Async(

‎src/EditorFeatures/CSharpTest/Completion/CompletionProviders/OverrideCompletionProviderTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,7 +2901,7 @@ public virtual void Bar() {}
29012901

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

29572957
var project = workspace.CurrentSolution.Projects.Single();
29582958
var updatedProject = project.AddMetadataReference(libRef);

0 commit comments

Comments
 (0)