Fix

dotnet · Apr 10, 2022 · 2d69068 · 2d69068
1 parent f33deb3
commit 2d69068
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 13 deletions.
diff --git a/src/EditorFeatures/CSharpTest/CodeActions/MoveType/MoveTypeTests.MoveScope.cs b/src/EditorFeatures/CSharpTest/CodeActions/MoveType/MoveTypeTests.MoveScope.cs
@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings.MoveType;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Test.Utilities;
@@ -931,7 +932,7 @@ private async Task TestNamespaceMove(string originalCode, string expectedCode, b
             }
 
             var modifiedDocument = modifiedSolution.GetDocument(documentToModifyId);
-            var formattedDocument = await Formatter.FormatAsync(modifiedDocument).ConfigureAwait(false);
+            var formattedDocument = await Formatter.FormatAsync(modifiedDocument, CSharpSyntaxFormattingOptions.Default, CancellationToken.None).ConfigureAwait(false);
 
             var formattedText = await formattedDocument.GetTextAsync().ConfigureAwait(false);
             Assert.Equal(expectedCode, formattedText.ToString());

diff --git a/src/EditorFeatures/Test/CodeGeneration/CodeGenerationTests.cs b/src/EditorFeatures/Test/CodeGeneration/CodeGenerationTests.cs
@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Options;
@@ -20,6 +21,7 @@
 using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.VisualBasic.Formatting;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
 using Xunit;
@@ -882,8 +884,10 @@ public void Dispose()
                     {
                         this.Document = this.Result;
 
-                        var actual = Formatter.FormatAsync(Simplifier.ReduceAsync(this.Document, Simplifier.Annotation).Result, Formatter.Annotation).Result
-                            .GetSyntaxRootAsync().Result.ToFullString();
+                        var formattingOptions = IsVisualBasic ? (SyntaxFormattingOptions)VisualBasicSyntaxFormattingOptions.Default : CSharpSyntaxFormattingOptions.Default;
+
+                        var simplified = Simplifier.ReduceAsync(this.Document, Simplifier.Annotation).Result;
+                        var actual = Formatter.FormatAsync(simplified, Formatter.Annotation, formattingOptions, CancellationToken.None).Result.GetSyntaxRootAsync().Result.ToFullString();
 
                         Assert.Equal(_expected, actual);
                     }

diff --git a/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs b/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs
@@ -17,6 +17,8 @@
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using CS = Microsoft.CodeAnalysis.CSharp;
 using VB = Microsoft.CodeAnalysis.VisualBasic;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using System.Threading;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.MetadataAsSource
 {
@@ -1786,7 +1788,7 @@ public async Task FormatMetadataAsSource()
             using var context = TestContext.Create(LanguageNames.CSharp);
             var file = await context.GenerateSourceAsync("System.Console", project: context.DefaultProject);
             var document = context.GetDocument(file);
-            await Formatter.FormatAsync(document);
+            await Formatter.FormatAsync(document, CSharpSyntaxFormattingOptions.Default, CancellationToken.None);
         }
 
         [WorkItem(530829, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530829")]

diff --git a/src/Tools/IdeCoreBenchmarks/FormatterBenchmarks.cs b/src/Tools/IdeCoreBenchmarks/FormatterBenchmarks.cs
@@ -22,7 +22,7 @@ public class FormatterBenchmarks
         private readonly int _iterationCount = 5;
 
         private Document _document;
-        private OptionSet _options;
+        private SyntaxFormattingOptions _options;
 
         [GlobalSetup]
         public void GlobalSetup()
@@ -55,10 +55,16 @@ public void GlobalSetup()
             solution = solution.WithDocumentSyntaxRoot(documentId, root);
 
             _document = solution.GetDocument(documentId);
-            _options = _document.GetOptionsAsync().Result
-                .WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInTypes, true)
-                .WithChangedOption(CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine, false)
-                .WithChangedOption(CSharpFormattingOptions.WrappingPreserveSingleLine, false);
+            _options = new CSharpSyntaxFormattingOptions(
+                LineFormattingOptions.Default,
+                separateImportDirectiveGroups: CSharpSyntaxFormattingOptions.Default.SeparateImportDirectiveGroups,
+                spacing: CSharpSyntaxFormattingOptions.Default.Spacing,
+                spacingAroundBinaryOperator: CSharpSyntaxFormattingOptions.Default.SpacingAroundBinaryOperator,
+                CSharpSyntaxFormattingOptions.Default.NewLines | NewLinePlacement.BeforeOpenBraceInTypes,
+                labelPositioning: CSharpSyntaxFormattingOptions.Default.LabelPositioning,
+                indentation: CSharpSyntaxFormattingOptions.Default.Indentation,
+                wrappingKeepStatementsOnSingleLine: false,
+                wrappingPreserveSingleLine: false);
         }
 
         [Benchmark]

