From 2150c994e055e426f4fcaa133a27644d62dad8a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Oct 2025 02:02:28 +0000 Subject: [PATCH 01/18] Backflow from https://github.com/dotnet/dotnet / c737522 build 287652 [[ commit created by automation ]] --- Directory.Packages.props | 2 +- .../Cohost/SemanticTokensRefreshNotifier.cs | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 2693b63e3e4..72f8feea22c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -28,7 +28,7 @@ - + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs new file mode 100644 index 00000000000..20cb0794c44 --- /dev/null +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs @@ -0,0 +1,56 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.ComponentModel.Composition; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.CodeAnalysis.ExternalAccess.Razor; +using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost; +using Microsoft.CodeAnalysis.Razor.Workspaces.Settings; +using Microsoft.VisualStudio.Razor.LanguageClient.Cohost; +using Microsoft.VisualStudio.Threading; + +namespace Microsoft.AspNetCore.Razor.LanguageServer; + +[Export(typeof(IRazorCohostStartupService))] +[method: ImportingConstructor] +internal sealed class SemanticTokensRefreshNotifier(IClientSettingsManager clientSettingsManager) : IRazorCohostStartupService, IDisposable +{ + private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager; + + private IRazorClientLanguageServerManager? _razorClientLanguageServerManager; + private bool _lastColorBackground; + + public int Order => WellKnownStartupOrder.Default; + + public Task StartupAsync(VSInternalClientCapabilities clientCapabilities, RazorCohostRequestContext requestContext, CancellationToken cancellationToken) + { + _razorClientLanguageServerManager = requestContext.GetRequiredService(); + + if (clientCapabilities.Workspace?.SemanticTokens?.RefreshSupport ?? false) + { + _lastColorBackground = _clientSettingsManager.GetClientSettings().AdvancedSettings.ColorBackground; + _clientSettingsManager.ClientSettingsChanged += ClientSettingsManager_ClientSettingsChanged; + } + + return Task.CompletedTask; + } + + private void ClientSettingsManager_ClientSettingsChanged(object sender, EventArgs e) + { + var colorBackground = _clientSettingsManager.GetClientSettings().AdvancedSettings.ColorBackground; + if (colorBackground == _lastColorBackground) + { + return; + } + + _lastColorBackground = colorBackground; + _razorClientLanguageServerManager.AssumeNotNull().SendNotificationAsync(Methods.WorkspaceSemanticTokensRefreshName, CancellationToken.None).Forget(); + } + + public void Dispose() + { + _clientSettingsManager.ClientSettingsChanged -= ClientSettingsManager_ClientSettingsChanged; + } +} From cb22add33a1fc2a4e3435608d861a6a69206d163 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Oct 2025 02:02:29 +0000 Subject: [PATCH 02/18] Update dependencies from https://github.com/dotnet/dotnet build 287652 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f760cc8a904..a2117b61b2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From 300e79862935f77ef5aee049dcb964b940238cc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Oct 2025 02:02:24 +0000 Subject: [PATCH 03/18] Update dependencies from https://github.com/dotnet/dotnet build 287710 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2117b61b2b..355c70f6ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From c6013d35e9531fd288fe1413ee00692057c79779 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Oct 2025 02:02:15 +0000 Subject: [PATCH 04/18] Update dependencies from https://github.com/dotnet/dotnet build 287756 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 355c70f6ce4..d7d278cd9bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From 0f3a896c14ffb8911c7b72f837b5dc43b87325bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Oct 2025 02:02:12 +0000 Subject: [PATCH 05/18] Update dependencies from https://github.com/dotnet/dotnet build 287866 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7d278cd9bd..11bacc1f0bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From ebdc6bef65e2bc6a64a72c6acabfbb252449f11b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Oct 2025 02:02:07 +0000 Subject: [PATCH 06/18] Update dependencies from https://github.com/dotnet/dotnet build 287966 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11bacc1f0bf..48ba4166600 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From ba750bd3dd67004a5cb18009d78800d87cbd6570 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Oct 2025 02:02:01 +0000 Subject: [PATCH 07/18] Update dependencies from https://github.com/dotnet/dotnet build 288065 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48ba4166600..cbdefd63e8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From f34067dc7428a7d705238f9794e4cc6c9e30c666 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Oct 2025 02:02:27 +0000 Subject: [PATCH 08/18] Update dependencies from https://github.com/dotnet/dotnet build 288391 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbdefd63e8b..0e2ac8e13ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From fdf7d177b321b4b4d32b3563dd861efbbaf3aa7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Oct 2025 02:02:45 +0000 Subject: [PATCH 09/18] Update dependencies from https://github.com/dotnet/dotnet build 288435 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e2ac8e13ef..c40fd4dfd27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From a082c77879f7b55e71a6335e9f46de9a8b3483c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Oct 2025 02:02:06 +0000 Subject: [PATCH 10/18] Update dependencies from https://github.com/dotnet/dotnet build 288919 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c40fd4dfd27..7a2dce6a565 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From 02f8b9e3353f8e19a96e65cf69f3e13af573e323 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Oct 2025 02:02:31 +0000 Subject: [PATCH 11/18] Update dependencies from https://github.com/dotnet/dotnet build 289051 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a2dce6a565..a219a11d626 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From 92376d2b4b4f1574be88869ece6e23a64d19e4aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Nov 2025 02:02:49 +0000 Subject: [PATCH 12/18] Update dependencies from https://github.com/dotnet/dotnet build 289152 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a219a11d626..e797d4473a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From f08e0eb32da3ee9945e895218b469f247b7aa8a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Nov 2025 02:03:17 +0000 Subject: [PATCH 13/18] Update dependencies from https://github.com/dotnet/dotnet build 289521 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e797d4473a1..1b16b2c3715 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From 2395754662a38390585f8b33fa583a00b87b21a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Nov 2025 02:03:39 +0000 Subject: [PATCH 14/18] Update dependencies from https://github.com/dotnet/dotnet build 289695 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b16b2c3715..5a305672167 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From ecf25ba6f3b15dd3171ea3d74acaee150944e32f Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Mon, 10 Nov 2025 13:54:03 +0100 Subject: [PATCH 15/18] Revert unnecessary file addition --- .../Cohost/SemanticTokensRefreshNotifier.cs | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs deleted file mode 100644 index 20cb0794c44..00000000000 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/SemanticTokensRefreshNotifier.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.ComponentModel.Composition; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.CodeAnalysis.ExternalAccess.Razor; -using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost; -using Microsoft.CodeAnalysis.Razor.Workspaces.Settings; -using Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -using Microsoft.VisualStudio.Threading; - -namespace Microsoft.AspNetCore.Razor.LanguageServer; - -[Export(typeof(IRazorCohostStartupService))] -[method: ImportingConstructor] -internal sealed class SemanticTokensRefreshNotifier(IClientSettingsManager clientSettingsManager) : IRazorCohostStartupService, IDisposable -{ - private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager; - - private IRazorClientLanguageServerManager? _razorClientLanguageServerManager; - private bool _lastColorBackground; - - public int Order => WellKnownStartupOrder.Default; - - public Task StartupAsync(VSInternalClientCapabilities clientCapabilities, RazorCohostRequestContext requestContext, CancellationToken cancellationToken) - { - _razorClientLanguageServerManager = requestContext.GetRequiredService(); - - if (clientCapabilities.Workspace?.SemanticTokens?.RefreshSupport ?? false) - { - _lastColorBackground = _clientSettingsManager.GetClientSettings().AdvancedSettings.ColorBackground; - _clientSettingsManager.ClientSettingsChanged += ClientSettingsManager_ClientSettingsChanged; - } - - return Task.CompletedTask; - } - - private void ClientSettingsManager_ClientSettingsChanged(object sender, EventArgs e) - { - var colorBackground = _clientSettingsManager.GetClientSettings().AdvancedSettings.ColorBackground; - if (colorBackground == _lastColorBackground) - { - return; - } - - _lastColorBackground = colorBackground; - _razorClientLanguageServerManager.AssumeNotNull().SendNotificationAsync(Methods.WorkspaceSemanticTokensRefreshName, CancellationToken.None).Forget(); - } - - public void Dispose() - { - _clientSettingsManager.ClientSettingsChanged -= ClientSettingsManager_ClientSettingsChanged; - } -} From 685b9e784d968e5b7d9e4fc526c56dd46f3b7b5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Nov 2025 02:03:11 +0000 Subject: [PATCH 16/18] Update dependencies from https://github.com/dotnet/dotnet build 290631 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a305672167..a2e06fc8c29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From df8bcae5da49d52839552f64764b5ef42bbfd316 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Nov 2025 02:03:00 +0000 Subject: [PATCH 17/18] Update dependencies from https://github.com/dotnet/dotnet build 290774 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2e06fc8c29..f07faa3af37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn From bf0ef0711f489a946422b620fbbbc5b1f2b5365f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Nov 2025 02:03:04 +0000 Subject: [PATCH 18/18] Update dependencies from https://github.com/dotnet/dotnet build 291265 No dependency updates to commit --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f07faa3af37..7835d1c71bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/roslyn