From b07497ecc4354a9cd9b672d07abd483f805bee04 Mon Sep 17 00:00:00 2001 From: Alex Gavrilov Date: Fri, 6 Sep 2024 15:47:13 -0700 Subject: [PATCH 1/4] Using default constructor per David's suggestion to avoid having two copies of default values --- .../Remote/RemoteAutoInsertOptions.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs index 9281506849c..da25b5c7feb 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs +++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs @@ -15,11 +15,7 @@ internal readonly record struct RemoteAutoInsertOptions public bool FormatOnType { get; init; } = true; [DataMember(Order = 2)] - public RazorFormattingOptions FormattingOptions { get; init; } = new RazorFormattingOptions() - { - InsertSpaces = true, - TabSize = 4 - }; + public RazorFormattingOptions FormattingOptions { get; init; } = new (); public RemoteAutoInsertOptions() { From 726f1ced35a5932b3081b682afbdbd5739f8765e Mon Sep 17 00:00:00 2001 From: Alex Gavrilov Date: Fri, 6 Sep 2024 15:52:37 -0700 Subject: [PATCH 2/4] More PR feedback --- .../Remote/RemoteAutoInsertOptions.cs | 4 ++-- .../LanguageClient/Cohost/CohostOnAutoInsertEndpoint.cs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs index da25b5c7feb..a68ba5089cf 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs +++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs @@ -21,11 +21,11 @@ public RemoteAutoInsertOptions() { } - public static RemoteAutoInsertOptions From(ClientSettings clientSettings, FormattingOptions formattingOptions) + public static RemoteAutoInsertOptions From(ClientSettings clientSettings, RazorFormattingOptions formattingOptions) => new() { EnableAutoClosingTags = clientSettings.AdvancedSettings.AutoClosingTags, FormatOnType = clientSettings.AdvancedSettings.FormatOnType, - FormattingOptions = RazorFormattingOptions.From(formattingOptions, codeBlockBraceOnNextLine: false) + FormattingOptions = formattingOptions }; } diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostOnAutoInsertEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostOnAutoInsertEndpoint.cs index db0d7db8cd0..b9b98c2bb70 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostOnAutoInsertEndpoint.cs +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostOnAutoInsertEndpoint.cs @@ -12,6 +12,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost; using Microsoft.CodeAnalysis.Razor.AutoInsert; +using Microsoft.CodeAnalysis.Razor.Formatting; using Microsoft.CodeAnalysis.Razor.Logging; using Microsoft.CodeAnalysis.Razor.Protocol.AutoInsert; using Microsoft.CodeAnalysis.Razor.Remote; @@ -93,7 +94,8 @@ private static ImmutableArray CalculateTriggerChars(IEnumerable( From b447f03e563e7ab2c54951f6e3892f0522ebba5a Mon Sep 17 00:00:00 2001 From: Alex Gavrilov Date: Sat, 7 Sep 2024 05:17:45 -0700 Subject: [PATCH 3/4] PR feedback - formatting --- .../Remote/RemoteAutoInsertOptions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs index a68ba5089cf..c72055eef19 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs +++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs @@ -15,7 +15,7 @@ internal readonly record struct RemoteAutoInsertOptions public bool FormatOnType { get; init; } = true; [DataMember(Order = 2)] - public RazorFormattingOptions FormattingOptions { get; init; } = new (); + public RazorFormattingOptions FormattingOptions { get; init; } = new(); public RemoteAutoInsertOptions() { From b98b5ed64edf9da2369f8709d37685602fdda4f8 Mon Sep 17 00:00:00 2001 From: Alex Gavrilov Date: Mon, 9 Sep 2024 12:52:46 -0700 Subject: [PATCH 4/4] Remove unneeded using --- .../Remote/RemoteAutoInsertOptions.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs index c72055eef19..75455fd0a2c 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs +++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteAutoInsertOptions.cs @@ -1,7 +1,6 @@ using System.Runtime.Serialization; using Microsoft.CodeAnalysis.Razor.Formatting; using Microsoft.CodeAnalysis.Razor.Settings; -using Microsoft.VisualStudio.LanguageServer.Protocol; namespace Microsoft.CodeAnalysis.Razor.Remote;