Skip to content

Commit 99b3199

Browse files
author
Dave Wyatt
committed
Minor code style changes
Didn't like some of the places ReSharper switched to using "var" statements, because it wasn't 100% clear from the context what the type would be.
1 parent 4d05673 commit 99b3199

3 files changed

Lines changed: 17 additions & 13 deletions

File tree

Commands/Cmdlets.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public string Path
2222
{
2323
get { return _path; }
2424

25-
set {
25+
set
26+
{
2627
_path = System.IO.Path.IsPathRooted(value) ? value : System.IO.Path.Combine(SessionState.Path.CurrentLocation.Path, value);
2728
}
2829
}
@@ -86,7 +87,8 @@ public class GetLogFileCommand : PSCmdlet
8687
public string Path
8788
{
8889
get { return _path; }
89-
set {
90+
set
91+
{
9092
_path = System.IO.Path.IsPathRooted(value) ? value : System.IO.Path.Combine(SessionState.Path.CurrentLocation.Path, value);
9193
}
9294
}

HostIOInterceptor.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public override void WriteDebugLine(string message)
324324
{
325325
if (!_paused)
326326
{
327-
var lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
327+
string[] lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
328328
var deadReferences = new List<WeakReference>();
329329

330330
foreach (WeakReference reference in _subscribers)
@@ -359,7 +359,7 @@ public override void WriteErrorLine(string message)
359359
{
360360
if (!_paused)
361361
{
362-
var lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
362+
string[] lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
363363
var deadReferences = new List<WeakReference>();
364364

365365
foreach (WeakReference reference in _subscribers)
@@ -394,7 +394,7 @@ public override void WriteLine()
394394
{
395395
if (!_paused)
396396
{
397-
var lines = _writeCache.ToString().Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
397+
string[] lines = _writeCache.ToString().Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
398398
var deadReferences = new List<WeakReference>();
399399

400400
foreach (WeakReference reference in _subscribers)
@@ -430,7 +430,7 @@ public override void WriteLine(string value)
430430
{
431431
if (!_paused)
432432
{
433-
var lines = (_writeCache + value).Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
433+
string[] lines = (_writeCache + value).Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
434434
var deadReferences = new List<WeakReference>();
435435

436436
foreach (WeakReference reference in _subscribers)
@@ -454,7 +454,7 @@ public override void WriteLine(string value)
454454
_subscribers.Remove(reference);
455455
}
456456
}
457-
457+
458458
_writeCache.Length = 0;
459459
_psInterface.WriteLine(value);
460460
}
@@ -466,12 +466,12 @@ public override void WriteLine(ConsoleColor foregroundColor, ConsoleColor backgr
466466
{
467467
if (!_paused)
468468
{
469-
var lines = (_writeCache + value).Split(new[] {"\r\n", "\n"}, StringSplitOptions.None);
469+
string[] lines = (_writeCache + value).Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
470470
var deadReferences = new List<WeakReference>();
471471

472472
foreach (WeakReference reference in _subscribers)
473473
{
474-
var subscriber = (IHostIoSubscriber) reference.Target;
474+
var subscriber = (IHostIoSubscriber)reference.Target;
475475
if (subscriber == null)
476476
{
477477
deadReferences.Add(reference);
@@ -533,7 +533,7 @@ public override void WriteVerboseLine(string message)
533533
{
534534
if (!_paused)
535535
{
536-
var lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
536+
string[] lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
537537
var deadReferences = new List<WeakReference>();
538538

539539
foreach (WeakReference reference in _subscribers)
@@ -568,7 +568,7 @@ public override void WriteWarningLine(string message)
568568
{
569569
if (!_paused)
570570
{
571-
var lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
571+
string[] lines = message.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
572572
var deadReferences = new List<WeakReference>();
573573

574574
foreach (WeakReference reference in _subscribers)

HostIOSubscriberBase.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
using System.Management.Automation;
33
using System.Management.Automation.Host;
44

5-
namespace PSLogging {
6-
public class HostIoSubscriberBase : IHostIoSubscriber {
5+
namespace PSLogging
6+
{
7+
public class HostIoSubscriberBase : IHostIoSubscriber
8+
{
79
public virtual void WriteProgress(long sourceId, ProgressRecord record) { }
810

911
public virtual void ChoicePrompt(ChoiceDescription choice) { }

0 commit comments

Comments
 (0)