Huge refactor. Fix SessionState, History, TabExpansion

Author: Jaykul

PoshCode.Controls/ConsoleControl/TabExpansion.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Media;
-using Colors = PoshCode.Controls.Properties.Colors;
+using Colors = PoshCode.Properties.Colors;
 
 namespace PoshCode.Controls
 {

PoshCode.Controls/ColorInverter.cs PoshCode.Controls/Controls/ColorInverter.cs

@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Management.Automation;
 using System.Management.Automation.Host;
@@ -182,11 +183,12 @@ public void Prompt(string prompt)
             {
                 if (Next != null)
                 {
-                    Run insert = new Run(prompt);
-                    insert.Background = Background;
-                    insert.Foreground = Foreground;
+                    var insert = new Run(prompt)
+                    {
+                        Background = Background,
+                        Foreground = Foreground
+                    };
                     Next.Inlines.Add(insert);
-
                     SetPrompt();
                 }
             });
@@ -237,14 +239,7 @@ private void ShouldEcho(char ch, bool echo)
                 if (ch == cmd[0])
                 {
                     // emulate NoEcho by UN-echoing...
-                    if (cmd.Length > 1)
-                    {
-                        CurrentCommand = cmd.Substring(1);
-                    }
-                    else
-                    {
-                        CurrentCommand = "";
-                    }
+                    CurrentCommand = cmd.Length > 1 ? cmd.Substring(1) : "";
                     // if we're NOT NoEcho, then re-echo it:
                     if (echo)
                     {
@@ -354,17 +349,12 @@ public ConsoleColor BackgroundColor
         private static void BackgroundColorPropertyChanged(DependencyObject depObj, DependencyPropertyChangedEventArgs e)
         {
             // put code here to handle the property changed for BackgroundColor
-            ConsoleControl consoleControlObj = depObj as ConsoleControl;
+            var consoleControlObj = depObj as ConsoleControl;
             if (consoleControlObj != null)
             {
-                if (e.NewValue != DependencyProperty.UnsetValue)
-                {
-                    consoleControlObj.Background = consoleControlObj._brushes.BrushFromConsoleColor((ConsoleColor)e.NewValue);
-                }
-                else
-                {
-                    consoleControlObj.Background = consoleControlObj._brushes.DefaultBackground;
-                }
+                consoleControlObj.Background = e.NewValue != DependencyProperty.UnsetValue
+                                                    ? consoleControlObj._brushes.BrushFromConsoleColor((ConsoleColor)e.NewValue) 
+                                                    : consoleControlObj._brushes.DefaultBackground;
             }
         }
 
@@ -394,17 +384,12 @@ private static void ForegroundColorPropertyChanged(DependencyObject depObj, Depe
         {
 
             // put code here to handle the property changed for ForegroundColor
-            ConsoleControl ConsoleControlObj = depObj as ConsoleControl;
+            var ConsoleControlObj = depObj as ConsoleControl;
             if (ConsoleControlObj != null)
             {
-                if (e.NewValue != DependencyProperty.UnsetValue)
-                {
-                    ConsoleControlObj.Foreground = ConsoleControlObj._brushes.BrushFromConsoleColor((ConsoleColor)e.NewValue);
-                }
-                else
-                {
-                    ConsoleControlObj.Foreground = ConsoleControlObj._brushes.DefaultForeground;
-                }
+                ConsoleControlObj.Foreground = e.NewValue != DependencyProperty.UnsetValue 
+                                                    ? ConsoleControlObj._brushes.BrushFromConsoleColor((ConsoleColor)e.NewValue) 
+                                                    : ConsoleControlObj._brushes.DefaultForeground;
             }
         }
 
@@ -418,6 +403,8 @@ public void Write(string message, Block target = null)
             Write(null, null, message, target);
         }
 
+        [SuppressMessage("RefactoringEssentials", "RECS0026", Justification = "Creating a Run with the target set puts it in the document automatically")]
+        [SuppressMessage("ReSharper", "ObjectCreationAsStatement")]
         public void Write(Brush foreground, Brush background, string text, Block target = null)
         {
             //if (target == null) target = Current;
@@ -431,6 +418,7 @@ public void Write(Brush foreground, Brush background, string text, Block target
 
                 if (target == null) target = Current;
 
+                // Creating the run with the target set puts it in the document automatically.
                 new Run(text, target.ContentEnd)
                 {
                     Background = background,
@@ -441,12 +429,15 @@ public void Write(Brush foreground, Brush background, string text, Block target
             });
         }
 
+        [SuppressMessage("RefactoringEssentials", "RECS0026", Justification = "Creating a Run with the target set puts it in the document automatically")]
+        [SuppressMessage("ReSharper", "ObjectCreationAsStatement")]
         public void Write(ConsoleColor foreground, ConsoleColor background, string text, Block target = null)
         {
             if (target == null) target = Current;
 
             Dispatcher.BeginInvoke(DispatcherPriority.Render, (Action)delegate
             {
+                // Creating the run with the target set puts it in the document automatically.
                 new Run(text, target.ContentEnd)
                 {
                     Background = (this.BackgroundColor == background) ? this.Brushes.Transparent : this._brushes.BrushFromConsoleColor(background),
@@ -569,16 +560,29 @@ protected virtual void OnCommand(CommandEventArgs command)
             _cmdHistory.Add(command.Command.TrimEnd());
             Trace.WriteLine("OnCommand, clearing KeyInfo queue.");
         }
+
+        public int CurrentCommandCursorPos
+        {
+            get
+            {
+                return _commandBox.CaretPosition.GetTextRunLength(LogicalDirection.Backward);
+            }
+            set
+            {
+                _commandBox.CaretPosition = _commandBox.Document.ContentStart.GetPositionAtOffset(value);                
+            }
+        }
+
         public string CurrentCommandPreCursor
         {
             get
             {
-                TextRange preCursor = new TextRange(_commandBox.Document.ContentStart, _commandBox.CaretPosition);
+                var preCursor = new TextRange(_commandBox.Document.ContentStart, _commandBox.CaretPosition);
                 return preCursor.Text.TrimEnd('\n', '\r');
             }
             set
             {
-                TextRange preCursor = new TextRange(_commandBox.Document.ContentStart, _commandBox.CaretPosition);
+                var preCursor = new TextRange(_commandBox.Document.ContentStart, _commandBox.CaretPosition);
                 // TODO: re-parse and syntax highlight
                 preCursor.Text = value.TrimEnd('\n', '\r');
             }
@@ -587,12 +591,12 @@ public string CurrentCommandPostCursor
         {
             get
             {
-                TextRange postCursor = new TextRange(_commandBox.CaretPosition, _commandBox.Document.ContentEnd);
+                var postCursor = new TextRange(_commandBox.CaretPosition, _commandBox.Document.ContentEnd);
                 return postCursor.Text.TrimEnd('\n', '\r');
             }
             set
             {
-                TextRange postCursor = new TextRange(_commandBox.CaretPosition, _commandBox.Document.ContentEnd);
+                var postCursor = new TextRange(_commandBox.CaretPosition, _commandBox.Document.ContentEnd);
                 // TODO: re-parse and syntax highlight
                 postCursor.Text = value.TrimEnd('\n', '\r');
 
@@ -603,8 +607,8 @@ public string CurrentCommand
         {
             get
             {
-                TextRange all = new TextRange(_commandBox.Document.ContentStart, _commandBox.Document.ContentEnd);
-                return all.Text;
+                var all = new TextRange(_commandBox.Document.ContentStart, _commandBox.Document.ContentEnd);
+                return all.Text.TrimEnd('\n', '\r');
             }
             set
             {
@@ -1119,14 +1123,18 @@ public static IEnumerable<TextRange> FindText(FlowDocument document, String inpu
 
         public void Dispose()
         {
-            if (_gotInputKey != null)
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
             {
+                // free managed resources
                 _gotInputKey.Dispose();
-            }
-            if (_gotInputLine != null)
-            {
                 _gotInputLine.Dispose();
             }
+            // free native resources (if there are any)
         }
     }
 }

PoshCode.Controls/ConsoleBrushes.cs PoshCode.Controls/Controls/ConsoleBrushes.cs

@@ -210,7 +210,7 @@ private void UpdateCharacterWidth()
          BufferCell[,] bufferCells = new BufferCell[(rectangle.Top - rectangle.Bottom), (rectangle.Right - rectangle.Left)];
          try
          {
-            int cur =
+            var cur =
                (int)
                ((Next.ElementEnd.GetCharacterRect(LogicalDirection.Backward).Bottom +
                  ScrollViewer.ContentVerticalOffset)/
@@ -271,8 +271,8 @@ public Coordinates WindowPosition
       {
          get
          {
-            int x = 0;
-            int y = (int)(ScrollViewer.ContentVerticalOffset / (Double.IsNaN(Document.LineHeight) ? Document.FontSize : Document.LineHeight));
+            var x = 0;
+            var y = (int)(ScrollViewer.ContentVerticalOffset / (Double.IsNaN(Document.LineHeight) ? Document.FontSize : Document.LineHeight));
             return new Coordinates(x, y);
          }
          set

PoshCode.Controls/ConsoleControl.cs PoshCode.Controls/Controls/ConsoleControl.cs

@@ -18,7 +18,7 @@ partial class ConsoleControl
         /// <param name="e">The <see cref="System.Windows.Input.ExecutedRoutedEventArgs"/> instance containing the event data.</param>
         private static void OnApplicationStop(object sender, ExecutedRoutedEventArgs e)
         {
-           ConsoleControl control = (ConsoleControl)sender;
+           var control = (ConsoleControl)sender;
             //if (!control.IsRunning)
             //{
             //    // TODO: Remove failed command from History ... control.History.ResetCurrentCommand();
@@ -57,7 +57,7 @@ private static void OnApplicationStop(object sender, ExecutedRoutedEventArgs e)
 
       private static void OnCanExecuteCut(object target, CanExecuteRoutedEventArgs args)
         {
-            ConsoleControl box = (ConsoleControl)(target);
+            var box = (ConsoleControl)(target);
             args.CanExecute = box.IsEnabled && box.Selection != null && !box.Selection.IsEmpty;
         }
 
@@ -96,17 +96,13 @@ private static void OnExecuteCut(object sender, ExecutedRoutedEventArgs e)
 
       private static void OnExecutePaste(object sender, ExecutedRoutedEventArgs e)
         {
-            RichTextBox box = ((ConsoleControl)sender)._commandContainer.Child as RichTextBox;
+            var box = ((ConsoleControl)sender)._commandContainer.Child as RichTextBox;
             if(box != null)
             {
                box.Paste();                  
             } else
             {
-               PasswordBox pw = ((ConsoleControl) sender)._commandContainer.Child as PasswordBox;
-               if (pw != null)
-               {
-                  pw.Paste();
-               }
+               (((ConsoleControl) sender)._commandContainer.Child as PasswordBox)?.Paste();
             }
          //if (Clipboard.ContainsText())
             //{