Merge main to main-vs-deps

azure-pipelines-official.yml

@@ -83,7 +83,7 @@ stages:
     timeoutInMinutes: 360
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
     steps:
     - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"

azure-pipelines-pr-validation.yml

@@ -49,7 +49,7 @@ stages:
     timeoutInMinutes: 360
     # Conditionally set build pool so we can share this YAML when building with different pipeline
     pool:
-      name: VSEngSS-MicroBuild2022-1ES
+      name: VSEngSS-MicroBuild2019-1ES
       demands:
       - msbuild
       - visualstudio
@@ -89,6 +89,14 @@ stages:
       inputs:
         nuGetServiceConnections: azure-public/vs-impl, azure-public/vssdk
 
+    # Needed because the build fails the NuGet Tools restore without it
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core sdk'
+      inputs:
+        packageType: sdk
+        useGlobalJson: true
+        workingDirectory: '$(Build.SourcesDirectory)'
+
     # Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
     - task: NuGetCommand@2
       displayName: Restore internal tools

src/Analyzers/Core/CodeFixes/PredefinedCodeFixProviderNames.cs

@@ -12,6 +12,7 @@ internal static class PredefinedCodeFixProviderNames
         public const string AddBraces = nameof(AddBraces);
         public const string AddDocCommentNodes = nameof(AddDocCommentNodes);
         public const string AddExplicitCast = nameof(AddExplicitCast);
+        public const string AddInheritdoc = nameof(AddInheritdoc);
         public const string AddImport = nameof(AddImport);
         public const string AddMissingReference = nameof(AddMissingReference);
         public const string AddNew = nameof(AddNew);

src/Compilers/Test/Core/Traits/Traits.cs

@@ -45,6 +45,7 @@ public static class Features
             public const string CodeActionsAddDebuggerDisplay = "CodeActions.AddDebuggerDisplay";
             public const string CodeActionsAddDocCommentNodes = "CodeActions.AddDocCommentParamNodes";
             public const string CodeActionsAddExplicitCast = "CodeActions.AddExplicitCast";
+            public const string CodeActionsAddInheritdoc = "CodeActions.AddInheritdoc";
             public const string CodeActionsAddFileBanner = "CodeActions.AddFileBanner";
             public const string CodeActionsAddImport = "CodeActions.AddImport";
             public const string CodeActionsAddMissingReference = "CodeActions.AddMissingReference";

src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs

@@ -24,7 +24,6 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
-using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
@@ -329,6 +328,7 @@ protected override void ModifySelectedNode(
             CancellationToken cancellationToken)
         {
             var root = document.GetRequiredSyntaxRootSynchronously(cancellationToken);
+            var documentOptions = document.GetOptionsAsync(cancellationToken).WaitAndGetResult(cancellationToken);
             // Add braces for the selected node
             if (addBrace)
             {
@@ -350,7 +350,7 @@ or IfStatementSyntax
                     or ElseClauseSyntax)
                 {
                     // Add the braces and get the next caretPosition
-                    var (newRoot, nextCaretPosition) = AddBraceToSelectedNode(document, root, selectedNode, args.TextView.Options, cancellationToken);
+                    var (newRoot, nextCaretPosition) = AddBraceToSelectedNode(document, root, selectedNode, documentOptions, cancellationToken);
                     if (document.Project.Solution.Workspace.TryApplyChanges(document.WithSyntaxRoot(newRoot).Project.Solution))
                     {
                         args.TextView.TryMoveCaretToAndEnsureVisible(new SnapshotPoint(args.SubjectBuffer.CurrentSnapshot, nextCaretPosition));
@@ -375,7 +375,7 @@ or IfStatementSyntax
                     var insertionPosition = GetBraceInsertionPosition(selectedNode);
 
                     // 2. Insert the braces and move caret
-                    InsertBraceAndMoveCaret(args.TextView, document, insertionPosition, cancellationToken);
+                    InsertBraceAndMoveCaret(args.TextView, document, documentOptions, insertionPosition, cancellationToken);
                 }
             }
             else
@@ -385,7 +385,7 @@ or IfStatementSyntax
                     document,
                     root,
                     selectedNode,
-                    args.TextView.Options,
+                    documentOptions,
                     cancellationToken);
 
                 if (document.Project.Solution.Workspace.TryApplyChanges(document.WithSyntaxRoot(newRoot).Project.Solution))
