Merge pull request icsharpcode#3302 from tom-englert/dev/WpfRefactoring

Move active code from LanguageSettings to LanguageService

Author: siegfriedpammer

.editorconfig

@@ -147,3 +147,5 @@ dotnet_naming_rule.private_fields_rule.symbols = private_fields_symbols
 
 # MEF006: No importing constructor
 dotnet_diagnostic.MEF006.severity = silent
+# MEF002: Import attributes, to be removed after final DI migration
+dotnet_diagnostic.MEF002.severity = silent

ILSpy.ReadyToRun/ReadyToRunLanguage.cs

@@ -218,7 +218,7 @@ public override void DecompileMethod(IMethod method, ITextOutput output, Decompi
 
 		public override RichText GetRichTextTooltip(IEntity entity)
 		{
-			return Languages.ILLanguage.GetRichTextTooltip(entity);
+			return LanguageService.Instance.ILLanguage.GetRichTextTooltip(entity);
 		}
 
 		private ReadyToRunReaderCacheEntry GetReader(LoadedAssembly assembly, MetadataFile file)

ILSpy.Tests/Analyzers/MemberImplementsInterfaceAnalyzerTests.cs

@@ -145,7 +145,7 @@ public void VerifyReturnsOnlyInterfaceMembers()
 			var analyzer = new MemberImplementsInterfaceAnalyzer();
 
 			// Act
-			var results = analyzer.Analyze(symbol, new AnalyzerContext() { AssemblyList = new ILSpyX.AssemblyList(), Language = new CSharpLanguage() });
+			var results = analyzer.Analyze(symbol, new AnalyzerContext() { AssemblyList = new ILSpyX.AssemblyList(), Language = new CSharpLanguage([]) });
 
 			// Assert
 			Assert.That(results, Is.Not.Null);

ILSpy.Tests/Analyzers/MethodUsesAnalyzerTests.cs

@@ -30,7 +30,7 @@ public void Setup()
 			testAssembly = assemblyList.OpenAssembly(typeof(MethodUsesAnalyzerTests).Assembly.Location);
 			assemblyList.OpenAssembly(typeof(void).Assembly.Location);
 			testAssemblyTypeSystem = testAssembly.GetTypeSystemOrNull();
-			language = new CSharpLanguage();
+			language = new CSharpLanguage([]);
 			typeDefinition = testAssemblyTypeSystem.FindType(typeof(TestCases.Main.MainAssembly)).GetDefinition();
 		}
 

ILSpy.Tests/Analyzers/TypeUsedByAnalyzerTests.cs

@@ -41,7 +41,7 @@ public void Setup()
 			assemblyList = new AssemblyList();
 			testAssembly = assemblyList.OpenAssembly(typeof(MethodUsesAnalyzerTests).Assembly.Location);
 			testAssemblyTypeSystem = new DecompilerTypeSystem(testAssembly.GetMetadataFileOrNull(), testAssembly.GetAssemblyResolver());
-			language = new CSharpLanguage();
+			language = new CSharpLanguage([]);
 		}
 
 		[Test]

ILSpy/Analyzers/AnalyzerTreeNode.cs