diff --git a/src/VisualStudio/Core/Impl/CodeModel/FileCodeModel.cs b/src/VisualStudio/Core/Impl/CodeModel/FileCodeModel.cs
@@ -343,8 +343,9 @@ internal void PerformEdit(Func<Document, Document> action)
 
                 var formatted = State.ThreadingContext.JoinableTaskFactory.Run(async () =>
                 {
-                    var formatted = await Formatter.FormatAsync(result, Formatter.Annotation).ConfigureAwait(true);
-                    formatted = await Formatter.FormatAsync(formatted, SyntaxAnnotation.ElasticAnnotation).ConfigureAwait(true);
+                    var formattingOptions = await SyntaxFormattingOptions.FromDocumentAsync(result, CancellationToken.None).ConfigureAwait(false);
+                    var formatted = await Formatter.FormatAsync(result, Formatter.Annotation, formattingOptions, CancellationToken.None).ConfigureAwait(true);
+                    formatted = await Formatter.FormatAsync(formatted, SyntaxAnnotation.ElasticAnnotation, formattingOptions, CancellationToken.None).ConfigureAwait(true);
 
                     return formatted;
                 });

diff --git a/src/VisualStudio/Core/Impl/Options/AbstractOptionPreviewViewModel.cs b/src/VisualStudio/Core/Impl/Options/AbstractOptionPreviewViewModel.cs
@@ -135,7 +135,8 @@ public void UpdatePreview(string text)
             project = project.WithMetadataReferences(referenceAssemblies);
 
             var document = project.AddDocument("document", SourceText.From(text, Encoding.UTF8));
-            var formatted = Formatter.FormatAsync(document, OptionStore.GetOptions()).WaitAndGetResult(CancellationToken.None);
+            var formattingOptions = SyntaxFormattingOptions.Create(OptionStore.GetOptions(), document.Project.Solution.Workspace.Services, document.Project.Language);
+            var formatted = Formatter.FormatAsync(document, formattingOptions, CancellationToken.None).WaitAndGetResult(CancellationToken.None);
 
             var textBuffer = _textBufferFactoryService.CreateTextBuffer(formatted.GetTextSynchronously(CancellationToken.None).ToString(), _contentType);
 

diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
@@ -48,6 +48,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.DiagnosticsTests.Utilities" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"/>
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor"/>
+    <InternalsVisibleTo Include="IdeCoreBenchmarks"/>
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.Completion.Tests" Key="$(IntelliCodeCSharpKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35081" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.IntelliCode.CSharp" Partner="Pythia" Key="$(IntelliCodeCSharpKey)" />

diff --git a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
@@ -17,6 +17,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
@@ -1816,7 +1817,7 @@ public async Task TestUpdateDocumentAsync()
                 .AddDocument(documentId, "DocumentName", SourceText.From("class Class{}"));
 
             var document = solution1.GetDocument(documentId);
-            var newRoot = await Formatter.FormatAsync(document).Result.GetSyntaxRootAsync();
+            var newRoot = await Formatter.FormatAsync(document, CSharpSyntaxFormattingOptions.Default, CancellationToken.None).Result.GetSyntaxRootAsync();
             var solution2 = solution1.WithDocumentSyntaxRoot(documentId, newRoot);
 
             Assert.NotEqual(solution1, solution2);