Fix: Pass current language version to all parts of the UI

siegfriedpammer · siegfriedpammer · commit 128f83d74cde · 2025-03-22T12:19:47.000+01:00
diff --git a/ILSpy/ExtensionMethods.cs b/ILSpy/ExtensionMethods.cs
@@ -76,11 +76,15 @@ public static U[] SelectArray<T, U>(this ICollection<T> collection, Func<T, U> f
 			return result;
 		}
 
-		public static ICompilation? GetTypeSystemWithCurrentOptionsOrNull(this MetadataFile file, SettingsService settingsService)
+		public static ICompilation? GetTypeSystemWithCurrentOptionsOrNull(this MetadataFile file, SettingsService settingsService, LanguageVersion languageVersion)
 		{
+			var decompilerSettings = settingsService.DecompilerSettings.Clone();
+			if (!Enum.TryParse(languageVersion.Version, out Decompiler.CSharp.LanguageVersion csharpLanguageVersion))
+				csharpLanguageVersion = Decompiler.CSharp.LanguageVersion.Latest;
+			decompilerSettings.SetLanguageVersion(csharpLanguageVersion);
 			return file
 				.GetLoadedAssembly()
-				.GetTypeSystemOrNull(DecompilerTypeSystem.GetOptions(settingsService.DecompilerSettings));
+				.GetTypeSystemOrNull(DecompilerTypeSystem.GetOptions(decompilerSettings));
 		}
 
 		#region DPI independence
diff --git a/ILSpy/Languages/CSharpLanguage.cs b/ILSpy/Languages/CSharpLanguage.cs
@@ -578,10 +578,18 @@ CSharpAmbience CreateAmbience()
 			CSharpAmbience ambience = new CSharpAmbience();
 			// Do not forget to update CSharpAmbienceTests.ILSpyMainTreeViewTypeFlags, if this ever changes.
 			ambience.ConversionFlags = ConversionFlags.ShowTypeParameterList | ConversionFlags.PlaceReturnTypeAfterParameterList;
-			if (SettingsService.DecompilerSettings.LiftNullables)
+			var decompilerSettings = SettingsService.DecompilerSettings.Clone();
+			if (!Enum.TryParse(AssemblyTreeModel.CurrentLanguageVersion?.Version, out Decompiler.CSharp.LanguageVersion languageVersion))
+				languageVersion = Decompiler.CSharp.LanguageVersion.Latest;
+			decompilerSettings.SetLanguageVersion(languageVersion);
+			if (decompilerSettings.LiftNullables)
 			{
 				ambience.ConversionFlags |= ConversionFlags.UseNullableSpecifierForValueTypes;
 			}
+			if (decompilerSettings.IntroducePrivateProtectedAccessibility)
+			{
+				ambience.ConversionFlags |= ConversionFlags.UsePrivateProtectedAccessibility;
+			}
 			return ambience;
 		}
 
