Additional changes to the gladstone PR. (#77977)

Author: CyrusNajmabadi

Ide.slnf

@@ -13,9 +13,9 @@
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.617601">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.618101">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>1556b6c639edcaee959013681afcf2e66b118537</Sha>
+      <Sha>f216638d3d6324b6ec140f826b92a7f853dbdfb7</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24528.1">

eng/Version.Details.xml

@@ -183,9 +183,9 @@
         "Shipping",
         "NonShipping"
       ],
-      "vsBranch": "main",
+      "vsBranch": "feature/d18initial",
       "vsMajorVersion": 17,
-      "insertionCreateDraftPR": true,
+      "insertionCreateDraftPR": false,
       "insertionTitlePrefix": "[d17.15 P1]"
     }
   }

eng/config/PublishData.json

@@ -11,4 +11,16 @@
 
   <Target Name="CollectVsixUpToDateCheckBuilt">
   </Target>
+
+  <PropertyGroup>
+    <CollectUpToDateCheckInputDesignTimeDependsOn>$(CollectUpToDateCheckInputDesignTimeDependsOn);RemoveBuildOutputSourceItems</CollectUpToDateCheckInputDesignTimeDependsOn>
+  </PropertyGroup>
+
+  <!-- Add a workaround for https://github.com/dotnet/project-system/issues/9651 until we decide what we want to do there long term. -->
+  <Target Name="RemoveBuildOutputSourceItems" DependsOnTargets="AddUpToDateCheckVSIXSourceItems" Condition="'$(CreateVsixContainer)' == 'true'">
+    <ItemGroup>
+      <_ItemsInObjDirectory Include="$(IntermediateOutputPath)\**\*" Set="VsixItems" />
+      <UpToDateCheckInput Remove="@(_ItemsInObjDirectory)" MatchOnMetadata="Set" />
+    </ItemGroup>
+  </Target>
 </Project>

eng/targets/VisualStudio.FastUpToDateCheckWorkarounds.targets

@@ -1042,7 +1042,7 @@ namespace TestNamespace
     }
 
     [Fact]
-    public Task WhenInsidePreferred_UsingsInBoth_UsingsMoved_FileScopedNamespaec()
+    public Task WhenInsidePreferred_UsingsInBoth_UsingsMoved_FileScopedNamespace()
     {
         var testCode = """
             [|using Microsoft.CodeAnalysis;|]
@@ -1054,6 +1054,7 @@ namespace TestNamespace;
 
         var fixedTestCode = """
             namespace TestNamespace;
+
             {|Warning:using Microsoft.CodeAnalysis;|}
 
             using System;

src/Analyzers/CSharp/Tests/MisplacedUsingDirectives/MisplacedUsingDirectivesTests.cs

@@ -67,6 +67,74 @@ await TestChangeSignatureViaCommandAsync(
             expectedUpdatedInvocationDocumentCode: expectedCode);
     }
 
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/75676")]
+    public async Task TestForPrimaryConstructor_ViaCommand()
+    {
+        var markup = """
+            public class Base {
+                public $$Base(string Item2, string Item1)
+                {
+                }
+            }
+
+            public class Derived() : Base("Item2", "Item1")
+            {
+            }
+            """;
+        var expectedCode = """
+            public class Base {
+                public Base(string Item1, string Item2)
+                {
+                }
+            }
+            
+            public class Derived() : Base("Item1", "Item2")
+            {
+            }
+            """;
+
+        await TestChangeSignatureViaCommandAsync(
+            LanguageNames.CSharp,
+            markup: markup,
+            updatedSignature: [1, 0],
+            expectedUpdatedInvocationDocumentCode: expectedCode);
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/75676")]
+    public async Task TestForPrimaryConstructorParamsArray_ViaCommand()
+    {
+        var markup = """
+        public class Base {
+            public $$Base(string Item2, string Item1, params object[] items)
+            {
+                Console.WriteLine(items.Length);
+            }
+        }
+
+        public class Derived() : Base("Item2", "Item1", 1, "test", true)
+        {
+        }
+        """;
+        var expectedCode = """
+        public class Base {
+            public Base(string Item1, string Item2, params object[] items)
+            {
+                Console.WriteLine(items.Length);
+            }
+        }
+        
+        public class Derived() : Base("Item1", "Item2", 1, "test", true)
+        {
+        }
+        """;
+
+        await TestChangeSignatureViaCommandAsync(
+            LanguageNames.CSharp,
+            markup: markup,
+            updatedSignature: [1, 0, 2],
+            expectedUpdatedInvocationDocumentCode: expectedCode);
+    }
+
     [Fact]
     public async Task TestOnLambdaWithTwoDiscardParameters_ViaCommand()
     {

src/EditorFeatures/CSharpTest/ChangeSignature/ChangeSignatureTests.cs

@@ -80,6 +80,7 @@ internal sealed class CSharpChangeSignatureService : AbstractChangeSignatureServ
         SyntaxKind.SimpleLambdaExpression,
         SyntaxKind.ParenthesizedLambdaExpression,
         SyntaxKind.NameMemberCref,
+        SyntaxKind.PrimaryConstructorBaseType,
     ];
 
     private static readonly ImmutableArray<SyntaxKind> _updatableNodeKinds =
@@ -104,6 +105,7 @@ internal sealed class CSharpChangeSignatureService : AbstractChangeSignatureServ
         SyntaxKind.RecordDeclaration,
         SyntaxKind.StructDeclaration,
         SyntaxKind.ClassDeclaration,
+        SyntaxKind.PrimaryConstructorBaseType,
     ];
 
     [ImportingConstructor]
