This commit is contained in:
David Wengier 2024-10-24 09:19:32 +11:00
Родитель 5b5539f60c
Коммит 1e1a0fcbf4
2 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -79,7 +79,7 @@ internal sealed class CodeActionEndpoint(
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var delegatedCodeActions = await GetDelegatedCodeActionsAsync(documentContext, razorCodeActionContext, correlationId, cancellationToken).ConfigureAwait(false); var delegatedCodeActions = await GetDelegatedCodeActionsAsync(razorCodeActionContext, correlationId, cancellationToken).ConfigureAwait(false);
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@ -184,7 +184,7 @@ internal sealed class CodeActionEndpoint(
return context; return context;
} }
private async Task<ImmutableArray<RazorVSInternalCodeAction>> GetDelegatedCodeActionsAsync(DocumentContext documentContext, RazorCodeActionContext context, Guid correlationId, CancellationToken cancellationToken) private async Task<ImmutableArray<RazorVSInternalCodeAction>> GetDelegatedCodeActionsAsync(RazorCodeActionContext context, Guid correlationId, CancellationToken cancellationToken)
{ {
var languageKind = context.CodeDocument.GetLanguageKind(context.StartAbsoluteIndex, rightAssociative: false); var languageKind = context.CodeDocument.GetLanguageKind(context.StartAbsoluteIndex, rightAssociative: false);
@ -194,7 +194,7 @@ internal sealed class CodeActionEndpoint(
return []; return [];
} }
var codeActions = await GetCodeActionsFromLanguageServerAsync(languageKind, documentContext, context, correlationId, cancellationToken).ConfigureAwait(false); var codeActions = await GetCodeActionsFromLanguageServerAsync(languageKind, context, correlationId, cancellationToken).ConfigureAwait(false);
if (codeActions is not [_, ..]) if (codeActions is not [_, ..])
{ {
return []; return [];
@ -265,7 +265,7 @@ internal sealed class CodeActionEndpoint(
} }
// Internal for testing // Internal for testing
internal async Task<RazorVSInternalCodeAction[]> GetCodeActionsFromLanguageServerAsync(RazorLanguageKind languageKind, DocumentContext documentContext, RazorCodeActionContext context, Guid correlationId, CancellationToken cancellationToken) internal async Task<RazorVSInternalCodeAction[]> GetCodeActionsFromLanguageServerAsync(RazorLanguageKind languageKind, RazorCodeActionContext context, Guid correlationId, CancellationToken cancellationToken)
{ {
if (languageKind == RazorLanguageKind.CSharp) if (languageKind == RazorLanguageKind.CSharp)
{ {
@ -291,7 +291,7 @@ internal sealed class CodeActionEndpoint(
var delegatedParams = new DelegatedCodeActionParams() var delegatedParams = new DelegatedCodeActionParams()
{ {
HostDocumentVersion = documentContext.Snapshot.Version, HostDocumentVersion = context.DocumentSnapshot.Version,
CodeActionParams = context.Request, CodeActionParams = context.Request,
LanguageKind = languageKind, LanguageKind = languageKind,
CorrelationId = correlationId CorrelationId = correlationId

Просмотреть файл

@ -528,7 +528,7 @@ public class CodeActionEndpointTest(ITestOutputHelper testOutput) : LanguageServ
Assert.NotNull(context); Assert.NotNull(context);
// Act // Act
var results = await codeActionEndpoint.GetCodeActionsFromLanguageServerAsync(RazorLanguageKind.CSharp, documentContext, context, Guid.Empty, cancellationToken: default); var results = await codeActionEndpoint.GetCodeActionsFromLanguageServerAsync(RazorLanguageKind.CSharp, context, Guid.Empty, cancellationToken: default);
// Assert // Assert
Assert.Empty(results); Assert.Empty(results);
@ -564,7 +564,7 @@ public class CodeActionEndpointTest(ITestOutputHelper testOutput) : LanguageServ
Assert.NotNull(context); Assert.NotNull(context);
// Act // Act
var results = await codeActionEndpoint.GetCodeActionsFromLanguageServerAsync(RazorLanguageKind.CSharp, documentContext, context, Guid.Empty, cancellationToken: DisposalToken); var results = await codeActionEndpoint.GetCodeActionsFromLanguageServerAsync(RazorLanguageKind.CSharp, context, Guid.Empty, cancellationToken: DisposalToken);
// Assert // Assert
var result = Assert.Single(results); var result = Assert.Single(results);