@@ -781,7 +789,11 @@ public override string GetEntityName(MetadataFile module, EntityHandle handle, b
 		public override bool ShowMember(IEntity member)
 		{
 			MetadataFile assembly = member.ParentModule.MetadataFile;
-			return showAllMembers || !CSharpDecompiler.MemberIsHidden(assembly, member.MetadataToken, SettingsService.DecompilerSettings);
+			var decompilerSettings = SettingsService.DecompilerSettings.Clone();
+			if (!Enum.TryParse(AssemblyTreeModel.CurrentLanguageVersion?.Version, out Decompiler.CSharp.LanguageVersion languageVersion))
+				languageVersion = Decompiler.CSharp.LanguageVersion.Latest;
+			decompilerSettings.SetLanguageVersion(languageVersion);
+			return showAllMembers || !CSharpDecompiler.MemberIsHidden(assembly, member.MetadataToken, decompilerSettings);
 		}
 
 		public override RichText GetRichTextTooltip(IEntity entity)
@@ -790,7 +802,10 @@ public override RichText GetRichTextTooltip(IEntity entity)
 			var output = new StringWriter();
 			var decoratedWriter = new TextWriterTokenWriter(output);
 			var writer = new CSharpHighlightingTokenWriter(TokenWriter.InsertRequiredSpaces(decoratedWriter), locatable: decoratedWriter);
-			var settings = SettingsService.DecompilerSettings;
+			var settings = SettingsService.DecompilerSettings.Clone();
+			if (!Enum.TryParse(AssemblyTreeModel.CurrentLanguageVersion?.Version, out Decompiler.CSharp.LanguageVersion languageVersion))
+				languageVersion = Decompiler.CSharp.LanguageVersion.Latest;
+			settings.SetLanguageVersion(languageVersion);
 			if (!settings.LiftNullables)
 			{
 				flags &= ~ConversionFlags.UseNullableSpecifierForValueTypes;
@@ -815,6 +830,10 @@ public override RichText GetRichTextTooltip(IEntity entity)
 			{
 				flags |= ConversionFlags.SupportInitAccessors;
 			}
+			if (settings.IntroducePrivateProtectedAccessibility)
+			{
+				flags |= ConversionFlags.UsePrivateProtectedAccessibility;
+			}
 			if (entity is IMethod m && m.IsLocalFunction)
 			{
 				writer.WriteIdentifier(Identifier.Create("(local)"));
diff --git a/ILSpy/Languages/LanguageService.cs b/ILSpy/Languages/LanguageService.cs
@@ -35,10 +35,12 @@ namespace ICSharpCode.ILSpy
 	[Shared]
 	public class LanguageService : ObservableObjectBase
 	{
+		private readonly SettingsService settingsService;
 		private readonly LanguageSettings languageSettings;
 
 		public LanguageService(IEnumerable<Language> languages, SettingsService settingsService, DockWorkspace dockWorkspace)
 		{
+			this.settingsService = settingsService;
 			languageSettings = settingsService.SessionSettings.LanguageSettings;
 
 			var sortedLanguages = languages.ToList();
diff --git a/ILSpy/Metadata/CorTables/EventTableTreeNode.cs b/ILSpy/Metadata/CorTables/EventTableTreeNode.cs
@@ -94,7 +94,7 @@ struct EventDefEntry : IMemberTreeNode
 
 			IEntity IMemberTreeNode.Member {
 				get {
-					return ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);
+					return ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);
 				}
 			}
 
diff --git a/ILSpy/Metadata/CorTables/FieldTableTreeNode.cs b/ILSpy/Metadata/CorTables/FieldTableTreeNode.cs
@@ -95,7 +95,7 @@ struct FieldDefEntry : IMemberTreeNode
 
 			public string NameTooltip => $"{MetadataTokens.GetHeapOffset(fieldDef.Name):X} \"{Name}\"";
 
-			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);
+			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);
 
 			[ColumnInfo("X8", Kind = ColumnKind.HeapOffset)]
 			public int Signature => MetadataTokens.GetHeapOffset(fieldDef.Signature);
diff --git a/ILSpy/Metadata/CorTables/MethodTableTreeNode.cs b/ILSpy/Metadata/CorTables/MethodTableTreeNode.cs
@@ -131,7 +131,7 @@ public string ParamListTooltip {
 				}
 			}
 
-			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);
+			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);
 
 			public MethodDefEntry(MetadataFile metadataFile, MethodDefinitionHandle handle)
 			{
diff --git a/ILSpy/Metadata/CorTables/PropertyTableTreeNode.cs b/ILSpy/Metadata/CorTables/PropertyTableTreeNode.cs
@@ -92,7 +92,7 @@ struct PropertyDefEntry : IMemberTreeNode
 
 			public string NameTooltip => $"{MetadataTokens.GetHeapOffset(propertyDef.Name):X} \"{Name}\"";
 
-			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);
+			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);
 
 			[ColumnInfo("X8", Kind = ColumnKind.HeapOffset)]
 			public int Signature => MetadataTokens.GetHeapOffset(propertyDef.Signature);
diff --git a/ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs b/ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs
@@ -173,7 +173,7 @@ public string MethodListTooltip {
 				}
 			}
 
-			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);
+			IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);
 
 			public TypeDefEntry(MetadataFile metadataFile, TypeDefinitionHandle handle)
 			{
diff --git a/ILSpy/Search/SearchPane.xaml.cs b/ILSpy/Search/SearchPane.xaml.cs
@@ -266,6 +266,7 @@ async void StartSearch(string searchTerm)
 					searchTerm,
 					(SearchMode)searchModeComboBox.SelectedIndex,
 					assemblyTreeModel.CurrentLanguage,
+					assemblyTreeModel.CurrentLanguageVersion,
 					treeNodeFactory,
 					settingsService);
 				currentSearch = startedSearch;
@@ -295,14 +296,15 @@ sealed class RunningSearch
 			readonly SearchRequest searchRequest;
 			readonly SearchMode searchMode;
 			readonly Language language;
