From 8a9f1eb120f9713689291da097faf56c0de01131 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Thu, 10 Feb 2022 14:07:12 -0800
Subject: [PATCH] Use `static readonly` for default `ExecutionOptions`

But at the `SynchronousTask` level. Now we get the best of both worlds:
the records have the correct default values on initialization, and we
only heap allocate a single static instance of `ExecutionOptions` for
the default case.
---
 .../PowerShell/Execution/SynchronousDelegateTask.cs  | 12 ++++++------
 .../Execution/SynchronousPowerShellTask.cs           |  4 +++-
 .../Services/PowerShell/Execution/SynchronousTask.cs |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousDelegateTask.cs b/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousDelegateTask.cs
index 2bec67fe9..77bae18a3 100644
--- a/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousDelegateTask.cs
+++ b/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousDelegateTask.cs
@@ -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
@@ -23,7 +23,7 @@ public SynchronousDelegateTask(
             CancellationToken cancellationToken)
             : base(logger, cancellationToken)
         {
-            ExecutionOptions = executionOptions ?? new ExecutionOptions();
+            ExecutionOptions = executionOptions ?? s_defaultExecutionOptions;
             _representation = representation;
             _action = action;
         }
@@ -58,7 +58,7 @@ public SynchronousDelegateTask(
         {
             _func = func;
             _representation = representation;
-            ExecutionOptions = executionOptions ?? new ExecutionOptions();
+            ExecutionOptions = executionOptions ?? s_defaultExecutionOptions;
         }
 
         public override ExecutionOptions ExecutionOptions { get; }
@@ -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; }
@@ -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; }
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousPowerShellTask.cs b/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousPowerShellTask.cs
index c3a1132ad..f683c95a3 100644
--- a/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousPowerShellTask.cs
+++ b/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousPowerShellTask.cs
@@ -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,
@@ -36,7 +38,7 @@ public SynchronousPowerShellTask(
             _logger = logger;
             _psesHost = psesHost;
             _psCommand = command;
-            PowerShellExecutionOptions = executionOptions ?? new PowerShellExecutionOptions();
+            PowerShellExecutionOptions = executionOptions ?? s_defaultPowerShellExecutionOptions;
         }
 
         public PowerShellExecutionOptions PowerShellExecutionOptions { get; }
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs b/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs
index 6b321c284..d8efdbf4b 100644
--- a/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs
+++ b/src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs
@@ -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();