Clean up to prepare for unit test changes

Author: Paul van Brenk

Common/Product/SharedProject/ProcessOutput.cs

@@ -65,7 +65,6 @@ public virtual bool CloseStandardInput()
     /// </summary>
     internal sealed class ProcessOutput : IDisposable
     {
-        private readonly Process process;
         private readonly string arguments;
         private readonly List<string> output, error;
         private ManualResetEvent waitHandleEvent;
@@ -409,30 +408,30 @@ private ProcessOutput(Process process, Redirector redirector)
                 this.error = new List<string>();
             }
 
-            this.process = process;
-            if (this.process.StartInfo.RedirectStandardOutput)
+            this.Process = process;
+            if (this.Process.StartInfo.RedirectStandardOutput)
             {
-                this.process.OutputDataReceived += this.OnOutputDataReceived;
+                this.Process.OutputDataReceived += this.OnOutputDataReceived;
             }
-            if (this.process.StartInfo.RedirectStandardError)
+            if (this.Process.StartInfo.RedirectStandardError)
             {
-                this.process.ErrorDataReceived += this.OnErrorDataReceived;
+                this.Process.ErrorDataReceived += this.OnErrorDataReceived;
             }
 
-            if (!this.process.StartInfo.RedirectStandardOutput && !this.process.StartInfo.RedirectStandardError)
+            if (!this.Process.StartInfo.RedirectStandardOutput && !this.Process.StartInfo.RedirectStandardError)
             {
                 // If we are receiving output events, we signal that the process
                 // has exited when one of them receives null. Otherwise, we have
                 // to listen for the Exited event.
                 // If we just listen for the Exited event, we may receive it
                 // before all the output has arrived.
-                this.process.Exited += this.OnExited;
+                this.Process.Exited += this.OnExited;
             }
-            this.process.EnableRaisingEvents = true;
+            this.Process.EnableRaisingEvents = true;
 
             try
             {
-                this.process.Start();
+                this.Process.Start();
             }
             catch (Exception ex)
             {
@@ -451,28 +450,28 @@ private ProcessOutput(Process process, Redirector redirector)
                 {
                     this.error.AddRange(SplitLines(ex.ToString()));
                 }
-                this.process = null;
+                this.Process = null;
             }
 
-            if (this.process != null)
+            if (this.Process != null)
             {
-                if (this.process.StartInfo.RedirectStandardOutput)
+                if (this.Process.StartInfo.RedirectStandardOutput)
                 {
-                    this.process.BeginOutputReadLine();
+                    this.Process.BeginOutputReadLine();
                 }
-                if (this.process.StartInfo.RedirectStandardError)
+                if (this.Process.StartInfo.RedirectStandardError)
                 {
-                    this.process.BeginErrorReadLine();
+                    this.Process.BeginErrorReadLine();
                 }
 
-                if (this.process.StartInfo.RedirectStandardInput)
+                if (this.Process.StartInfo.RedirectStandardInput)
                 {
                     // Close standard input so that we don't get stuck trying to read input from the user.
                     if (this.redirector == null || (this.redirector != null && this.redirector.CloseStandardInput()))
                     {
                         try
                         {
-                            this.process.StandardInput.Close();
+                            this.Process.StandardInput.Close();
                         }
                         catch (InvalidOperationException)
                         {
@@ -496,11 +495,11 @@ private void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
                 lock (this.seenNullLock)
                 {
                     this.seenNullInOutput = true;
-                    shouldExit = this.seenNullInError || !this.process.StartInfo.RedirectStandardError;
+                    shouldExit = this.seenNullInError || !this.Process.StartInfo.RedirectStandardError;
                 }
                 if (shouldExit)
                 {
-                    OnExited(this.process, EventArgs.Empty);
+                    OnExited(this.Process, EventArgs.Empty);
                 }
             }
             else if (!string.IsNullOrEmpty(e.Data))
@@ -532,11 +531,11 @@ private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
                 lock (this.seenNullLock)
                 {
                     this.seenNullInError = true;
-                    shouldExit = this.seenNullInOutput || !this.process.StartInfo.RedirectStandardOutput;
+                    shouldExit = this.seenNullInOutput || !this.Process.StartInfo.RedirectStandardOutput;
                 }
                 if (shouldExit)
                 {
-                    OnExited(this.process, EventArgs.Empty);
+                    OnExited(this.Process, EventArgs.Empty);
                 }
             }
             else if (!string.IsNullOrEmpty(e.Data))
@@ -555,7 +554,9 @@ private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
             }
         }
 
-        public int? ProcessId => this.IsStarted ? this.process.Id : (int?)null;
+        public int? ProcessId => this.IsStarted ? this.Process.Id : (int?)null;
+
+        public Process Process { get; }
 
         /// <summary>
         /// The arguments that were originally passed, including the filename.
@@ -565,7 +566,7 @@ private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
         /// <summary>
         /// True if the process started. False if an error occurred.
         /// </summary>
