Skip to content

Commit 6c585b6

Browse files
davidwengierdavidwengier
authored
Make cohost formatting honour C# formatting options (#12042)
Fixes #11839 Needs dotnet/roslyn#79458 before it will compile This just tweaks the "override C# settings for tests" system we had into a formal "can specify C# settings before formatting" option, and then in cohosting we grab the options from Roslyn (via new EA API) before jumping to OOP.
2 parents 617e1fa + 2474828 commit 6c585b6

File tree

18 files changed

+198
-216
lines changed

18 files changed

+198
-216
lines changed

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,89 @@
22
<Dependencies>
33
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25365.1">
5+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-2.25375.9">
66
<Uri>https://github.com/dotnet/roslyn</Uri>
7-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
7+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25365.1">
9+
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-2.25375.9">
1010
<Uri>https://github.com/dotnet/roslyn</Uri>
11-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
11+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25365.1">
13+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-2.25375.9">
1414
<Uri>https://github.com/dotnet/roslyn</Uri>
15-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
15+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25365.1">
17+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25375.9">
1818
<Uri>https://github.com/dotnet/roslyn</Uri>
19-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
19+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25365.1">
21+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-2.25375.9">
2222
<Uri>https://github.com/dotnet/roslyn</Uri>
23-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
23+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25365.1">
25+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-2.25375.9">
2626
<Uri>https://github.com/dotnet/roslyn</Uri>
27-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
27+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25365.1">
29+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25375.9">
3030
<Uri>https://github.com/dotnet/roslyn</Uri>
31-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
31+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25365.1">
33+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25375.9">
3434
<Uri>https://github.com/dotnet/roslyn</Uri>
35-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
35+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25365.1">
37+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-2.25375.9">
3838
<Uri>https://github.com/dotnet/roslyn</Uri>
39-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
39+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25365.1">
41+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25375.9">
4242
<Uri>https://github.com/dotnet/roslyn</Uri>
43-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
43+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25365.1">
45+
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-2.25375.9">
4646
<Uri>https://github.com/dotnet/roslyn</Uri>
47-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
47+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25365.1">
49+
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-2.25375.9">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
51+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25365.1">
53+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-2.25375.9">
5454
<Uri>https://github.com/dotnet/roslyn</Uri>
55-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
55+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25365.1">
57+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25375.9">
5858
<Uri>https://github.com/dotnet/roslyn</Uri>
59-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
59+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25365.1">
61+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25375.9">
6262
<Uri>https://github.com/dotnet/roslyn</Uri>
63-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
63+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25365.1">
65+
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-2.25375.9">
6666
<Uri>https://github.com/dotnet/roslyn</Uri>
67-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
67+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25365.1">
69+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-2.25375.9">
7070
<Uri>https://github.com/dotnet/roslyn</Uri>
71-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
71+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25365.1">
73+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-2.25375.9">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
75-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
75+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25365.1">
77+
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-2.25375.9">
7878
<Uri>https://github.com/dotnet/roslyn</Uri>
79-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
79+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25365.1">
81+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25375.9">
8282
<Uri>https://github.com/dotnet/roslyn</Uri>
83-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
83+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25365.1">
85+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25375.9">
8686
<Uri>https://github.com/dotnet/roslyn</Uri>
87-
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
87+
<Sha>e644f864fb302c088d751f6face7bd54cda17259</Sha>
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,27 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisAnalyzersPackageVersion>
51-
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25365.1</MicrosoftNetCompilersToolsetPackageVersion>
52-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
53-
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25365.1</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
54-
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
55-
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
56-
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCommonPackageVersion>
57-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpPackageVersion>
58-
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
59-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
60-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
61-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
62-
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
63-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
64-
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
65-
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
66-
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
67-
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
68-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
69-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
70-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25365.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
50+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisAnalyzersPackageVersion>
51+
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25375.9</MicrosoftNetCompilersToolsetPackageVersion>
52+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
53+
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-2.25375.9</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
54+
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
55+
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
56+
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisCommonPackageVersion>
57+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisCSharpPackageVersion>
58+
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
59+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
60+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
61+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
62+
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
63+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
64+
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
65+
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
66+
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
67+
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
68+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
69+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25375.9</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
70+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25375.9</MicrosoftVisualStudioLanguageServicesPackageVersion>
7171
<!--
7272
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
7373
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using Microsoft.CodeAnalysis;
11+
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
1112
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
1213
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
1314
using Microsoft.CodeAnalysis.Razor.Cohost;
@@ -60,7 +61,13 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
6061
protected override RazorTextDocumentIdentifier? GetRazorTextDocumentIdentifier(DocumentFormattingParams request)
6162
=> request.TextDocument.ToRazorTextDocumentIdentifier();
6263