+			readonly LanguageVersion languageVersion;
 			readonly ApiVisibility apiVisibility;
 			readonly ITreeNodeFactory treeNodeFactory;
 			readonly SettingsService settingsService;
 
 			public IProducerConsumerCollection<SearchResult> ResultQueue { get; } = new ConcurrentQueue<SearchResult>();
 
 			public RunningSearch(IList<LoadedAssembly> assemblies, string searchTerm, SearchMode searchMode,
-				Language language, ITreeNodeFactory treeNodeFactory, SettingsService settingsService)
+				Language language, LanguageVersion languageVersion, ITreeNodeFactory treeNodeFactory, SettingsService settingsService)
 			{
 				this.assemblies = assemblies;
 				this.language = language;
@@ -471,7 +473,11 @@ Regex CreateRegex(string s)
 				request.RegEx = regex;
 				request.SearchResultFactory = new SearchResultFactory(language);
 				request.TreeNodeFactory = this.treeNodeFactory;
-				request.DecompilerSettings = settingsService.DecompilerSettings;
+				var decompilerSettings = settingsService.DecompilerSettings.Clone();
+				if (!Enum.TryParse(this.languageVersion?.Version, out Decompiler.CSharp.LanguageVersion languageVersion))
+					languageVersion = Decompiler.CSharp.LanguageVersion.Latest;
+				decompilerSettings.SetLanguageVersion(languageVersion);
+				request.DecompilerSettings = settingsService.DecompilerSettings.Clone();
 
 				return request;
 			}
diff --git a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
@@ -89,7 +89,7 @@ protected override void LoadChildren()
 			var referencedModule = resolver.Resolve(r);
 			if (referencedModule != null)
 			{
-				var module = (MetadataModule)referencedModule.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule;
+				var module = (MetadataModule)referencedModule.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule;
 				foreach (var childRef in referencedModule.AssemblyReferences)
 					this.Children.Add(new AssemblyReferenceTreeNode(module, childRef, parentAssembly));
 			}
diff --git a/ILSpy/TreeNodes/EventTreeNode.cs b/ILSpy/TreeNodes/EventTreeNode.cs
@@ -52,7 +52,7 @@ public EventTreeNode(IEvent @event)
 		private IEvent GetEventDefinition()
 		{
 			return ((MetadataModule)EventDefinition.ParentModule?.MetadataFile
-				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)
+				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)
 				?.MainModule)?.GetDefinition((EventDefinitionHandle)EventDefinition.MetadataToken) ?? EventDefinition;
 		}
 
diff --git a/ILSpy/TreeNodes/FieldTreeNode.cs b/ILSpy/TreeNodes/FieldTreeNode.cs
@@ -44,7 +44,7 @@ public FieldTreeNode(IField field)
 		private IField GetFieldDefinition()
 		{
 			return ((MetadataModule)FieldDefinition.ParentModule?.MetadataFile
-				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)
+				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)
 				?.MainModule)?.GetDefinition((FieldDefinitionHandle)FieldDefinition.MetadataToken) ?? FieldDefinition;
 		}
 
diff --git a/ILSpy/TreeNodes/MethodTreeNode.cs b/ILSpy/TreeNodes/MethodTreeNode.cs
@@ -44,7 +44,7 @@ public MethodTreeNode(IMethod method)
 		private IMethod GetMethodDefinition()
 		{
 			return ((MetadataModule)MethodDefinition.ParentModule?.MetadataFile
-				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)
+				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)
 				?.MainModule)?.GetDefinition((MethodDefinitionHandle)MethodDefinition.MetadataToken) ?? MethodDefinition;
 		}
 
diff --git a/ILSpy/TreeNodes/PropertyTreeNode.cs b/ILSpy/TreeNodes/PropertyTreeNode.cs
@@ -54,7 +54,7 @@ public PropertyTreeNode(IProperty property)
 		private IProperty GetPropertyDefinition()
 		{
 			return ((MetadataModule)PropertyDefinition.ParentModule?.MetadataFile
-				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)
+				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)
 				?.MainModule)?.GetDefinition((PropertyDefinitionHandle)PropertyDefinition.MetadataToken) ?? PropertyDefinition;
 		}
 
