Skip to content

Commit cf5da2d

Browse files
davidwengierdavidwengier
authored
Client settings tweaks, and implement VS Code configuration monitoring (#11800)
Part of #11759 This cleans up `IClientSettingsManager` and puts it back to its previous state, removing `IClientSettingsReader` at the same time, and also implements a hook for VS Code to get notified when the VS Code configuration changes, and to read the settings as appropriate. Needs a bump to dotnet/roslyn#78364 before it will build
2 parents 2e057fe + 5ce5120 commit cf5da2d

File tree

44 files changed

+263
-193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+263
-193
lines changed

‎eng/Version.Details.xml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,99 +8,99 @@
88
<Sha>19eb5ea4e5f9c4e5256843a92805c8c9e942207d</Sha>
99
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1010
</Dependency>
11-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25222.12">
11+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25230.6">
1212
<Uri>https://github.com/dotnet/roslyn</Uri>
13-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
13+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25222.12">
15+
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25230.6">
1616
<Uri>https://github.com/dotnet/roslyn</Uri>
17-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
17+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25222.12">
19+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25230.6">
2020
<Uri>https://github.com/dotnet/roslyn</Uri>
21-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
21+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25222.12">
23+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25230.6">
2424
<Uri>https://github.com/dotnet/roslyn</Uri>
25-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
25+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25222.12">
27+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25230.6">
2828
<Uri>https://github.com/dotnet/roslyn</Uri>
29-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
29+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25222.12">
31+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25230.6">
3232
<Uri>https://github.com/dotnet/roslyn</Uri>
33-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
33+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25222.12">
35+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25230.6">
3636
<Uri>https://github.com/dotnet/roslyn</Uri>
37-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
37+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25222.12">
39+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25230.6">
4040
<Uri>https://github.com/dotnet/roslyn</Uri>
41-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
41+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25222.12">
43+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25230.6">
4444
<Uri>https://github.com/dotnet/roslyn</Uri>
45-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
45+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
4646
</Dependency>
47-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25222.12">
47+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25230.6">
4848
<Uri>https://github.com/dotnet/roslyn</Uri>
49-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
49+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="5.0.0-1.25222.12">
51+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="5.0.0-1.25230.6">
5252
<Uri>https://github.com/dotnet/roslyn</Uri>
53-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
53+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25222.12">
55+
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25230.6">
5656
<Uri>https://github.com/dotnet/roslyn</Uri>
57-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
57+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25222.12">
59+
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25230.6">
6060
<Uri>https://github.com/dotnet/roslyn</Uri>
61-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
61+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25222.12">
63+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25230.6">
6464
<Uri>https://github.com/dotnet/roslyn</Uri>
65-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
65+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25222.12">
67+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25230.6">
6868
<Uri>https://github.com/dotnet/roslyn</Uri>
69-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
69+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25222.12">
71+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25230.6">
7272
<Uri>https://github.com/dotnet/roslyn</Uri>
73-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
73+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25222.12">
75+
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25230.6">
7676
<Uri>https://github.com/dotnet/roslyn</Uri>
77-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
77+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
7878
</Dependency>
7979
<!-- Intermediate is necessary for source build. -->
80-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25222.12">
80+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25230.6">
8181
<Uri>https://github.com/dotnet/roslyn</Uri>
82-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
82+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
8383
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8484
</Dependency>
85-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25222.12">
85+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25230.6">
8686
<Uri>https://github.com/dotnet/roslyn</Uri>
87-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
87+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25222.12">
89+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25230.6">
9090
<Uri>https://github.com/dotnet/roslyn</Uri>
91-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
91+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25222.12">
93+
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25230.6">
9494
<Uri>https://github.com/dotnet/roslyn</Uri>
95-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
95+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25222.12">
97+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25230.6">
9898
<Uri>https://github.com/dotnet/roslyn</Uri>
99-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
99+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25222.12">
101+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25230.6">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>05e49aa98995349ffa26a19020333293ffe99670</Sha>
103+
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
104104
</Dependency>
105105
</ProductDependencies>
106106
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,31 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>3.12.0-beta1.25222.12</MicrosoftCodeAnalysisAnalyzersPackageVersion>
50+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>3.12.0-beta1.25230.6</MicrosoftCodeAnalysisAnalyzersPackageVersion>
5151
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.25223.3</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
5252
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.25208.6</MicrosoftSourceBuildIntermediatearcadePackageVersion>
53-
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25222.12</MicrosoftNetCompilersToolsetPackageVersion>
54-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
55-
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25222.12</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
56-
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
57-
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
58-
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisCommonPackageVersion>
59-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisCSharpPackageVersion>
60-
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
61-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
62-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
63-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
64-
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
65-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
66-
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
67-
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
68-
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
69-
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
70-
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
71-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
72-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25222.12</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
73-
<MicrosoftSourceBuildIntermediateroslynPackageVersion>5.0.0-1.25222.12</MicrosoftSourceBuildIntermediateroslynPackageVersion>
74-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25222.12</MicrosoftVisualStudioLanguageServicesPackageVersion>
53+
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25230.6</MicrosoftNetCompilersToolsetPackageVersion>
54+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
55+
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25230.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
56+
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
57+
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
58+
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCommonPackageVersion>
59+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpPackageVersion>
60+
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
61+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
62+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
63+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
64+
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
65+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
66+
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
67+
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
68+
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
69+
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
70+
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
71+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
72+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
73+
<MicrosoftSourceBuildIntermediateroslynPackageVersion>5.0.0-1.25230.6</MicrosoftSourceBuildIntermediateroslynPackageVersion>
74+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25230.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
7575
<!--
7676
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
7777
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.AspNetCore.Razor.ExternalAccess.LegacyEditor/RazorServices.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.ComponentModel.Composition;
55
using Microsoft.CodeAnalysis.Razor.Completion;
6+
using Microsoft.CodeAnalysis.Razor.Workspaces.Settings;
67
using Microsoft.VisualStudio.ComponentModelHost;
7-
using Microsoft.VisualStudio.Razor.Settings;
88
using Microsoft.VisualStudio.Shell;
99

1010
namespace Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor;

‎src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/RazorWrapperFactory.ClientSettingsManagerWrapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT license. See License.txt in the project root for license information.
33

44
using Microsoft.CodeAnalysis.Razor.Settings;
5-
using Microsoft.VisualStudio.Razor.Settings;
5+
using Microsoft.CodeAnalysis.Razor.Workspaces.Settings;
66

77
namespace Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor;
88

‎src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/RazorWrapperFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
using Microsoft.AspNetCore.Razor.Language;
99
using Microsoft.AspNetCore.Razor.PooledObjects;
1010
using Microsoft.CodeAnalysis.Razor.Completion;
11+
using Microsoft.CodeAnalysis.Razor.Workspaces.Settings;
1112
using Microsoft.VisualStudio.LegacyEditor.Razor;
1213
using Microsoft.VisualStudio.LegacyEditor.Razor.Parsing;
13-
using Microsoft.VisualStudio.Razor.Settings;
1414

1515
namespace Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor;
1616

‎src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hosting/ClaspLoggingBridge.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,10 @@ public void LogWarning(string message, params object[] @params)
7171
{
7272
return new LspLoggingScope(context, _logger);
7373
}
74+
75+
public IDisposable? CreateLanguageContext(string? language)
76+
{
77+
// We don't support hosting other languages in our LSP server
78+
return null;
79+
}
7480
}

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/CodeActions/CohostCodeActionsResolveEndpoint.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
3535
internal sealed class CohostCodeActionsResolveEndpoint(
3636
IRemoteServiceInvoker remoteServiceInvoker,
3737
IClientCapabilitiesService clientCapabilitiesService,
38-
IClientSettingsReader clientSettingsManager,
38+
IClientSettingsManager clientSettingsManager,
3939
IHtmlRequestInvoker requestInvoker)
4040
: AbstractRazorCohostDocumentRequestHandler<CodeAction, CodeAction?>, IDynamicRegistrationProvider
4141
{
4242
private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
4343
private readonly IClientCapabilitiesService _clientCapabilitiesService = clientCapabilitiesService;
44-
private readonly IClientSettingsReader _clientSettingsManager = clientSettingsManager;
44+
private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager;
4545
private readonly IHtmlRequestInvoker _requestInvoker = requestInvoker;
4646

4747
protected override bool MutatesSolutionState => false;

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Completion/CohostDocumentCompletionEndpoint.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
3434
#pragma warning restore RS0030 // Do not use banned APIs
3535
internal sealed class CohostDocumentCompletionEndpoint(
3636
IRemoteServiceInvoker remoteServiceInvoker,
37-
IClientSettingsReader clientSettingsManager,
37+
IClientSettingsManager clientSettingsManager,
3838
IClientCapabilitiesService clientCapabilitiesService,
3939
#pragma warning disable RS0030 // Do not use banned APIs
4040
[Import(AllowDefault = true)] ISnippetCompletionItemProvider? snippetCompletionItemProvider,
@@ -47,7 +47,7 @@ internal sealed class CohostDocumentCompletionEndpoint(
4747
: AbstractRazorCohostDocumentRequestHandler<CompletionParams, RazorVSInternalCompletionList?>, IDynamicRegistrationProvider
4848
{
4949
private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
50-
private readonly IClientSettingsReader _clientSettingsManager = clientSettingsManager;
50+
private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager;
5151
private readonly IClientCapabilitiesService _clientCapabilitiesService = clientCapabilitiesService;
5252
private readonly ISnippetCompletionItemProvider? _snippetCompletionItemProvider = snippetCompletionItemProvider;
5353
private readonly CompletionTriggerAndCommitCharacters _triggerAndCommitCharacters = new(languageServerFeatureOptions);

0 commit comments

Comments
 (0)