Skip to content

Commit 44387b3

Browse files
committed
Run dotnet format style until no changes were made
1 parent 021e24d commit 44387b3

File tree

160 files changed

+1494
-2109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+1494
-2109
lines changed

src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs

+26-30
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace Microsoft.PowerShell.EditorServices.Commands
3636
public sealed class StartEditorServicesCommand : PSCmdlet
3737
{
3838
// TODO: Remove this when we drop support for PS6.
39-
private readonly static bool s_isWindows =
39+
private static readonly bool s_isWindows =
4040
#if CoreCLR
4141
RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
4242
#else
@@ -237,15 +237,13 @@ protected override void EndProcessing()
237237
// Create the configuration from parameters
238238
EditorServicesConfig editorServicesConfig = CreateConfigObject();
239239

240-
var sessionFileWriter = new SessionFileWriter(_logger, SessionDetailsPath);
240+
SessionFileWriter sessionFileWriter = new(_logger, SessionDetailsPath);
241241
_logger.Log(PsesLogLevel.Diagnostic, "Session file writer created");
242242

243-
using (var psesLoader = EditorServicesLoader.Create(_logger, editorServicesConfig, sessionFileWriter, _loggerUnsubscribers))
244-
{
245-
_logger.Log(PsesLogLevel.Verbose, "Loading EditorServices");
246-
// Start editor services and wait here until it shuts down
247-
psesLoader.LoadAndRunEditorServicesAsync().GetAwaiter().GetResult();
248-
}
243+
using EditorServicesLoader psesLoader = EditorServicesLoader.Create(_logger, editorServicesConfig, sessionFileWriter, _loggerUnsubscribers);
244+
_logger.Log(PsesLogLevel.Verbose, "Loading EditorServices");
245+
// Start editor services and wait here until it shuts down
246+
psesLoader.LoadAndRunEditorServicesAsync().GetAwaiter().GetResult();
249247
}
250248
catch (Exception e)
251249
{
@@ -277,7 +275,7 @@ private void StartLogging()
277275
// if it's being used as a protocol transport
278276
if (!Stdio)
279277
{
280-
var hostLogger = new PSHostLogger(Host.UI);
278+
PSHostLogger hostLogger = new(Host.UI);
281279
_loggerUnsubscribers.Add(_logger.Subscribe(hostLogger));
282280
}
283281

@@ -292,7 +290,7 @@ private void StartLogging()
292290
logPath = Path.Combine(logDirPath, $"StartEditorServices-temp{randomInt.ToString("X", CultureInfo.InvariantCulture.NumberFormat)}.log");
293291
}
294292

295-
var fileLogger = StreamLogger.CreateWithNewFile(logPath);
293+
StreamLogger fileLogger = StreamLogger.CreateWithNewFile(logPath);
296294
_disposableResources.Add(fileLogger);
297295
IDisposable fileLoggerUnsubscriber = _logger.Subscribe(fileLogger);
298296
fileLogger.AddUnsubscriber(fileLoggerUnsubscriber);
@@ -316,23 +314,21 @@ private string GetLogDirPath()
316314
private void RemovePSReadLineForStartup()
317315
{
318316
_logger.Log(PsesLogLevel.Verbose, "Removing PSReadLine");
319-
using (var pwsh = SMA.PowerShell.Create(RunspaceMode.CurrentRunspace))
320-
{
321-
bool hasPSReadLine = pwsh.AddCommand(new CmdletInfo("Microsoft.PowerShell.Core\\Get-Module", typeof(GetModuleCommand)))
322-
.AddParameter("Name", "PSReadLine")
323-
.Invoke()
324-
.Any();
317+
using SMA.PowerShell pwsh = SMA.PowerShell.Create(RunspaceMode.CurrentRunspace);
318+
bool hasPSReadLine = pwsh.AddCommand(new CmdletInfo("Microsoft.PowerShell.Core\\Get-Module", typeof(GetModuleCommand)))
319+
.AddParameter("Name", "PSReadLine")
320+
.Invoke()
321+
.Any();
325322

326-
if (hasPSReadLine)
327-
{
328-
pwsh.Commands.Clear();
323+
if (hasPSReadLine)
324+
{
325+
pwsh.Commands.Clear();
329326

330-
pwsh.AddCommand(new CmdletInfo("Microsoft.PowerShell.Core\\Remove-Module", typeof(RemoveModuleCommand)))
331-
.AddParameter("Name", "PSReadLine")
332-
.AddParameter("ErrorAction", "SilentlyContinue");
327+
pwsh.AddCommand(new CmdletInfo("Microsoft.PowerShell.Core\\Remove-Module", typeof(RemoveModuleCommand)))
328+
.AddParameter("Name", "PSReadLine")
329+
.AddParameter("ErrorAction", "SilentlyContinue");
333330

334-
_logger.Log(PsesLogLevel.Verbose, "Removed PSReadLine");
335-
}
331+
_logger.Log(PsesLogLevel.Verbose, "Removed PSReadLine");
336332
}
337333
}
338334

@@ -352,14 +348,14 @@ private EditorServicesConfig CreateConfigObject()
352348
bundledModulesPath));
353349
}
354350

355-
var profile = (PSObject)GetVariableValue("profile");
351+
PSObject profile = (PSObject)GetVariableValue("profile");
356352

357-
var hostInfo = new HostInfo(HostName, HostProfileId, HostVersion);
353+
HostInfo hostInfo = new(HostName, HostProfileId, HostVersion);
358354

359-
var initialSessionState = Runspace.DefaultRunspace.InitialSessionState;
355+
InitialSessionState initialSessionState = Runspace.DefaultRunspace.InitialSessionState;
360356
initialSessionState.LanguageMode = Runspace.DefaultRunspace.SessionStateProxy.LanguageMode;
361357

362-
var editorServicesConfig = new EditorServicesConfig(
358+
EditorServicesConfig editorServicesConfig = new(
363359
hostInfo,
364360
Host,
365361
SessionDetailsPath,
@@ -425,9 +421,9 @@ private ConsoleReplKind GetReplKind()
425421
}
426422

427423
// TODO: Remove this when we drop support for PS6.
428-
var psVersionTable = (Hashtable) this.SessionState.PSVariable.GetValue("PSVersionTable");
424+
Hashtable psVersionTable = (Hashtable) SessionState.PSVariable.GetValue("PSVersionTable");
429425
dynamic version = psVersionTable["PSVersion"];
430-
var majorVersion = (int) version.Major;
426+
int majorVersion = (int) version.Major;
431427

432428
if (UseLegacyReadLine || (!s_isWindows && majorVersion == 6))
433429
{

0 commit comments

Comments
 (0)