@@ -25,7 +25,7 @@ namespace ICSharpCode.ILSpy.Analyzers
 {
 	public abstract class AnalyzerTreeNode : SharpTreeNode
 	{
-		public Language Language => SettingsService.Instance.SessionSettings.LanguageSettings.Language;
+		public Language Language => LanguageService.Instance.Language;
 
 		public override bool CanDelete()
 		{

ILSpy/AssemblyTree/AssemblyTreeModel.cs

@@ -108,7 +108,7 @@ private void Settings_PropertyChanged(object? sender, PropertyChangedEventArgs e
 			{
 				switch (e.PropertyName)
 				{
-					case nameof(LanguageSettings.Language) or nameof(LanguageSettings.LanguageVersion):
+					case nameof(LanguageSettings.LanguageId) or nameof(LanguageSettings.LanguageVersionId):
 						RefreshDecompiledView();
 						break;
 					default:
@@ -152,7 +152,7 @@ private bool HandleCommandLineArguments(CommandLineArguments args)
 		{
 			LoadAssemblies(args.AssembliesToLoad, commandLineLoadedAssemblies, focusNode: false);
 			if (args.Language != null)
-				SettingsService.Instance.SessionSettings.LanguageSettings.Language = Languages.GetLanguage(args.Language);
+				LanguageService.Instance.Language = LanguageService.Instance.GetLanguage(args.Language);
 			return true;
 		}
 
@@ -787,7 +787,7 @@ public void DecompileSelectedNodes(DecompilerTextViewState? newState = null)
 				return;
 			}
 
-			var options = SettingsService.Instance.CreateDecompilationOptions(activeTabPage);
+			var options = LanguageService.Instance.CreateDecompilationOptions(activeTabPage);
 			options.TextViewState = newState;
 			activeTabPage.ShowTextViewAsync(textView => textView.DecompileAsync(this.CurrentLanguage, this.SelectedNodes, options));
 		}
@@ -797,9 +797,9 @@ public void RefreshDecompiledView()
 			DecompileSelectedNodes(DockWorkspace.Instance.ActiveTabPage.GetState() as DecompilerTextViewState);
 		}
 
-		public Language CurrentLanguage => SettingsService.Instance.SessionSettings.LanguageSettings.Language;
+		public Language CurrentLanguage => LanguageService.Instance.Language;
 
-		public LanguageVersion CurrentLanguageVersion => SettingsService.Instance.SessionSettings.LanguageSettings.LanguageVersion;
+		public LanguageVersion? CurrentLanguageVersion => LanguageService.Instance.LanguageVersion;
 
 		public IEnumerable<ILSpyTreeNode> SelectedNodes {
 			get {

ILSpy/Commands/DecompileAllCommand.cs

@@ -20,6 +20,7 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Linq;
@@ -31,14 +32,20 @@
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.ILSpyX;
 
-using TomsToolbox.Essentials;
-
 namespace ICSharpCode.ILSpy
 {
 	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._File), Header = nameof(Resources.DEBUGDecompile), MenuCategory = nameof(Resources.Open), MenuOrder = 2.5)]
 	[PartCreationPolicy(CreationPolicy.Shared)]
 	sealed class DecompileAllCommand : SimpleCommand
 	{
+		private readonly IReadOnlyCollection<IResourceFileHandler> resourceFileHandlers;
+
+		[ImportingConstructor]
+		public DecompileAllCommand([ImportMany] IEnumerable<IResourceFileHandler> resourceFileHandlers)
+		{
+			this.resourceFileHandlers = resourceFileHandlers.ToArray();
+		}
+
 		public override bool CanExecute(object parameter)
 		{
 			return System.IO.Directory.Exists("c:\\temp\\decompiled");
@@ -60,10 +67,10 @@ public override void Execute(object parameter)
 							{
 								try
 								{
-									var options = SettingsService.Instance.CreateDecompilationOptions(DockWorkspace.Instance.ActiveTabPage);
+									var options = LanguageService.Instance.CreateDecompilationOptions(DockWorkspace.Instance.ActiveTabPage);
 									options.CancellationToken = ct;
 									options.FullDecompilation = true;
-									new CSharpLanguage().DecompileAssembly(asm, new PlainTextOutput(writer), options);
+									new CSharpLanguage(resourceFileHandlers).DecompileAssembly(asm, new PlainTextOutput(writer), options);
 								}
 								catch (Exception ex)
 								{
@@ -95,10 +102,10 @@ sealed class Decompile100TimesCommand : SimpleCommand
 		public override void Execute(object parameter)
 		{
 			const int numRuns = 100;
-			var language = SettingsService.Instance.SessionSettings.LanguageSettings.Language;
+			var language = LanguageService.Instance.Language;
 			var nodes = MainWindow.Instance.AssemblyTreeModel.SelectedNodes.ToArray();
 			DockWorkspace dockWorkspace = DockWorkspace.Instance;
-			var options = SettingsService.Instance.CreateDecompilationOptions(dockWorkspace.ActiveTabPage);
+			var options = LanguageService.Instance.CreateDecompilationOptions(dockWorkspace.ActiveTabPage);
 			dockWorkspace.RunWithCancellation(ct => Task<AvalonEditTextOutput>.Factory.StartNew(() => {
 				options.CancellationToken = ct;
 				Stopwatch w = Stopwatch.StartNew();

ILSpy/Commands/DisassembleAllCommand.cs

@@ -56,7 +56,7 @@ public override void Execute(object parameter)
 							{
 								try
 								{
-									var options = SettingsService.Instance.CreateDecompilationOptions(dockWorkspace.ActiveTabPage);
+									var options = LanguageService.Instance.CreateDecompilationOptions(dockWorkspace.ActiveTabPage);
 									options.FullDecompilation = true;
 									options.CancellationToken = ct;
 									new ILLanguage().DecompileAssembly(asm, new Decompiler.PlainTextOutput(writer), options);

ILSpy/Commands/GeneratePdbContextMenuEntry.cs

@@ -75,7 +75,7 @@ internal static void GeneratePdbForAssembly(LoadedAssembly assembly)
 			if (dlg.ShowDialog() != true)
 				return;
 			DockWorkspace dockWorkspace = DockWorkspace.Instance;
-			DecompilationOptions options = SettingsService.Instance.CreateDecompilationOptions(dockWorkspace.ActiveTabPage);
+			DecompilationOptions options = LanguageService.Instance.CreateDecompilationOptions(dockWorkspace.ActiveTabPage);
 			string fileName = dlg.FileName;
 			dockWorkspace.RunWithCancellation(ct => Task<AvalonEditTextOutput>.Factory.StartNew(() => {
 				AvalonEditTextOutput output = new AvalonEditTextOutput();