Merge main (#79107)

333fred · web-flow · commit 175575982daf · 2025-06-23T12:22:09.000-07:00
Merge main into main-vs-deps.
diff --git a/src/LanguageServer/Protocol/Handler/SemanticTokens/SemanticTokensSchema.cs b/src/LanguageServer/Protocol/Handler/SemanticTokens/SemanticTokensSchema.cs
@@ -78,7 +78,7 @@ internal readonly struct SemanticTokensSchema
     /// <summary>
     /// Mapping from additive classification type names to LSP token modifiers.
     /// </summary>
-    public static ImmutableDictionary<string, TokenModifiers> AdditiveClassificationTypeToTokenModifier => new Dictionary<string, TokenModifiers>()
+    public static readonly ImmutableDictionary<string, TokenModifiers> AdditiveClassificationTypeToTokenModifier = new Dictionary<string, TokenModifiers>()
     {
         [ClassificationTypeNames.StaticSymbol] = SemanticTokens.TokenModifiers.Static,
         [ClassificationTypeNames.ReassignedVariable] = SemanticTokens.TokenModifiers.ReassignedVariable,

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ internal readonly struct SemanticTokensSchema`
`78`	`78`	`/// <summary>`
`79`	`79`	`/// Mapping from additive classification type names to LSP token modifiers.`
`80`	`80`	`/// </summary>`
`81`		`- public static ImmutableDictionary<string, TokenModifiers> AdditiveClassificationTypeToTokenModifier => new Dictionary<string, TokenModifiers>()`
	`81`	`+ public static readonly ImmutableDictionary<string, TokenModifiers> AdditiveClassificationTypeToTokenModifier = new Dictionary<string, TokenModifiers>()`
`82`	`82`	`{`
`83`	`83`	`[ClassificationTypeNames.StaticSymbol] = SemanticTokens.TokenModifiers.Static,`
`84`	`84`	`[ClassificationTypeNames.ReassignedVariable] = SemanticTokens.TokenModifiers.ReassignedVariable,`