@@ -272,6 +274,7 @@ private static bool InSymbolHeader(SyntaxNode matchingNode, int position)
             case SyntaxKind.ObjectCreationExpression:
                 return ((ObjectCreationExpressionSyntax)matchingNode).Type;
 
+            case SyntaxKind.PrimaryConstructorBaseType:
             case SyntaxKind.ConstructorDeclaration:
             case SyntaxKind.IndexerDeclaration:
             case SyntaxKind.ThisConstructorInitializer:
@@ -507,6 +510,22 @@ or SyntaxKind.StructDeclaration
                     cancellationToken));
         }
 
+        if (updatedNode is PrimaryConstructorBaseTypeSyntax primaryConstructor)
+        {
+            var symbolInfo = semanticModel.GetSymbolInfo((PrimaryConstructorBaseTypeSyntax)originalNode, cancellationToken);
+
+            return primaryConstructor.WithArgumentList(
+                UpdateArgumentList(
+                    document,
+                    declarationSymbol,
+                    signaturePermutation,
+                    primaryConstructor.ArgumentList,
+                    isReducedExtensionMethod: false,
+                    IsParamsArrayExpanded(semanticModel, primaryConstructor, symbolInfo, cancellationToken),
+                    originalNode.SpanStart,
+                    cancellationToken));
+        }
+
         Debug.Assert(false, "Unknown reference location");
         return null;
     }
@@ -618,6 +637,7 @@ private static bool IsParamsArrayExpanded(SemanticModel semanticModel, SyntaxNod
                 BaseObjectCreationExpressionSyntax objectCreation => objectCreation.ArgumentList,
                 ConstructorInitializerSyntax constructorInitializer => constructorInitializer.ArgumentList,
                 ElementAccessExpressionSyntax elementAccess => elementAccess.ArgumentList,
+                PrimaryConstructorBaseTypeSyntax primaryConstructor => primaryConstructor.ArgumentList,
                 _ => throw ExceptionUtilities.UnexpectedValue(node.Kind())
             };
 

src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs

@@ -1269,6 +1269,7 @@ class Program : MyBase
             // this is my real document header
 
             namespace ConsoleApp185;
+
             using System;
             using System.Collections.Generic;