[automated] Merge branch 'main' => 'main-vs-deps'

azure-pipelines-pr-validation.yml

@@ -165,28 +165,6 @@ extends:
           displayName: Setting SourceBranchName variable
           condition: succeeded()
 
-        - task: Powershell@2
-          name: FancyBuild
-          displayName: Setting FancyBuild.BuildNumber
-          inputs:
-            targetType: inline
-            script: |
-              $pull_request = Invoke-RestMethod -Uri "https://api.github.com/repos/dotnet/roslyn/pulls/${{ parameters.PRNumber }}" `
-              -Headers @{
-                "Accept" = "application/vnd.github+json";
-                "X-GitHub-Api-Version" = "2022-11-28"
-              }
-              $buildNumberName = "$(OriginalBuildNumber) - $($pull_request.user.login) - '$($pull_request.title)'"
-              $buildNumberName = $buildNumberName -replace '["/:<>\|?@*]','_'
-              # Maximum buildnumber length is 255 chars and we are going to append to the end to ensure we have space.
-              if ($buildNumberName.Length -GT 253) {
-                $buildNumberName = $buildNumberName.Substring(0, 253)
-              }
-              # Avoid ever ending the BuildNumber with a `.` by always appending to it.
-              $buildNumberName += ' #'
-              Write-Host "##vso[task.setvariable variable=BuildNumber;isoutput=true;isreadonly=true]$buildNumberName"
-              Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
-
         - task: Powershell@2
           displayName: Tag PR validation build
           inputs:
@@ -204,6 +182,25 @@ extends:
             arguments: "-sourceBranchName $(SourceBranchName) -prNumber ${{ parameters.PRNumber }} -commitSHA ${{ parameters.CommitSHA }} -enforceLatestCommit ${{ iif(parameters.EnforceLatestCommit, '1', '0') }}"
           condition: succeeded()
 
+        - task: Powershell@2
+          name: FancyBuild
+          displayName: Setting FancyBuild.BuildNumber
+          inputs:
+            targetType: inline
+            script: |
+              $authorName = git log -1 --pretty=format:"%an" ${{ parameters.CommitSHA }}
+
+              $buildNumberName = "$(OriginalBuildNumber) - $($authorName) - '${{ parameters.PRNumber }}'"
+              $buildNumberName = $buildNumberName -replace '["/:<>\|?@*]','_'
+              # Maximum buildnumber length is 255 chars and we are going to append to the end to ensure we have space.
+              if ($buildNumberName.Length -GT 253) {
+                $buildNumberName = $buildNumberName.Substring(0, 253)
+              }
+              # Avoid ever ending the BuildNumber with a `.` by always appending to it.
+              $buildNumberName += ' #'
+              Write-Host "##vso[task.setvariable variable=BuildNumber;isoutput=true;isreadonly=true]$buildNumberName"
+              Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
+
         - powershell: Write-Host "##vso[task.setvariable variable=VisualStudio.DropName]Products/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranchName)/$(OriginalBuildNumber)"
           displayName: Setting VisualStudio.DropName variable
 

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

@@ -380,9 +380,10 @@ async Task<C> $$
             }
             """, "GetCAsync");
 
-    [Fact(Skip = "not yet implemented")]
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/17989")]
     public Task NonAsyncTaskOfT()
         => VerifyItemExistsAsync("""
+            using System.Threading.Tasks;
             public class C
             {
                 Task<C> $$

src/EditorFeatures/CSharpTest2/Recommendations/AsKeywordRecommenderTests.cs

@@ -248,4 +248,19 @@ void M(object o)
                 }
             }
             """);
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78800")]
+    public Task TestAfterReturnExpression()
+        => VerifyKeywordAsync(
+            """
+            class C
+            {
+                public static string EvaluateRangeVariable()
+                {
+                    return RandomValue() $$
+                }
+
+                public int RandomValue() => 0;
+            }
+            """);
 }

src/EditorFeatures/CSharpTest2/Recommendations/IsKeywordRecommenderTests.cs

@@ -301,4 +301,19 @@ void M(object o)
                 }
             }
             """);
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78800")]
+    public Task TestAfterReturnExpression()
+        => VerifyKeywordAsync(
+            """
+            class C
+            {
+                public static string EvaluateRangeVariable()
+                {
+                    return RandomValue() $$
+                }
+
+                public int RandomValue() => 0;
+            }
+            """);
 }

src/EditorFeatures/CSharpTest2/Recommendations/RecommenderTests.cs

@@ -172,7 +172,9 @@ internal async Task VerifyKeywordAsync(
         await VerifyWorkerAsync(text, absent: false, options: scriptOptions ?? Options.Script);
     }
 
-    protected async Task VerifyKeywordAsync(SourceCodeKind kind, string text)
+    protected async Task VerifyKeywordAsync(
+        SourceCodeKind kind,
+        [StringSyntax(PredefinedEmbeddedLanguageNames.CSharpTest)] string text)
     {
         switch (kind)
         {
@@ -211,7 +213,9 @@ protected async Task VerifyAbsenceAsync(
         }
     }
 
-    protected static string AddInsideMethod(string text, bool isAsync = false, string returnType = "void", bool topLevelStatement = false)
+    protected static string AddInsideMethod(
+        [StringSyntax(PredefinedEmbeddedLanguageNames.CSharpTest)] string text,
+        bool isAsync = false, string returnType = "void", bool topLevelStatement = false)
     {
         if (topLevelStatement)
         {

src/EditorFeatures/CSharpTest2/Recommendations/SwitchKeywordRecommenderTests.cs

@@ -15,7 +15,7 @@ public sealed class SwitchKeywordRecommenderTests : KeywordRecommenderTests
     [Fact]
     public Task TestAtRoot_Interactive()
         => VerifyKeywordAsync(SourceCodeKind.Script,
-@"$$");
+            @"$$");
 
     [Fact]
     public Task TestAfterClass_Interactive()
@@ -44,17 +44,17 @@ public Task TestAfterGlobalVariableDeclaration_Interactive()
     [Fact]
     public Task TestNotInUsingAlias()
         => VerifyAbsenceAsync(
-@"using Goo = $$");
+            @"using Goo = $$");
 
     [Fact]
     public Task TestNotInGlobalUsingAlias()
         => VerifyAbsenceAsync(
-@"global using Goo = $$");
+            @"global using Goo = $$");
 
     [Fact]
     public Task TestEmptyStatement()
         => VerifyKeywordAsync(AddInsideMethod(
-@"$$"));
+            @"$$"));
 
     [Fact]
     public Task TestBeforeStatement()
@@ -93,7 +93,7 @@ public Task TestInsideSwitchBlock()
     [Fact]
     public Task TestNotAfterSwitch1()
         => VerifyAbsenceAsync(AddInsideMethod(
-@"switch $$"));
+            @"switch $$"));
 
     [Fact]
     public async Task TestAfterExpression()
@@ -119,7 +119,7 @@ public async Task TestAfterTuple()
     [Fact]
     public Task TestNotAfterSwitch2()
         => VerifyAbsenceAsync(AddInsideMethod(
-@"switch ($$"));
+            @"switch ($$"));
 
     [Fact]
     public Task TestNotInClass()
@@ -267,4 +267,19 @@ void M(object o)
                 }
             }
             """);
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78800")]
+    public Task TestAfterReturnExpression()
+        => VerifyKeywordAsync(
+            """
+            class C
+            {
+                public static string EvaluateRangeVariable()
+                {
+                    return RandomValue() $$
+                }
+
+                public int RandomValue() => 0;
+            }
+            """);
 }

src/EditorFeatures/CSharpTest2/Recommendations/ThisKeywordRecommenderTests.cs

@@ -15,7 +15,7 @@ public sealed class ThisKeywordRecommenderTests : KeywordRecommenderTests
     [Fact]
     public Task TestNotAtRoot_Interactive()
         => VerifyAbsenceAsync(SourceCodeKind.Script,
-@"$$");
+            @"$$");
 
     [Fact]
     public Task TestNotAfterClass_Interactive()
@@ -44,52 +44,52 @@ public Task TestNotAfterGlobalVariableDeclaration_Interactive()
     [Fact]
     public Task TestNotInUsingAlias()
         => VerifyAbsenceAsync(
-@"using Goo = $$");
+            @"using Goo = $$");
 
     [Fact]
     public Task TestNotInGlobalUsingAlias()
         => VerifyAbsenceAsync(
-@"global using Goo = $$");
+            @"global using Goo = $$");
 
     [Fact]
     public Task TestNotAfterAngle()
         => VerifyAbsenceAsync(
-@"interface IGoo<$$");
+            @"interface IGoo<$$");
 
     [Fact]
     public Task TestInterfaceTypeVarianceNotAfterIn()
         => VerifyAbsenceAsync(
-@"interface IGoo<in $$");
+            @"interface IGoo<in $$");
 
     [Fact]
     public Task TestInterfaceTypeVarianceNotAfterComma()
         => VerifyAbsenceAsync(
-@"interface IGoo<Goo, $$");
+            @"interface IGoo<Goo, $$");
 
     [Fact]
     public Task TestInterfaceTypeVarianceNotAfterAttribute()
         => VerifyAbsenceAsync(
-@"interface IGoo<[Goo]$$");
+            @"interface IGoo<[Goo]$$");
 
     [Fact]
     public Task TestDelegateTypeVarianceNotAfterAngle()
         => VerifyAbsenceAsync(
-@"delegate void D<$$");
+            @"delegate void D<$$");
 
     [Fact]
     public Task TestDelegateTypeVarianceNotAfterComma()
         => VerifyAbsenceAsync(
-@"delegate void D<Goo, $$");
+            @"delegate void D<Goo, $$");
 
     [Fact]
     public Task TestDelegateTypeVarianceNotAfterAttribute()
         => VerifyAbsenceAsync(
-@"delegate void D<[Goo]$$");
+            @"delegate void D<[Goo]$$");
 
     [Fact]
     public Task TestNotThisBaseListAfterAngle()
         => VerifyAbsenceAsync(
-@"interface IGoo : Bar<$$");
+            @"interface IGoo : Bar<$$");
 
     [Fact]
     public Task TestNotInGenericMethod()
@@ -181,17 +181,17 @@ public C(int i, [Goo]$$
     [Fact]
     public Task TestNotAfterDelegateOpenParen()
         => VerifyAbsenceAsync(
-@"delegate void D($$");
+            @"delegate void D($$");
 
     [Fact]
     public Task TestNotAfterDelegateComma()
         => VerifyAbsenceAsync(
-@"delegate void D(int i, $$");
+            @"delegate void D(int i, $$");
 
     [Fact]
     public Task TestNotAfterDelegateAttribute()
         => VerifyAbsenceAsync(
-@"delegate void D(int i, [Goo]$$");
+            @"delegate void D(int i, [Goo]$$");
 
     [Fact]
     public Task TestNotAfterOperator()
@@ -712,27 +712,27 @@ public C() : $$
     [Fact]
     public Task TestInEmptyStatement()
         => VerifyKeywordAsync(AddInsideMethod(
-@"$$"));
+            @"$$"));
 
     [Fact]
     public Task TestAfterCast()
         => VerifyKeywordAsync(AddInsideMethod(
-@"stack.Push(((IEnumerable<Segment>)((TreeSegment)$$"));
+            @"stack.Push(((IEnumerable<Segment>)((TreeSegment)$$"));
 
     [Fact]
     public Task TestAfterReturn()
         => VerifyKeywordAsync(AddInsideMethod(
-@"return $$"));
+            @"return $$"));
 
     [Fact]
     public Task TestAfterIndexer()
         => VerifyKeywordAsync(AddInsideMethod(
-@"return this.items[$$"));
+            @"return this.items[$$"));
 
     [Fact]
     public Task TestAfterSimpleCast()
         => VerifyKeywordAsync(AddInsideMethod(
-@"return ((IEnumerable<T>)$$"));
+            @"return ((IEnumerable<T>)$$"));
 
     [Fact]
     public Task TestNotInClass()
@@ -1215,7 +1215,21 @@ public void Extension(out $$ object obj, int x) { }
     [Fact]
     public Task TestAfterRefExpression()
         => VerifyKeywordAsync(AddInsideMethod(
-@"ref int x = ref $$"));
+            @"ref int x = ref $$"));
+
+    [Theory, CombinatorialData, WorkItem("https://github.com/dotnet/roslyn/issues/78979")]
+    public Task TestInsideNameofInAttribute(bool isStatic)
+        => VerifyKeywordAsync($$"""
+            public class Example
+            {
+                private string _field;
+
+                [MemberNotNull(nameof($$))]
+                public {{(isStatic ? "static " : " ")}}void Method()
+                {
+                }
+            }
+            """);
 
     #region Collection expressions
 

src/EditorFeatures/CSharpTest2/Recommendations/WithKeywordRecommenderTests.cs

@@ -253,4 +253,19 @@ void M(object o)
                 }
             }
             """);
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78800")]
+    public Task TestAfterReturnExpression()
+        => VerifyKeywordAsync(
+            """
+            class C
+            {
+                public static string EvaluateRangeVariable()
+                {
+                    return RandomValue() $$
+                }
+
+                public int RandomValue() => 0;
+            }
+            """);
 }