Skip to content

Add more information to dynamic file publish #11267

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
ryzngard merged 3 commits into from
Dec 4, 2024
Merged

Add more information to dynamic file publish #11267

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
1c335fc
Add checksum and encoding information to publish data
Dec 3, 2024
5ef1b4d
Fix test
Dec 3, 2024
9f6e52c
Base64 encode
Dec 4, 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
10 changes: 8 additions & 2 deletions src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedDocumentPublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ public void PublishCSharp(ProjectKey projectKey, string filePath, SourceText sou
ProjectKeyId = projectKey.Id,
Changes = textChanges.Select(static t => t.ToRazorTextChange()).ToArray(),
HostDocumentVersion = hostDocumentVersion,
PreviousWasEmpty = previouslyPublishedData.SourceText.Length == 0
PreviousWasEmpty = previouslyPublishedData.SourceText.Length == 0,
Checksum = Convert.ToBase64String(sourceText.GetChecksum().ToArray()),
ChecksumAlgorithm = sourceText.ChecksumAlgorithm,
SourceEncodingCodePage = sourceText.Encoding?.CodePage
};

_clientConnection.SendNotificationAsync(CustomMessageNames.RazorUpdateCSharpBufferEndpoint, request, CancellationToken.None).Forget();
Expand Down Expand Up @@ -145,7 +148,10 @@ public void PublishHtml(ProjectKey projectKey, string filePath, SourceText sourc
ProjectKeyId = projectKey.Id,
Changes = textChanges.Select(static t => t.ToRazorTextChange()).ToArray(),
HostDocumentVersion = hostDocumentVersion,
PreviousWasEmpty = previouslyPublishedData.SourceText.Length == 0
PreviousWasEmpty = previouslyPublishedData.SourceText.Length == 0,
Checksum = Convert.ToBase64String(sourceText.GetChecksum().ToArray()),
ChecksumAlgorithm = sourceText.ChecksumAlgorithm,
SourceEncodingCodePage = sourceText.Encoding?.CodePage
};

_clientConnection.SendNotificationAsync(CustomMessageNames.RazorUpdateHtmlBufferEndpoint, request, CancellationToken.None).Forget();
Expand Down
10 changes: 10 additions & 0 deletions src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/UpdateBufferRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license. See License.txt in the project root for license information.

using System.Text.Json.Serialization;
using Microsoft.CodeAnalysis.Text;

namespace Microsoft.CodeAnalysis.Razor.Protocol;

Expand All @@ -21,4 +22,13 @@ internal sealed class UpdateBufferRequest

[JsonPropertyName("previousWasEmpty")]
public bool PreviousWasEmpty { get; set; }

[JsonPropertyName("checksum")]
public required string Checksum { get; set; }

[JsonPropertyName("checksumAlgorithm")]
public SourceHashAlgorithm ChecksumAlgorithm { get; set; }

[JsonPropertyName("encodingCodePage")]
public int? SourceEncodingCodePage { get; set; }
}
12 changes: 11 additions & 1 deletion ...t.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorCustomMessageTargetTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
using Microsoft.CodeAnalysis.Razor.Workspaces;
using Microsoft.CodeAnalysis.Razor.Workspaces.Protocol.SemanticTokens;
using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
using Microsoft.VisualStudio.LanguageServer.Protocol;
using Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
Expand Down Expand Up @@ -71,7 +72,10 @@ public async Task UpdateCSharpBuffer_CannotLookupDocument_NoopsGracefully()
var request = new UpdateBufferRequest()
{
HostDocumentFilePath = "C:/path/to/file.razor",
Changes = null
Changes = null,
Checksum = "",
ChecksumAlgorithm = SourceHashAlgorithm.Sha256,
SourceEncodingCodePage = null,
};

// Act & Assert
Expand Down Expand Up @@ -115,6 +119,9 @@ public async Task UpdateCSharpBuffer_UpdatesDocument()
HostDocumentFilePath = "C:/path/to/file.razor",
HostDocumentVersion = 1337,
Changes = [],
Checksum = "",
ChecksumAlgorithm = SourceHashAlgorithm.Sha256,
SourceEncodingCodePage = null,
};

// Act
Expand Down Expand Up @@ -169,6 +176,9 @@ public async Task UpdateCSharpBuffer_UpdatesCorrectDocument()
HostDocumentFilePath = "C:/path/to/file.razor",
HostDocumentVersion = 1337,
Changes = [],
Checksum = "",
ChecksumAlgorithm = SourceHashAlgorithm.Sha256,
SourceEncodingCodePage = null,
};

// Act
Expand Down
Loading