Set UnrecognizedArgumentHandling to CollectAndContinue

icsharpcode · May 13, 2024 · 8ad24cd · 8ad24cd
1 parent 84b78b3
commit 8ad24cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/ILSpy.Tests/CommandLineArgumentsTests.cs b/ILSpy.Tests/CommandLineArgumentsTests.cs
@@ -53,12 +53,11 @@ public void VerifyNavigateToOption_NoneTest_Matching_VSAddin()
 		}
 
 		[Test]
-		public void VerifyCaseSensitivityOfOptionsThrows()
+		public void VerifyCaseSensitivityOfOptionsDoesntThrow()
 		{
-			Action act = () => new CommandLineArguments(new string[] { "--navigateTo:none" });
+			var cmdLineArgs = new CommandLineArguments(new string[] { "--navigateTo:none" });
 
-			act.Should().Throw<McMaster.Extensions.CommandLineUtils.UnrecognizedCommandParsingException>()
-				.WithMessage("Unrecognized option '--navigateTo:none'");
+			cmdLineArgs.ArgumentsParser.RemainingArguments.Should().HaveCount(1);
 		}
 
 		[Test]

diff --git a/ILSpy/App.xaml.cs b/ILSpy/App.xaml.cs
@@ -92,6 +92,12 @@ public App()
 			{
 				MessageBox.Show(App.CommandLineArguments.ArgumentsParser.GetHelpText(), "ILSpy Command Line Arguments");
 			}
+
+			if (App.CommandLineArguments.ArgumentsParser.RemainingArguments.Any())
+			{
+				string unknownArguments = string.Join(", ", App.CommandLineArguments.ArgumentsParser.RemainingArguments);
+				MessageBox.Show(unknownArguments, "ILSpy Unknown Command Line Arguments Passed");
+			}
 		}
 
 		static Assembly ResolvePluginDependencies(AssemblyLoadContext context, AssemblyName assemblyName)

diff --git a/ILSpy/CommandLineArguments.cs b/ILSpy/CommandLineArguments.cs
@@ -43,7 +43,7 @@ public CommandLineArguments(IEnumerable<string> arguments)
 				ResponseFileHandling = ResponseFileHandling.ParseArgsAsLineSeparated,
 
 				// Note: options are case-sensitive (!), and, default behavior would be UnrecognizedArgumentHandling.Throw on Parse()
-				// UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.CollectAndContinue
+				UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.CollectAndContinue
 			};
 
 			app.HelpOption();

diff --git a/ILSpy/Properties/launchSettings.json b/ILSpy/Properties/launchSettings.json
@@ -2,12 +2,12 @@
 	"profiles": {
 		"ILSpy": {
 			"commandName": "Executable",
-			"executablePath": ".\\ILSpy.exe",
+			"executablePath": "./ilspy.exe",
 			"commandLineArgs": "--newinstance"
 		},
 		"ILSpy single-instance": {
 			"commandName": "Executable",
-			"executablePath": ".\\ILSpy.exe"
+			"executablePath": "./ilspy.exe"
 		}
 	}
 }