63-
protected override async Task<TextEdit[]?> HandleRequestAsync(DocumentFormattingParams request, TextDocument razorDocument, CancellationToken cancellationToken)
64+
protected override Task<TextEdit[]?> HandleRequestAsync(DocumentFormattingParams request, TextDocument razorDocument, CancellationToken cancellationToken)
65+
{
66+
var csharpSyntaxFormattingOptions = RazorCSharpFormattingInteractionService.GetRazorCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services);
67+
return HandleRequestAsync(request, razorDocument, csharpSyntaxFormattingOptions, cancellationToken);
68+
}
69+
70+
private async Task<TextEdit[]?> HandleRequestAsync(DocumentFormattingParams request, TextDocument razorDocument, RazorCSharpSyntaxFormattingOptions csharpSyntaxFormattingOptions, CancellationToken cancellationToken)
6471
{
6572
_logger.LogDebug($"Getting Html formatting changes for {razorDocument.FilePath}");
6673
var htmlResult = await TryGetHtmlFormattingEditsAsync(request, razorDocument, cancellationToken).ConfigureAwait(false);
@@ -75,7 +82,10 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
7582
var sourceText = await razorDocument.GetTextAsync(cancellationToken).ConfigureAwait(false);
7683
var htmlChanges = htmlEdits.SelectAsArray(sourceText.GetTextChange);
7784

78-
var options = RazorFormattingOptions.From(request.Options, _clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine);
85+
var options = RazorFormattingOptions.From(
86+
request.Options,
87+
_clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine,
88+
csharpSyntaxFormattingOptions);
7989

8090
_logger.LogDebug($"Calling OOP with the {htmlChanges.Length} html edits, so it can fill in the rest");
8191
var remoteResult = await _remoteServiceInvoker.TryInvokeAsync<IRemoteFormattingService, ImmutableArray<TextChange>>(
@@ -114,8 +124,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
114124

115125
internal readonly struct TestAccessor(CohostDocumentFormattingEndpoint instance)
116126
{
117-
public Task<TextEdit[]?> HandleRequestAsync(DocumentFormattingParams request, TextDocument razorDocument, CancellationToken cancellationToken)
118-
=> instance.HandleRequestAsync(request, razorDocument, cancellationToken);
127+
public Task<TextEdit[]?> HandleRequestAsync(DocumentFormattingParams request, TextDocument razorDocument, RazorCSharpSyntaxFormattingOptions csharpSyntaxFormattingOptions, CancellationToken cancellationToken)
128+
=> instance.HandleRequestAsync(request, razorDocument, csharpSyntaxFormattingOptions, cancellationToken);
119129
}
120130
}
121-

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostOnTypeFormattingEndpoint.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Threading.Tasks;
1010
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
1111
using Microsoft.CodeAnalysis;
12+
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
1213
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
1314
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
1415
using Microsoft.CodeAnalysis.Razor.Cohost;
@@ -111,7 +112,8 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
111112
htmlChanges = htmlEdits.SelectAsArray(sourceText.GetTextChange);
112113
}
113114

114-
var options = RazorFormattingOptions.From(request.Options, clientSettings.AdvancedSettings.CodeBlockBraceOnNextLine);
115+
var csharpSyntaxFormattingOptions = RazorCSharpFormattingInteractionService.GetRazorCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services);
116+
var options = RazorFormattingOptions.From(request.Options, clientSettings.AdvancedSettings.CodeBlockBraceOnNextLine, csharpSyntaxFormattingOptions);
115117

116118
_logger.LogDebug($"Calling OOP with the {htmlChanges.Length} html edits, so it can fill in the rest");
117119
var remoteResult = await _remoteServiceInvoker.TryInvokeAsync<IRemoteFormattingService, ImmutableArray<TextChange>>(
@@ -154,4 +156,3 @@ internal readonly struct TestAccessor(CohostOnTypeFormattingEndpoint instance)
154156
=> instance.HandleRequestAsync(request, razorDocument, cancellationToken);
155157
}
156158
}
157-

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostRangeFormattingEndpoint.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using Microsoft.CodeAnalysis;
11+
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
1112
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
1213
using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
1314
using Microsoft.CodeAnalysis.Razor.Cohost;
@@ -83,7 +84,11 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
8384
var sourceText = await razorDocument.GetTextAsync(cancellationToken).ConfigureAwait(false);
8485
var htmlChanges = htmlEdits.SelectAsArray(sourceText.GetTextChange);
8586

86-
var options = RazorFormattingOptions.From(request.Options, _clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine);
87+
var csharpSyntaxFormattingOptions = RazorCSharpFormattingInteractionService.GetRazorCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services);
88+
var options = RazorFormattingOptions.From(
89+
request.Options,
90+
_clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine,
91+
csharpSyntaxFormattingOptions);
8792

8893
_logger.LogDebug($"Calling OOP with the {htmlChanges.Length} html edits, so it can fill in the rest");
8994
var remoteResult = await _remoteServiceInvoker.TryInvokeAsync<IRemoteFormattingService, ImmutableArray<TextChange>>(
@@ -135,4 +140,3 @@ internal readonly struct TestAccessor(CohostRangeFormattingEndpoint instance)
135140
=> instance.HandleRequestAsync(request, razorDocument, cancellationToken);
136141
}
137142
}
138-

0 commit comments

Comments
 (0)