@@ -399,7 +399,7 @@ private static (SyntaxNode newRoot, int nextCaretPosition) AddBraceToSelectedNod
             Document document,
             SyntaxNode root,
             SyntaxNode selectedNode,
-            IEditorOptions editorOptions,
+            DocumentOptionSet documentOptions,
             CancellationToken cancellationToken)
         {
             // For these nodes, directly modify the node and replace it.
@@ -414,7 +414,7 @@ or EventFieldDeclarationSyntax
                     document,
                     root,
                     selectedNode,
-                    WithBraces(selectedNode, editorOptions),
+                    WithBraces(selectedNode, documentOptions),
                     cancellationToken);
                 // Locate the open brace token, and move the caret after it.
                 var nextCaretPosition = GetOpenBraceSpanEnd(newRoot);
@@ -428,7 +428,7 @@ or EventFieldDeclarationSyntax
             // var c = new Obje$$ct() => var c = new Object();
             if (selectedNode is ObjectCreationExpressionSyntax objectCreationExpressionNode)
             {
-                var (newNode, oldNode) = ModifyObjectCreationExpressionNode(objectCreationExpressionNode, addOrRemoveInitializer: true, editorOptions);
+                var (newNode, oldNode) = ModifyObjectCreationExpressionNode(objectCreationExpressionNode, addOrRemoveInitializer: true, documentOptions);
                 var newRoot = ReplaceNodeAndFormat(
                     document,
                     root,
@@ -480,7 +480,7 @@ or EventFieldDeclarationSyntax
             // In this case 'Print("Bar")' is considered as the innerStatement so when we inserted the empty block, we need also insert that
             if (selectedNode.IsEmbeddedStatementOwner())
             {
-                return AddBraceToEmbeddedStatementOwner(document, root, selectedNode, editorOptions, cancellationToken);
+                return AddBraceToEmbeddedStatementOwner(document, root, selectedNode, documentOptions, cancellationToken);
             }
 
             throw ExceptionUtilities.UnexpectedValue(selectedNode);
@@ -490,7 +490,7 @@ private static (SyntaxNode newRoot, int nextCaretPosition) RemoveBraceFromSelect
             Document document,
             SyntaxNode root,
             SyntaxNode selectedNode,
-            IEditorOptions editorOptions,
+            DocumentOptionSet documentOptions,
             CancellationToken cancellationToken)
         {
             // Remove the initializer from ObjectCreationExpression
@@ -504,7 +504,7 @@ private static (SyntaxNode newRoot, int nextCaretPosition) RemoveBraceFromSelect
             // e.g. var c = new Bar() => var c = new Bar();
             if (selectedNode is ObjectCreationExpressionSyntax objectCreationExpressionNode)
             {
-                var (newNode, oldNode) = ModifyObjectCreationExpressionNode(objectCreationExpressionNode, addOrRemoveInitializer: false, editorOptions);
+                var (newNode, oldNode) = ModifyObjectCreationExpressionNode(objectCreationExpressionNode, addOrRemoveInitializer: false, documentOptions);
                 var newRoot = ReplaceNodeAndFormat(
                     document,
                     root,
@@ -633,18 +633,19 @@ private static bool IsTokenPartOfExpression(SyntaxToken syntaxToken)
             return !syntaxToken.GetAncestors<ExpressionSyntax>().IsEmpty();
         }
 
-        private static string GetBracePairString(IEditorOptions editorOptions)
+        private static string GetBracePairString(DocumentOptionSet documentOptions)
             => string.Concat(SyntaxFacts.GetText(SyntaxKind.OpenBraceToken),
-                editorOptions.GetNewLineCharacter(),
+                documentOptions.GetOption(FormattingOptions2.NewLine),
                 SyntaxFacts.GetText(SyntaxKind.CloseBraceToken));
 
         private void InsertBraceAndMoveCaret(
             ITextView textView,
             Document document,
+            DocumentOptionSet documentOptions,
             int insertionPosition,
             CancellationToken cancellationToken)
         {
-            var bracePair = GetBracePairString(textView.Options);
+            var bracePair = GetBracePairString(documentOptions);
 
             // 1. Insert { }.
             var newDocument = document.InsertText(insertionPosition, bracePair, cancellationToken);