Merge branch 'main' into extractMethodCleanup

Author: CyrusNajmabadi

src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.
 
@@ -13398,15 +13398,16 @@ class C
         await VerifyAnyItemExistsAsync(source);
     }
 
-    [Fact]
-    public async Task AfterScopedInsideMethod()
+    [Theory, CombinatorialData]
+    public async Task AfterScopedInsideMethod(bool useRef)
     {
-        var source = """
+        var refKeyword = useRef ? "ref " : "";
+        var source = $$"""
             class C
             {
                 void M()
                 {
-                    scoped $$
+                    scoped {{refKeyword}}$$
                 }
             }
 
@@ -13415,24 +13416,54 @@ ref struct MyRefStruct { }
         await VerifyItemExistsAsync(MakeMarkup(source), "MyRefStruct");
     }
 
-    [Fact]
-    public async Task AfterScopedGlobalStatement_FollowedByType()
+    [Theory, CombinatorialData]
+    public async Task AfterScopedGlobalStatement_FollowedByRefStruct(bool useRef)
     {
-        var source = """
-            scoped $$
+        var refKeyword = useRef ? "ref " : "";
+        var source = $$"""
+            scoped {{refKeyword}}$$
 
             ref struct MyRefStruct { }
             """;
         await VerifyItemExistsAsync(MakeMarkup(source), "MyRefStruct");
     }
 
-    [Fact]
-    public async Task AfterScopedGlobalStatement_NotFollowedByType()
+    [Theory, CombinatorialData]
+    public async Task AfterScopedGlobalStatement_FollowedByStruct(bool useRef)
     {
-        var source = """
+        var refKeyword = useRef ? "ref " : "";
+        var source = $$"""
+            using System;
+
+            scoped {{refKeyword}}$$
+
+            struct S { }
+            """;
+        await VerifyItemExistsAsync(MakeMarkup(source), "ReadOnlySpan", displayTextSuffix: "<>");
+    }
+
+    [Theory, CombinatorialData]
+    public async Task AfterScopedGlobalStatement_FollowedByPartialStruct(bool useRef)
+    {
+        var refKeyword = useRef ? "ref " : "";
+        var source = $$"""
+            using System;
+
+            scoped {{refKeyword}}$$
+
+            partial struct S { }
+            """;
+        await VerifyItemExistsAsync(MakeMarkup(source), "ReadOnlySpan", displayTextSuffix: "<>");
+    }
+
+    [Theory, CombinatorialData]
+    public async Task AfterScopedGlobalStatement_NotFollowedByType(bool useRef)
+    {
+        var refKeyword = useRef ? "ref " : "";
+        var source = $"""
             using System;
 
-            scoped $$
+            scoped {refKeyword}$$
             """;
 
         await VerifyItemExistsAsync(MakeMarkup(source), "ReadOnlySpan", displayTextSuffix: "<>");

src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb

@@ -352,7 +352,7 @@ public class Class1
     void Test(int i) {{ }}
     void M()
     {{
-{{|conflict:{{|conflict:<<<<<<< {String.Format(WorkspacesResources.Unmerged_change_from_project_0, "CSharpAssembly1")}, {WorkspacesResources.Before_colon}
+{{|conflict:{{|conflict:<<<<<<< {String.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "CSharpAssembly1")}, {WorkspacesResources.Before_colon}
         Test(5);
 =======
         Test((long)5);

src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs

@@ -1994,6 +1994,17 @@ public class C
             """, "required");
     }
 
+    [Fact]
+    public async Task TestScoped()
+    {
+        await Test_KeywordAsync("""
+            sc[||]oped var r = new R();
+            ref struct R
+            {
+            }
+            """, "scoped");
+    }
+
     [Fact]
     public async Task TestDefaultConstraint()
     {

src/Workspaces/Core/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs

@@ -76,7 +76,7 @@ private static ImmutableArray<TextChange> GetCommentChangesForDocument(IEnumerab
             var newText = oldText.WithChanges(adjustedChanges);
 
             var warningText = GetConflictCommentText(
-                string.Format(WorkspacesResources.Unmerged_change_from_project_0, projectName),
+                string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, projectName),
                 TrimBlankLines(oldText),
                 TrimBlankLines(newText));
 

src/Workspaces/Core/Portable/WorkspacesResources.resx

@@ -249,8 +249,9 @@
   <data name="Solution_file_not_found_colon_0" xml:space="preserve">
     <value>Solution file not found: '{0}'</value>
   </data>
-  <data name="Unmerged_change_from_project_0" xml:space="preserve">
-    <value>Unmerged change from project '{0}'</value>
+  <data name="TODO_Unmerged_change_from_project_0" xml:space="preserve">
+    <value>TODO: Unmerged change from project '{0}'</value>
+    <comment>{Locked="TODO"}</comment>
   </data>
   <data name="After" xml:space="preserve">
     <value>After</value>