Skip to content

[release/dev18.0] Revert "Revert "Fix some issues with our options in the new experience"" #12296

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

Closed
github-actions wants to merge 2 commits into from
Closed

[release/dev18.0] Revert "Revert "Fix some issues with our options in the new experience"" #12296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
920c7d1
Fix setting name
davidwengier Oct 5, 2025
6772cc3
Tests
davidwengier Oct 5, 2025
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
2 changes: 1 addition & 1 deletion ...src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Options/SettingsNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal static class SettingsNames
public static readonly string AutoInsertAttributeQuotes = UnifiedCollection + ".autoInsertAttributeQuotes";
public static readonly string ColorBackground = UnifiedCollection + ".colorBackground";
public static readonly string CodeBlockBraceOnNextLine = UnifiedCollection + ".codeBlockBraceOnNextLine";
public static readonly string CommitElementsWithSpace = UnifiedCollection + ".commitCharactersWithSpace";
public static readonly string CommitElementsWithSpace = UnifiedCollection + ".commitElementsWithSpace";
public static readonly string Snippets = UnifiedCollection + ".snippets";
public static readonly string LogLevel = UnifiedCollection + ".logLevel";
public static readonly string FormatOnPaste = UnifiedCollection + ".formatOnPaste";
Expand Down
37 changes: 34 additions & 3 deletions src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/UnifiedSettingsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.IO;
using System.Reflection;
using System.Text.Json;
using Microsoft.VisualStudio.Razor.LanguageClient.Options;
using Xunit;

namespace Microsoft.VisualStudio.Razor.IntegrationTests;
Expand All @@ -12,10 +13,41 @@ public class UnifiedSettingsTest
{
[Fact]
public void TestJsonIsValid()
{
var document = ReadRegistrationJson();
Assert.NotNull(document);
}

[Fact]
public void RegistrationListsAllSettingNames()
{
var document = ReadRegistrationJson();
var properties = document.RootElement.GetProperty("properties");

foreach (var setting in SettingsNames.AllSettings)
{
Assert.True(properties.TryGetProperty(setting, out _), $"Could not find setting '{setting}' in razor.registration.json");
}
}

[Fact]
public void SettingNamesListsAllProperties()
{
var document = ReadRegistrationJson();
var properties = document.RootElement.GetProperty("properties");

// iterate through properties and check that each one is in SettingsNames.AllSettings
foreach (var property in properties.EnumerateObject())
{
var settingName = property.Name;
Assert.Contains(settingName, SettingsNames.AllSettings);
}
}

private static JsonDocument ReadRegistrationJson()
{
var assembly = Assembly.GetExecutingAssembly();
var resourceName = "Microsoft.VisualStudio.Razor.IntegrationTests.razor.registration.json";

using var stream = assembly.GetManifestResourceStream(resourceName);
using var reader = new StreamReader(stream);
var json = reader.ReadToEnd();
Expand All @@ -26,7 +58,6 @@ public void TestJsonIsValid()
{
CommentHandling = JsonCommentHandling.Skip
};
var document = JsonDocument.Parse(json, options);
Assert.NotNull(document);
return JsonDocument.Parse(json, options);
}
}