diff --git a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs
@@ -49,7 +49,7 @@ public ReferenceFolderTreeNode(MetadataFile module, AssemblyTreeNode parentAssem
 		protected override void LoadChildren()
 		{
 			var metadata = module.Metadata;
-			var metadataModule = (MetadataModule)module.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule;
+			var metadataModule = (MetadataModule)module.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule;
 			foreach (var r in module.AssemblyReferences.OrderBy(r => r.Name))
 				this.Children.Add(new AssemblyReferenceTreeNode(metadataModule, r, parentAssembly));
 			foreach (var r in metadata.GetModuleReferences().OrderBy(r => metadata.GetString(metadata.GetModuleReference(r).Name)))
diff --git a/ILSpy/TreeNodes/TypeTreeNode.cs b/ILSpy/TreeNodes/TypeTreeNode.cs
@@ -49,7 +49,7 @@ private ITypeDefinition GetTypeDefinition()
 		{
 			return ((MetadataModule)ParentAssemblyNode.LoadedAssembly
 				.GetMetadataFileOrNull()
-				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)
+				?.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)
 				?.MainModule)?.GetDefinition((SRM.TypeDefinitionHandle)TypeDefinition.MetadataToken);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,15 @@ public static U[] SelectArray<T, U>(this ICollection<T> collection, Func<T, U> f`
`76`	`76`	`return result;`
`77`	`77`	`}`
`78`	`78`
`79`		`- public static ICompilation? GetTypeSystemWithCurrentOptionsOrNull(this MetadataFile file, SettingsService settingsService)`
	`79`	`+ public static ICompilation? GetTypeSystemWithCurrentOptionsOrNull(this MetadataFile file, SettingsService settingsService, LanguageVersion languageVersion)`
`80`	`80`	`{`
	`81`	`+ var decompilerSettings = settingsService.DecompilerSettings.Clone();`
	`82`	`+ if (!Enum.TryParse(languageVersion.Version, out Decompiler.CSharp.LanguageVersion csharpLanguageVersion))`
	`83`	`+ csharpLanguageVersion = Decompiler.CSharp.LanguageVersion.Latest;`
	`84`	`+ decompilerSettings.SetLanguageVersion(csharpLanguageVersion);`
`81`	`85`	`return file`
`82`	`86`	`.GetLoadedAssembly()`
`83`		`- .GetTypeSystemOrNull(DecompilerTypeSystem.GetOptions(settingsService.DecompilerSettings));`
	`87`	`+ .GetTypeSystemOrNull(DecompilerTypeSystem.GetOptions(decompilerSettings));`
`84`	`88`	`}`
`85`	`89`
`86`	`90`	`#region DPI independence`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,12 @@ namespace ICSharpCode.ILSpy`
`35`	`35`	`[Shared]`
`36`	`36`	`public class LanguageService : ObservableObjectBase`
`37`	`37`	`{`
	`38`	`+ private readonly SettingsService settingsService;`
`38`	`39`	`private readonly LanguageSettings languageSettings;`
`39`	`40`
`40`	`41`	`public LanguageService(IEnumerable<Language> languages, SettingsService settingsService, DockWorkspace dockWorkspace)`
`41`	`42`	`{`
	`43`	`+ this.settingsService = settingsService;`
`42`	`44`	`languageSettings = settingsService.SessionSettings.LanguageSettings;`
`43`	`45`
`44`	`46`	`var sortedLanguages = languages.ToList();`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ struct EventDefEntry : IMemberTreeNode`
`94`	`94`
`95`	`95`	`IEntity IMemberTreeNode.Member {`
`96`	`96`	`get {`
`97`		`- return ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);`
	`97`	`+ return ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public string ParamListTooltip {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);`
	`134`	`+ IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);`
`135`	`135`
`136`	`136`	`public MethodDefEntry(MetadataFile metadataFile, MethodDefinitionHandle handle)`
`137`	`137`	`{`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public string MethodListTooltip {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`- IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule)?.GetDefinition(handle);`
	`176`	`+ IEntity IMemberTreeNode.Member => ((MetadataModule)metadataFile.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule)?.GetDefinition(handle);`
`177`	`177`
`178`	`178`	`public TypeDefEntry(MetadataFile metadataFile, TypeDefinitionHandle handle)`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected override void LoadChildren()`
`89`	`89`	`var referencedModule = resolver.Resolve(r);`
`90`	`90`	`if (referencedModule != null)`
`91`	`91`	`{`
`92`		`- var module = (MetadataModule)referencedModule.GetTypeSystemWithCurrentOptionsOrNull(SettingsService)?.MainModule;`
	`92`	`+ var module = (MetadataModule)referencedModule.GetTypeSystemWithCurrentOptionsOrNull(SettingsService, AssemblyTreeModel.CurrentLanguageVersion)?.MainModule;`
`93`	`93`	`foreach (var childRef in referencedModule.AssemblyReferences)`
`94`	`94`	`this.Children.Add(new AssemblyReferenceTreeNode(module, childRef, parentAssembly));`
`95`	`95`	`}`