Skip to content

Bump CLaSP #10366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 15, 2024
Merged

Bump CLaSP #10366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0527ce2
Bump CLaSP
davidwengier May 14, 2024
606e3db
Respond to the enormous breaking changes
davidwengier May 14, 2024
a595af8
Fix various messages in the error list window
davidwengier May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>324e078a9b47b62cd6dec6c78c6308c4540aa1e5</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.11.0-1.24214.4">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.11.0-2.24260.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>84c5476ef3111c9abd78d43e65063280bb7202d9</Sha>
<Sha>324e078a9b47b62cd6dec6c78c6308c4540aa1e5</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.11.0-2.24260.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-2.24260.2</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.11.0-1.24214.4</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.11.0-2.24260.2</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.11.0-2.24260.2</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.11.0-2.24260.2</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-2.24260.2</MicrosoftCodeAnalysisCSharpPackageVersion>
Expand Down
15 changes: 6 additions & 9 deletions src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private static ILspLogger CreateILspLogger(ILoggerFactory loggerFactory, ITeleme
protected override IRequestExecutionQueue<RazorRequestContext> ConstructRequestExecutionQueue()
{
var handlerProvider = this.HandlerProvider;
var queue = new RazorRequestExecutionQueue(this, _logger, handlerProvider);
var queue = new RazorRequestExecutionQueue(this, Logger, handlerProvider);
queue.Start();

return queue;
Expand All @@ -103,7 +103,7 @@ protected override ILspServices ConstructLspServices()
services.AddSingleton<IClientConnection>(_clientConnection);

// Add the logger as a service in case anything in CLaSP pulls it out to do logging
services.AddSingleton<ILspLogger>(_logger);
services.AddSingleton<ILspLogger>(Logger);

services.AddSingleton<IAdhocWorkspaceFactory, AdhocWorkspaceFactory>();
services.AddSingleton<IWorkspaceProvider, LspWorkspaceProvider>();
Expand Down Expand Up @@ -178,10 +178,12 @@ static void AddHandlers(IServiceCollection services, LanguageServerFeatureOption

services.AddHandlerWithCapabilities<RenameEndpoint>();
services.AddHandlerWithCapabilities<DefinitionEndpoint>();

if (!featureOptions.UseRazorCohostServer)
{
services.AddHandlerWithCapabilities<LinkedEditingRangeEndpoint>();
}

services.AddHandler<WrapWithTagEndpoint>();
services.AddHandler<RazorBreakpointSpanEndpoint>();
services.AddHandler<RazorProximityExpressionsEndpoint>();
Expand Down Expand Up @@ -227,14 +229,9 @@ internal T GetRequiredService<T>() where T : notnull
return new TestAccessor(this);
}

internal new class TestAccessor
internal new class TestAccessor(RazorLanguageServer server)
{
private RazorLanguageServer _server;

public TestAccessor(RazorLanguageServer server)
{
_server = server;
}
private readonly RazorLanguageServer _server = server;

public AbstractHandlerProvider HandlerProvider => _server.HandlerProvider;

Expand Down