mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Jon Sequeira 2017-03-08 16:02:24 -08:00
parent 30480fa189
commit fd6f7e48b5
5 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/dotnet/ParseResultExtensions.cs
View file

@ -2,13 +2,23 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Linq;
using Microsoft.DotNet.Cli.CommandLine;
namespace Microsoft.DotNet.Cli
{
public static class ParserExtensions
{
public static ParseResult ParseFrom(
this CommandLine.Parser parser,
string context,
string[] args) =>
parser.Parse(context.Split(' ').Concat(args).ToArray());
}
public static class ParseResultExtensions
{
public static void ShowHelp(this ParseResult parseResult) =>
public static void ShowHelp(this ParseResult parseResult) =>
Console.WriteLine(parseResult.Command().HelpView());
}
}

4
src/dotnet/commands/dotnet-complete/CompleteCommand.cs
View file

@ -19,10 +19,10 @@ namespace Microsoft.DotNet.Cli
DebugHelper.HandleDebugSwitch(ref args);
// get the parser for the current subcommand
var parser = Parser.Instance["dotnet"]["complete"];
var parser = Parser.Instance;
// parse the arguments
var result = parser.Parse(args);
var result = parser.ParseFrom("dotnet complete", args);
var complete = result["complete"];

8
src/dotnet/commands/dotnet-complete/CompleteCommandParser.cs
View file

@ -12,10 +12,10 @@ namespace Microsoft.DotNet.Cli
Create.Command(
"complete", "",
Accept.ExactlyOneArgument
.With(name: "path")
.MaterializeAs(o => int.Parse(o.Arguments.Single())),
.With(name: "path"),
Create.Option("--position", "",
Accept.ExactlyOneArgument
.With(name: "command")));
Accept.ExactlyOneArgument
.With(name: "command")
.MaterializeAs(o => int.Parse(o.Arguments.Single()))));
}
}

5
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Tools.MSBuild;
@ -22,9 +23,9 @@ namespace Microsoft.DotNet.Tools.Restore
{
DebugHelper.HandleDebugSwitch(ref args);
var parser = Parser.Instance["dotnet"];
var parser = Parser.Instance;
var result = parser.Parse(args);
var result = parser.ParseFrom("dotnet restore", args);
Reporter.Verbose.WriteLine(result.Diagram());

8
test/dotnet.Tests/ParserTests/RestoreParserTests.cs
View file

@ -22,9 +22,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
[Fact]
public void RestoreCapturesArgumentsToForwardToMSBuildWhenTargetIsSpecified()
{
var parser = Parser.Instance["dotnet"];
var parser = Parser.Instance["dotnet"]["restore"];
var result = parser.Parse(@"restore .\some.csproj --packages c:\.nuget\packages /p:SkipInvalidConfigurations=true");
var result = parser.Parse(@".\some.csproj --packages c:\.nuget\packages /p:SkipInvalidConfigurations=true");
output.WriteLine(result.Diagram());
@ -37,9 +37,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
[Fact]
public void RestoreCapturesArgumentsToForwardToMSBuildWhenTargetIsNotSpecified()
{
var parser = Parser.Instance["dotnet"];
var parser = Parser.Instance["dotnet"]["restore"];
var result = parser.Parse(@"restore --packages c:\.nuget\packages /p:SkipInvalidConfigurations=true");
var result = parser.Parse(@"--packages c:\.nuget\packages /p:SkipInvalidConfigurations=true");
output.WriteLine(result.Diagram());