-        public bool IsStarted => this.process != null;
+        public bool IsStarted => this.Process != null;
 
         /// <summary>
         /// The exit code or null if the process never started or has not
@@ -575,11 +576,11 @@ public int? ExitCode
         {
             get
             {
-                if (this.process == null || !this.process.HasExited)
+                if (this.Process == null || !this.Process.HasExited)
                 {
                     return null;
                 }
-                return this.process.ExitCode;
+                return this.Process.ExitCode;
             }
         }
 
@@ -590,11 +591,11 @@ public ProcessPriorityClass PriorityClass
         {
             get
             {
-                if (this.process != null && !this.process.HasExited)
+                if (this.Process != null && !this.Process.HasExited)
                 {
                     try
                     {
-                        return this.process.PriorityClass;
+                        return this.Process.PriorityClass;
                     }
                     catch (Win32Exception)
                     {
@@ -609,11 +610,11 @@ public ProcessPriorityClass PriorityClass
             }
             set
             {
-                if (this.process != null && !this.process.HasExited)
+                if (this.Process != null && !this.Process.HasExited)
                 {
                     try
                     {
-                        this.process.PriorityClass = value;
+                        this.Process.PriorityClass = value;
                     }
                     catch (Win32Exception)
                     {
@@ -640,34 +641,34 @@ public void WriteInputLine(string line)
         {
             if (IsStarted && redirector != null && !redirector.CloseStandardInput())
             {
-                process.StandardInput.WriteLine(line);
-                process.StandardInput.Flush();
+                Process.StandardInput.WriteLine(line);
+                Process.StandardInput.Flush();
             }
         }
 
         private void FlushAndCloseOutput()
         {
-            if (this.process == null)
+            if (this.Process == null)
             {
                 return;
             }
 
-            if (this.process.StartInfo.RedirectStandardOutput)
+            if (this.Process.StartInfo.RedirectStandardOutput)
             {
                 try
                 {
-                    this.process.CancelOutputRead();
+                    this.Process.CancelOutputRead();
                 }
                 catch (InvalidOperationException)
                 {
                     // Reader has already been cancelled
                 }
             }
-            if (this.process.StartInfo.RedirectStandardError)
+            if (this.Process.StartInfo.RedirectStandardError)
             {
                 try
                 {
-                    this.process.CancelErrorRead();
+                    this.Process.CancelErrorRead();
                 }
                 catch (InvalidOperationException)
                 {
@@ -706,7 +707,7 @@ public WaitHandle WaitHandle
         {
             get
             {
-                if (this.process == null)
+                if (this.Process == null)
                 {
                     return null;
                 }
@@ -725,9 +726,9 @@ public WaitHandle WaitHandle
         /// </summary>
         public void Wait()
         {
-            if (this.process != null)
+            if (this.Process != null)
             {
-                this.process.WaitForExit();
+                this.Process.WaitForExit();
                 // Should have already been called, in which case this is a no-op
                 OnExited(this, EventArgs.Empty);
             }
@@ -742,9 +743,9 @@ public void Wait()
         /// </returns>
         public bool Wait(TimeSpan timeout)
         {
-            if (this.process != null)
+            if (this.Process != null)
             {
-                var exited = this.process.WaitForExit((int)timeout.TotalMilliseconds);
+                var exited = this.Process.WaitForExit((int)timeout.TotalMilliseconds);
                 if (exited)
                 {
                     // Should have already been called, in which case this is a no-op
@@ -762,18 +763,18 @@ public TaskAwaiter<int> GetAwaiter()
         {
             if (this.awaiter == null)
             {
-                if (this.process == null)
+                if (this.Process == null)
                 {
                     var tcs = new TaskCompletionSource<int>();
                     tcs.SetCanceled();
                     this.awaiter = tcs.Task;
                 }
-                else if (this.process.HasExited)
+                else if (this.Process.HasExited)
                 {
                     // Should have already been called, in which case this is a no-op
                     OnExited(this, EventArgs.Empty);
                     var tcs = new TaskCompletionSource<int>();
-                    tcs.SetResult(this.process.ExitCode);
+                    tcs.SetResult(this.Process.ExitCode);
                     this.awaiter = tcs.Task;
                 }
                 else
@@ -788,7 +789,7 @@ public TaskAwaiter<int> GetAwaiter()
                         {
                             throw new OperationCanceledException();
                         }
-                        return this.process.ExitCode;
+                        return this.Process.ExitCode;
                     });
                 }
             }
@@ -801,9 +802,9 @@ public TaskAwaiter<int> GetAwaiter()
         /// </summary>
         public void Kill()
         {
-            if (this.process != null && !this.process.HasExited)
+            if (this.Process != null && !this.Process.HasExited)
             {
-                this.process.Kill();
+                this.Process.Kill();
                 // Should have already been called, in which case this is a no-op
                 OnExited(this, EventArgs.Empty);
             }
@@ -837,17 +838,17 @@ public void Dispose()
             if (!this.isDisposed)
             {
                 this.isDisposed = true;
-                if (this.process != null)
+                if (this.Process != null)
                 {
-                    if (this.process.StartInfo.RedirectStandardOutput)
+                    if (this.Process.StartInfo.RedirectStandardOutput)
                     {
-                        this.process.OutputDataReceived -= this.OnOutputDataReceived;
+                        this.Process.OutputDataReceived -= this.OnOutputDataReceived;
                     }
-                    if (this.process.StartInfo.RedirectStandardError)
+                    if (this.Process.StartInfo.RedirectStandardError)
                     {
-                        this.process.ErrorDataReceived -= this.OnErrorDataReceived;
+                        this.Process.ErrorDataReceived -= this.OnErrorDataReceived;
                     }
-                    this.process.Dispose();
+                    this.Process.Dispose();
                 }
                 if (this.redirector is IDisposable disp)
                 {

Nodejs/Product/Nodejs/Jade/Outlining/IndentBasedRegionBuilder.cs

@@ -160,7 +160,7 @@ private static int GetLineIndent(ITextSnapshotLine line)
             for (int i = line.Start; i < line.End; i++)
             {
                 var ch = line.Snapshot.GetText(i, 1)[0];
-                if (!Char.IsWhiteSpace(ch))
+                if (!char.IsWhiteSpace(ch))
                 {
                     return i - line.Start;
                 }

Nodejs/Product/Nodejs/Jade/TextProvider.cs

@@ -91,8 +91,8 @@ public int IndexOf(string text, ITextRange range, bool ignoreCase)
 
                     if (ignoreCase)
                     {
-                        ch1 = Char.ToLowerInvariant(ch1);
-                        ch2 = Char.ToLowerInvariant(ch2);
+                        ch1 = char.ToLowerInvariant(ch1);
+                        ch2 = char.ToLowerInvariant(ch2);
                     }
 
                     if (ch1 != ch2)

Nodejs/Product/Nodejs/Jade/Tokenizer/JadeTokenizer.cs

@@ -146,7 +146,7 @@ protected override ITextRange HandleString(bool addToken = true)
                     break;
                 }
 
-                if (this._cs.CurrentChar == '<' && (this._cs.NextChar == '/' || Char.IsLetter(this._cs.NextChar)))
+                if (this._cs.CurrentChar == '<' && (this._cs.NextChar == '/' || char.IsLetter(this._cs.NextChar)))
                 {
                     if (this._cs.Position > start)
                     {

Nodejs/Product/Nodejs/Jade/Tokenizer/States/HtmlState.cs

@@ -10,7 +10,7 @@ internal partial class JadeTokenizer : Tokenizer<JadeToken>
         // plain text with possible #{foo} variable references
         private void OnHtml()
         {
-            Debug.Assert(this._cs.CurrentChar == '<' && (this._cs.NextChar == '/' || Char.IsLetter(this._cs.NextChar)));
+            Debug.Assert(this._cs.CurrentChar == '<' && (this._cs.NextChar == '/' || char.IsLetter(this._cs.NextChar)));
 
             var length = this._cs.NextChar == '/' ? 2 : 1;
             AddToken(JadeTokenType.AngleBracket, this._cs.Position, length);

Nodejs/Product/Nodejs/Jade/Tokenizer/States/TagState.cs

@@ -71,7 +71,7 @@ private void OnTag()
 
             while (!this._cs.IsWhiteSpace() && !this._cs.IsEndOfStream())
             {
-                if (this._cs.CurrentChar == '.' && Char.IsWhiteSpace(this._cs.NextChar))
+                if (this._cs.CurrentChar == '.' && char.IsWhiteSpace(this._cs.NextChar))
                 {
                     // If this is last ., then what follows is a text literal
                     if (StringComparer.OrdinalIgnoreCase.Equals(ident, "script"))
@@ -115,7 +115,7 @@ private void OnTag()
                             selectorRange.Length
                         );
 
-                        if (Char.IsWhiteSpace(this._cs.CurrentChar) && this._cs.LookAhead(-1) == '.')
+                        if (char.IsWhiteSpace(this._cs.CurrentChar) && this._cs.LookAhead(-1) == '.')
                         {
                             this._cs.Position--;
                         }

Nodejs/Product/Nodejs/Jade/Tokenizer/States/TextState.cs

@@ -28,7 +28,7 @@ private void OnText(bool strings, bool html, bool entities)
                 {
                     HandleString();
                 }
-                else if (this._cs.CurrentChar == '<' && (this._cs.NextChar == '/' || Char.IsLetter(this._cs.NextChar)) && html)
+                else if (this._cs.CurrentChar == '<' && (this._cs.NextChar == '/' || char.IsLetter(this._cs.NextChar)) && html)
                 {
                     OnHtml();
                 }