Skip to content

Commit 6bfb62d

Browse files
KathleenDollardKathleenDollard
committed
Renamed PipelineContext
1 parent cfb184a commit 6bfb62d

File tree

12 files changed

+26
-26
lines changed

12 files changed

+26
-26
lines changed

‎src/System.CommandLine.Subsystems.Tests/AlternateSubsystems.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal class AlternateSubsystems
1010
{
1111
internal class AlternateVersion : VersionSubsystem
1212
{
13-
protected override CliExit Execute(PipelineContext pipelineContext)
13+
protected override CliExit Execute(PipelineResult pipelineContext)
1414
{
1515
pipelineContext.ConsoleHack.WriteLine($"***{CliExecutable.ExecutableVersion}***");
1616
pipelineContext.AlreadyHandled = true;
@@ -29,7 +29,7 @@ public VersionThatUsesHelpData(CliSymbol symbol)
2929

3030
private CliSymbol Symbol { get; }
3131

32-
protected override CliExit Execute(PipelineContext pipelineContext)
32+
protected override CliExit Execute(PipelineResult pipelineContext)
3333
{
3434
TryGetAnnotation(Symbol, HelpAnnotations.Description, out string? description);
3535
pipelineContext.ConsoleHack.WriteLine(description);
@@ -51,7 +51,7 @@ protected override CliConfiguration Initialize(InitializationContext context)
5151
return base.Initialize(context);
5252
}
5353

54-
protected override CliExit Execute(PipelineContext pipelineContext)
54+
protected override CliExit Execute(PipelineResult pipelineContext)
5555
{
5656
ExecutionWasRun = true;
5757
return base.Execute(pipelineContext);

‎src/System.CommandLine.Subsystems.Tests/VersionSubsystemTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void Outputs_assembly_version()
5252
{
5353
var consoleHack = new ConsoleHack().RedirectToBuffer(true);
5454
var versionSubsystem = new VersionSubsystem();
55-
Subsystem.Execute(versionSubsystem, new PipelineContext(null, "", null, consoleHack));
55+
Subsystem.Execute(versionSubsystem, new PipelineResult(null, "", null, consoleHack));
5656
consoleHack.GetBuffer().Trim().Should().Be(Constants.version);
5757
}
5858

@@ -64,7 +64,7 @@ public void Outputs_specified_version()
6464
{
6565
SpecificVersion = "42"
6666
};
67-
Subsystem.Execute(versionSubsystem, new PipelineContext(null, "", null, consoleHack));
67+
Subsystem.Execute(versionSubsystem, new PipelineResult(null, "", null, consoleHack));
6868
consoleHack.GetBuffer().Trim().Should().Be("42");
6969
}
7070

@@ -76,7 +76,7 @@ public void Outputs_assembly_version_when_specified_version_set_to_null()
7676
{
7777
SpecificVersion = null
7878
};
79-
Subsystem.Execute(versionSubsystem, new PipelineContext(null, "", null, consoleHack));
79+
Subsystem.Execute(versionSubsystem, new PipelineResult(null, "", null, consoleHack));
8080
consoleHack.GetBuffer().Trim().Should().Be(Constants.version);
8181
}
8282

@@ -88,7 +88,7 @@ public void Console_output_can_be_tested()
8888

8989
var consoleHack = new ConsoleHack().RedirectToBuffer(true);
9090
var versionSubsystem = new VersionSubsystem();
91-
Subsystem.Execute(versionSubsystem, new PipelineContext(null, "", null, consoleHack));
91+
Subsystem.Execute(versionSubsystem, new PipelineResult(null, "", null, consoleHack));
9292
consoleHack.GetBuffer().Trim().Should().Be(Constants.version);
9393
}
9494

‎src/System.CommandLine.Subsystems/CliExit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace System.CommandLine;
88
// TODO: Consider what info is needed after invocation. If it's the whole pipeline context, consider collapsing this with that class.
99
public class CliExit
1010
{
11-
internal CliExit(PipelineContext pipelineContext)
11+
internal CliExit(PipelineResult pipelineContext)
1212
: this(pipelineContext.ParseResult, pipelineContext.AlreadyHandled, pipelineContext.ExitCode)
1313
{ }
1414

‎src/System.CommandLine.Subsystems/CompletionSubsystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected internal override bool GetIsActivated(ParseResult? parseResult)
1818
? false
1919
: false;
2020

21-
protected internal override CliExit Execute(PipelineContext pipelineContext)
21+
protected internal override CliExit Execute(PipelineResult pipelineContext)
2222
{
2323
pipelineContext.ConsoleHack.WriteLine("Not yet implemented");
2424
return CliExit.SuccessfullyHandled(pipelineContext.ParseResult);

‎src/System.CommandLine.Subsystems/Directives/DiagramSubsystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class DiagramSubsystem( IAnnotationProvider? annotationProvider = null)
1313
//protected internal override bool GetIsActivated(ParseResult? parseResult)
1414
// => parseResult is not null && option is not null && parseResult.GetValue(option);
1515

16-
protected internal override CliExit Execute(PipelineContext pipelineContext)
16+
protected internal override CliExit Execute(PipelineResult pipelineContext)
1717
{
1818
// Gather locations
1919
//var locations = pipelineContext.ParseResult.LocationMap

‎src/System.CommandLine.Subsystems/HelpSubsystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected internal override CliConfiguration Initialize(InitializationContext co
3434
protected internal override bool GetIsActivated(ParseResult? parseResult)
3535
=> parseResult is not null && parseResult.GetValue(HelpOption);
3636

37-
protected internal override CliExit Execute(PipelineContext pipelineContext)
37+
protected internal override CliExit Execute(PipelineResult pipelineContext)
3838
{
3939
// TODO: Match testable output pattern
4040
pipelineContext.ConsoleHack.WriteLine("Help me!");

‎src/System.CommandLine.Subsystems/Pipeline.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public CliExit Execute(CliConfiguration configuration, string[] args, string raw
6262

6363
public CliExit Execute(ParseResult parseResult, string rawInput, ConsoleHack? consoleHack = null)
6464
{
65-
var pipelineContext = new PipelineContext(parseResult, rawInput, this, consoleHack ?? new ConsoleHack());
65+
var pipelineContext = new PipelineResult(parseResult, rawInput, this, consoleHack ?? new ConsoleHack());
6666
ExecuteSubsystems(pipelineContext);
6767
return new CliExit(pipelineContext);
6868
}
@@ -109,7 +109,7 @@ protected virtual CliExit TearDownSubsystems(CliExit cliExit)
109109
return cliExit;
110110
}
111111

112-
protected virtual void ExecuteSubsystems(PipelineContext pipelineContext)
112+
protected virtual void ExecuteSubsystems(PipelineResult pipelineContext)
113113
{
114114
// TODO: Consider redesign where pipelineContext is not modifiable.
115115
//
@@ -122,7 +122,7 @@ protected virtual void ExecuteSubsystems(PipelineContext pipelineContext)
122122
}
123123
}
124124

125-
protected static void ExecuteIfNeeded(CliSubsystem? subsystem, PipelineContext pipelineContext)
125+
protected static void ExecuteIfNeeded(CliSubsystem? subsystem, PipelineResult pipelineContext)
126126
{
127127
if (subsystem is not null && (!pipelineContext.AlreadyHandled || subsystem.RunsEvenIfAlreadyHandled))
128128
{

‎src/System.CommandLine.Subsystems/Subsystems/CliSubsystem.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ protected internal bool TryGetAnnotation<TValue>(CliSymbol symbol, AnnotationId<
6767
/// </summary>
6868
/// <param name="pipelineContext">The context contains data like the ParseResult, and allows setting of values like whether execution was handled and the CLI should terminate </param>
6969
/// <returns>A CliExit object with information such as whether the CLI should terminate</returns>
70-
protected internal virtual CliExit Execute(PipelineContext pipelineContext)
70+
protected internal virtual CliExit Execute(PipelineResult pipelineContext)
7171
=> CliExit.NotRun(pipelineContext.ParseResult);
7272

73-
internal PipelineContext ExecuteIfNeeded(PipelineContext pipelineContext)
73+
internal PipelineResult ExecuteIfNeeded(PipelineResult pipelineContext)
7474
=> ExecuteIfNeeded(pipelineContext.ParseResult, pipelineContext);
7575

76-
internal PipelineContext ExecuteIfNeeded(ParseResult? parseResult, PipelineContext pipelineContext)
76+
internal PipelineResult ExecuteIfNeeded(ParseResult? parseResult, PipelineResult pipelineContext)
7777
{
7878
if (GetIsActivated(parseResult))
7979
{

‎src/System.CommandLine.Subsystems/Subsystems/PipelineContext.cs renamed to ‎src/System.CommandLine.Subsystems/Subsystems/PipelineResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace System.CommandLine.Subsystems;
55

6-
public class PipelineContext(ParseResult? parseResult, string rawInput, Pipeline? pipeline, ConsoleHack? consoleHack = null)
6+
public class PipelineResult(ParseResult? parseResult, string rawInput, Pipeline? pipeline, ConsoleHack? consoleHack = null)
77
{
88
public ParseResult? ParseResult { get; } = parseResult;
99
public string RawInput { get; } = rawInput;

‎src/System.CommandLine.Subsystems/Subsystems/Subsystem.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ public class Subsystem
88
public static void Initialize(CliSubsystem subsystem, CliConfiguration configuration, IReadOnlyList<string> args)
99
=> subsystem.Initialize(new InitializationContext(configuration, args));
1010

11-
public static CliExit Execute(CliSubsystem subsystem, PipelineContext pipelineContext)
11+
public static CliExit Execute(CliSubsystem subsystem, PipelineResult pipelineContext)
1212
=> subsystem.Execute(pipelineContext);
1313

1414
public static bool GetIsActivated(CliSubsystem subsystem, ParseResult parseResult)
1515
=> subsystem.GetIsActivated(parseResult);
1616

1717
public static CliExit ExecuteIfNeeded(CliSubsystem subsystem, ParseResult parseResult, string rawInput, ConsoleHack? consoleHack = null)
18-
=> new(subsystem.ExecuteIfNeeded(new PipelineContext(parseResult, rawInput, null, consoleHack)));
18+
=> new(subsystem.ExecuteIfNeeded(new PipelineResult(parseResult, rawInput, null, consoleHack)));
1919

2020
public static CliExit Execute(CliSubsystem subsystem, ParseResult parseResult, string rawInput, ConsoleHack? consoleHack = null)
21-
=> subsystem.Execute(new PipelineContext(parseResult, rawInput, null, consoleHack));
21+
=> subsystem.Execute(new PipelineResult(parseResult, rawInput, null, consoleHack));
2222

2323

24-
internal static PipelineContext ExecuteIfNeeded(CliSubsystem subsystem, ParseResult parseResult, string rawInput, ConsoleHack? consoleHack, PipelineContext? pipelineContext = null)
25-
=> subsystem.ExecuteIfNeeded(pipelineContext ?? new PipelineContext(parseResult, rawInput, null, consoleHack));
24+
internal static PipelineResult ExecuteIfNeeded(CliSubsystem subsystem, ParseResult parseResult, string rawInput, ConsoleHack? consoleHack, PipelineResult? pipelineContext = null)
25+
=> subsystem.ExecuteIfNeeded(pipelineContext ?? new PipelineResult(parseResult, rawInput, null, consoleHack));
2626

27-
internal static PipelineContext ExecuteIfNeeded(CliSubsystem subsystem, PipelineContext pipelineContext)
27+
internal static PipelineResult ExecuteIfNeeded(CliSubsystem subsystem, PipelineResult pipelineContext)
2828
=> subsystem.ExecuteIfNeeded(pipelineContext);
2929
}

0 commit comments

Comments
 (0)