Fix #1081: Please add a default ctor for DecompilationOptions

ILSpy/Commands/DecompileAllCommand.cs

@@ -43,7 +43,7 @@ namespace ICSharpCode.ILSpy
 						Exception exception = null;
 						using (var writer = new System.IO.StreamWriter("c:\\temp\\decompiled\\" + asm.ShortName + ".cs")) {
 							try {
-								new CSharpLanguage().DecompileAssembly(asm, new Decompiler.PlainTextOutput(writer), new DecompilationOptions(MainWindow.Instance.CurrentLanguageVersion, Options.DecompilerSettingsPanel.CurrentDecompilerSettings) { FullDecompilation = true, CancellationToken = ct });
+								new CSharpLanguage().DecompileAssembly(asm, new Decompiler.PlainTextOutput(writer), new DecompilationOptions() { FullDecompilation = true, CancellationToken = ct });
 							}
 							catch (Exception ex) {
 								writer.WriteLine(ex.ToString());

ILSpy/DebugSteps.xaml.cs

@@ -127,7 +127,7 @@ namespace ICSharpCode.ILSpy
 			var window = MainWindow.Instance;
 			var state = window.TextView.GetState();
 			window.TextView.DecompileAsync(window.CurrentLanguage, window.SelectedNodes,
-				new DecompilationOptions(window.CurrentLanguageVersion, ILSpy.Options.DecompilerSettingsPanel.CurrentDecompilerSettings) {
+				new DecompilationOptions(window.CurrentLanguageVersion) {
 					StepLimit = step,
 					IsDebug = isDebug,
 					TextViewState = state

ILSpy/DecompilationOptions.cs

@@ -67,6 +67,16 @@ namespace ICSharpCode.ILSpy
 		internal int StepLimit = int.MaxValue;
 		internal bool IsDebug = false;
 
+		public DecompilationOptions()
+			: this(MainWindow.Instance.CurrentLanguageVersion, DecompilerSettingsPanel.CurrentDecompilerSettings)
+		{
+		}
+
+		public DecompilationOptions(LanguageVersion version)
+			: this(version, DecompilerSettingsPanel.CurrentDecompilerSettings)
+		{
+		}
+
 		public DecompilationOptions(LanguageVersion version, Options.DecompilerSettings settings)
 		{
 			if (!Enum.TryParse(version.Version, out Decompiler.CSharp.LanguageVersion languageVersion))

ILSpy/Languages/CSharpLanguage.cs

@@ -496,16 +496,14 @@ namespace ICSharpCode.ILSpy
 			return TypeToString(ConvertTypeOptions.DoNotUsePrimitiveTypeNames | ConvertTypeOptions.IncludeTypeParameterDefinitions, type);
 		}
 
-		DecompilerSettings CurrentSettings => new DecompilationOptions(MainWindow.Instance.CurrentLanguageVersion, Options.DecompilerSettingsPanel.CurrentDecompilerSettings).DecompilerSettings;
-
 		public override bool ShowMember(MemberReference member)
 		{
-			return showAllMembers || !CSharpDecompiler.MemberIsHidden(member, CurrentSettings);
+			return showAllMembers || !CSharpDecompiler.MemberIsHidden(member, new DecompilationOptions().DecompilerSettings);
 		}
 
 		public override MemberReference GetOriginalCodeLocation(MemberReference member)
 		{
-			if (showAllMembers || !CurrentSettings.AnonymousMethods)
+			if (showAllMembers || !new DecompilationOptions().DecompilerSettings.AnonymousMethods)
 				return member;
 			else
 				return TreeNodes.Analyzer.Helpers.GetOriginalCodeLocation(member);

ILSpy/MainWindow.xaml.cs

@@ -762,7 +762,7 @@ namespace ICSharpCode.ILSpy
 				if (node != null && node.View(decompilerTextView))
 					return;
 			}
-			decompilationTask = decompilerTextView.DecompileAsync(this.CurrentLanguage, this.SelectedNodes, new DecompilationOptions(CurrentLanguageVersion, Options.DecompilerSettingsPanel.CurrentDecompilerSettings) { TextViewState = state });
+			decompilationTask = decompilerTextView.DecompileAsync(this.CurrentLanguage, this.SelectedNodes, new DecompilationOptions() { TextViewState = state });
 		}
 		
 		void SaveCommandExecuted(object sender, ExecutedRoutedEventArgs e)
@@ -773,7 +773,7 @@ namespace ICSharpCode.ILSpy
 			}
 			this.TextView.SaveToDisk(this.CurrentLanguage,
 				this.SelectedNodes,
-				new DecompilationOptions(CurrentLanguageVersion, Options.DecompilerSettingsPanel.CurrentDecompilerSettings) { FullDecompilation = true });
+				new DecompilationOptions() { FullDecompilation = true });
 		}
 		
 		public void RefreshDecompiledView()

ILSpy/TreeNodes/AssemblyTreeNode.cs

@@ -291,7 +291,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			dlg.FileName = DecompilerTextView.CleanUpName(assembly.ShortName) + language.ProjectFileExtension;
 			dlg.Filter = language.Name + " project|*" + language.ProjectFileExtension + "|" + language.Name + " single file|*" + language.FileExtension + "|All files|*.*";
 			if (dlg.ShowDialog() == true) {
-				DecompilationOptions options = new DecompilationOptions(MainWindow.Instance.CurrentLanguageVersion, Options.DecompilerSettingsPanel.CurrentDecompilerSettings);
+				DecompilationOptions options = new DecompilationOptions();
 				options.FullDecompilation = true;
 				if (dlg.FilterIndex == 1) {
 					options.SaveAsProjectDirectory = Path.GetDirectoryName(dlg.FileName);