Skip to content

Fix sync over async blocking in tools|options #76511

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
CyrusNajmabadi merged 1 commit into from
Dec 19, 2024
Merged

Fix sync over async blocking in tools|options #76511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/VisualStudio/Core/Impl/Options/AbstractOptionPreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,10 @@ public void UpdatePreview(string text)
var fallbackFormattingOptions = OptionStore.GlobalOptions.GetSyntaxFormattingOptions(document.Project.Services);
var formattingService = document.GetRequiredLanguageService<ISyntaxFormattingService>();
var formattingOptions = formattingService.GetFormattingOptions(OptionStore);
var formatted = Formatter.FormatAsync(document, formattingOptions, CancellationToken.None).WaitAndGetResult(CancellationToken.None);
var root = document.GetSyntaxRootSynchronously(CancellationToken.None);
var formatted = Formatter.Format(root, document.Project.Solution.Services, formattingOptions, CancellationToken.None);

var textBuffer = _textBufferCloneService.Clone(formatted.GetTextSynchronously(CancellationToken.None), _contentType);
var textBuffer = _textBufferCloneService.Clone(SourceText.From(formatted.ToFullString(), Encoding.UTF8), _contentType);
Copy link
Member

@JoeRobich JoeRobich Dec 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is UTF8 always correct here and is it even necessary to specify?

Copy link
Contributor Author

@CyrusNajmabadi CyrusNajmabadi Dec 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's what we were already doing about 5 lines above. So it seems fine. These are never actually persisted to disk. They're just shown in the tools options ui


var container = textBuffer.AsTextContainer();

Expand Down
Loading