Skip to content

Use static readonly for default ExecutionOptions #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2022
Merged

Use static readonly for default ExecutionOptions #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousDelegateTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using Microsoft.Extensions.Logging;
using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
using System;
using System.Threading;
using Microsoft.Extensions.Logging;
using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
using SMA = System.Management.Automation;

namespace Microsoft.PowerShell.EditorServices.Services.PowerShell.Execution
Expand All @@ -23,7 +23,7 @@ public SynchronousDelegateTask(
CancellationToken cancellationToken)
: base(logger, cancellationToken)
{
ExecutionOptions = executionOptions ?? new ExecutionOptions();
ExecutionOptions = executionOptions ?? s_defaultExecutionOptions;
_representation = representation;
_action = action;
}
Expand Down Expand Up @@ -58,7 +58,7 @@ public SynchronousDelegateTask(
{
_func = func;
_representation = representation;
ExecutionOptions = executionOptions ?? new ExecutionOptions();
ExecutionOptions = executionOptions ?? s_defaultExecutionOptions;
}

public override ExecutionOptions ExecutionOptions { get; }
Expand Down Expand Up @@ -94,7 +94,7 @@ public SynchronousPSDelegateTask(
_psesHost = psesHost;
_action = action;
_representation = representation;
ExecutionOptions = executionOptions ?? new ExecutionOptions();
ExecutionOptions = executionOptions ?? s_defaultExecutionOptions;
}

public override ExecutionOptions ExecutionOptions { get; }
Expand Down Expand Up @@ -131,7 +131,7 @@ public SynchronousPSDelegateTask(
_psesHost = psesHost;
_func = func;
_representation = representation;
ExecutionOptions = executionOptions ?? new ExecutionOptions();
ExecutionOptions = executionOptions ?? s_defaultExecutionOptions;
}

public override ExecutionOptions ExecutionOptions { get; }
Expand Down
4 changes: 3 additions & 1 deletion src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousPowerShellTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ internal class SynchronousPowerShellTask<TResult> : SynchronousTask<IReadOnlyLis

private SMA.PowerShell _pwsh;

private readonly static PowerShellExecutionOptions s_defaultPowerShellExecutionOptions = new();

public SynchronousPowerShellTask(
ILogger logger,
PsesInternalHost psesHost,
Expand All @@ -36,7 +38,7 @@ public SynchronousPowerShellTask(
_logger = logger;
_psesHost = psesHost;
_psCommand = command;
PowerShellExecutionOptions = executionOptions ?? new PowerShellExecutionOptions();
PowerShellExecutionOptions = executionOptions ?? s_defaultPowerShellExecutionOptions;
}

public PowerShellExecutionOptions PowerShellExecutionOptions { get; }
Expand Down
3 changes: 3 additions & 0 deletions src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ public TResult Result

public abstract ExecutionOptions ExecutionOptions { get; }

[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "RCS1158", Justification = "Field is not type-dependent")]
internal static readonly ExecutionOptions s_defaultExecutionOptions = new();

public abstract TResult Run(CancellationToken cancellationToken);

public abstract override string ToString();
Expand Down