Merge pull request #56127 from dotnet/merges/main-to-main-vs-deps

Merge main to main-vs-deps

Author: dotnet-bot

src/EditorFeatures/CSharpTest2/Recommendations/RecommenderTests.cs

@@ -15,11 +15,14 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.Test.Utilities;
 using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Recommendations
 {
+    [UseExportProvider]
     public abstract class RecommenderTests : TestBase
     {
         protected static readonly CSharpParseOptions CSharp9ParseOptions = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp9);
@@ -55,6 +58,11 @@ private Task VerifyInFrontOfCommentAsync(
 
         private Task CheckResultAsync(string text, int position, bool absent, CSharpParseOptions options, int? matchPriority)
         {
+            using var workspace = new TestWorkspace(composition: FeaturesTestCompositions.Features);
+            var solution = workspace.CurrentSolution;
+            var project = solution.AddProject("test", "test", LanguageNames.CSharp);
+            var document = project.AddDocument("test.cs", text);
+
             var tree = SyntaxFactory.ParseSyntaxTree(text, options: options);
             var compilation = CSharpCompilation.Create(
                 "test",
@@ -67,7 +75,7 @@ private Task CheckResultAsync(string text, int position, bool absent, CSharpPars
             }
 
             var semanticModel = compilation.GetSemanticModel(tree);
-            var context = CSharpSyntaxContext.CreateContext_Test(semanticModel, position, CancellationToken.None);
+            var context = CSharpSyntaxContext.CreateContext(document, semanticModel, position, CancellationToken.None);
             return CheckResultAsync(absent, position, context, matchPriority);
         }
 

src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CompletionSource.cs

@@ -462,7 +462,7 @@ private VSCompletionItem Convert(
                     insertionText = roslynItem.DisplayText;
                 }
 
-                var supportedPlatforms = SymbolCompletionItem.GetSupportedPlatforms(roslynItem, document.Project.Solution.Workspace);
+                var supportedPlatforms = SymbolCompletionItem.GetSupportedPlatforms(roslynItem, document.Project.Solution);
                 var attributeImages = supportedPlatforms != null ? s_WarningImageAttributeImagesArray : ImmutableArray<ImageElement>.Empty;
 
                 itemData = new VSCompletionItemData(

src/EditorFeatures/VisualBasicTest/Recommendations/ArrayStatements/EraseKeywordRecommenderTests.vb

@@ -4,6 +4,8 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.ArrayStatements
     Public Class EraseKeywordRecommenderTests
+        Inherits RecommenderTests
+
         <Fact>
         <Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub EraseInMethodBodyTest()

src/EditorFeatures/VisualBasicTest/Recommendations/ArrayStatements/PreserveKeywordRecommenderTests.vb

@@ -4,6 +4,8 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.ArrayStatements
     Public Class PreserveKeywordRecommenderTests
+        Inherits RecommenderTests
+
         <Fact>
         <Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub PreserveNotInMethodBodyTest()

src/EditorFeatures/VisualBasicTest/Recommendations/ArrayStatements/ReDimKeywordRecommenderTests.vb

@@ -4,6 +4,8 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.ArrayStatements
     Public Class ReDimKeywordRecommenderTests
+        Inherits RecommenderTests
+
         <Fact>
         <Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub ReDimInMethodBodyTest()

src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/AliasKeywordRecommenderTests.vb

@@ -4,6 +4,8 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Declarations
     Public Class AliasKeywordRecommenderTests
+        Inherits RecommenderTests
+
         <Fact>
         <Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub AliasAfterLibNameInSubTest()

src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/AsKeywordRecommenderTests.vb

@@ -3,8 +3,8 @@
 ' See the LICENSE file in the project root for more information.
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Declarations
-    <[UseExportProvider]>
     Public Class AsKeywordRecommenderTests
+        Inherits RecommenderTests
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub AsInAggregateClause1Test()

src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/AsyncKeywordRecommenderTests.vb

@@ -4,6 +4,7 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Declarations
     Public Class AsyncKeywordRecommenderTests
+        Inherits RecommenderTests
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub KeywordsAfterAsyncTest()

src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/AttributeScopesKeywordRecommenderTests.vb

@@ -4,6 +4,8 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Declarations
     Public Class AttributeScopeKeywordRecommenderTests
+        Inherits RecommenderTests
+
         <Fact>
         <Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub AttributeScopesInFileTest()

src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/CharsetModifierKeywordRecommenderTests.vb

@@ -4,6 +4,8 @@
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Declarations
     Public Class CharsetModifierKeywordRecommenderTests
+        Inherits RecommenderTests
+
         <Fact>
         <Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Sub AutoAfterDeclareTest()