make switchKeyResults an explicit type

TravisEz13 · TravisEz13 · commit b8dcdfe64857 · 2018-08-06T12:57:47.000-07:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -495,15 +495,15 @@ private static void EarlyParseHelper(string[] args)
             bool noexitSeen = false;
             for (int i = 0; i < args.Length; ++i)
             {
-                var switchKeyResults = GetSwitchKey(args, ref i, null, ref noexitSeen);
+                (string SwitchKey, bool ShouldBreak) switchKeyResults = GetSwitchKey(args, ref i, null, ref noexitSeen);
                 if (switchKeyResults.ShouldBreak)
                 {
                     break;
                 }
 
                 string switchKey = switchKeyResults.SwitchKey;
 
-                if (MatchSwitch(switchKey, "settingsfile", "settings"))
+                if (MatchSwitch(switchKey, match: "settingsfile", smallestUnambiguousMatch: "settings"))
                 {
                     // parse setting file arg and don't write error as there is no host yet.
                     if (!TryParseSettingFileHelper(args, ++i, null))
@@ -668,7 +668,7 @@ private void ParseHelper(string[] args)
 
             for (int i = 0; i < args.Length; ++i)
             {
-                var switchKeyResults = GetSwitchKey(args, ref i, this, ref noexitSeen);
+                (string SwitchKey, bool ShouldBreak) switchKeyResults = GetSwitchKey(args, ref i, this, ref noexitSeen);
                 if (switchKeyResults.ShouldBreak)
                 {
                     break;

Original file line number	Diff line number	Diff line change
`@@ -495,15 +495,15 @@ private static void EarlyParseHelper(string[] args)`
`495`	`495`	`bool noexitSeen = false;`
`496`	`496`	`for (int i = 0; i < args.Length; ++i)`
`497`	`497`	`{`
`498`		`- var switchKeyResults = GetSwitchKey(args, ref i, null, ref noexitSeen);`
	`498`	`+ (string SwitchKey, bool ShouldBreak) switchKeyResults = GetSwitchKey(args, ref i, null, ref noexitSeen);`
`499`	`499`	`if (switchKeyResults.ShouldBreak)`
`500`	`500`	`{`
`501`	`501`	`break;`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`string switchKey = switchKeyResults.SwitchKey;`
`505`	`505`
`506`		`- if (MatchSwitch(switchKey, "settingsfile", "settings"))`
	`506`	`+ if (MatchSwitch(switchKey, match: "settingsfile", smallestUnambiguousMatch: "settings"))`
`507`	`507`	`{`
`508`	`508`	`// parse setting file arg and don't write error as there is no host yet.`
`509`	`509`	`if (!TryParseSettingFileHelper(args, ++i, null))`
`@@ -668,7 +668,7 @@ private void ParseHelper(string[] args)`
`668`	`668`
`669`	`669`	`for (int i = 0; i < args.Length; ++i)`
`670`	`670`	`{`
`671`		`- var switchKeyResults = GetSwitchKey(args, ref i, this, ref noexitSeen);`
	`671`	`+ (string SwitchKey, bool ShouldBreak) switchKeyResults = GetSwitchKey(args, ref i, this, ref noexitSeen);`
`672`	`672`	`if (switchKeyResults.ShouldBreak)`
`673`	`673`	`{`
`674`	`674`	`break;`