Fix selection tests

Author: lzybkr

UnitTestPSReadLine/KillYankTest.cs

@@ -363,9 +363,9 @@ public void TestSelectBackwardChar()
 
             Test("echo", Keys(
                 "eczz", _.ShiftLeftArrow,
-                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, "ecz", Inverted, "z", Inverted)),
+                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, "ecz", Selected("z"))),
                 _.ShiftLeftArrow,
-                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, "ec", Inverted, "zz", Inverted)),
+                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, "ec", Selected("zz"))),
                 _.Delete, "ho"));
         }
 
@@ -376,9 +376,9 @@ public void TestSelectForwardChar()
 
             Test("echo", Keys(
                 "zzho", _.Home, _.ShiftRightArrow,
-                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, Inverted, "z", Inverted, "zho")),
+                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, Selected("z"), "zho")),
                 _.ShiftRightArrow,
-                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, Inverted, "zz", Inverted, "ho")),
+                CheckThat(() => AssertScreenIs(1, TokenClassification.Command, Selected("zz"), "ho")),
                 "ec"));
         }
 
@@ -392,7 +392,7 @@ public void TestSelectBackwardWord()
                 CheckThat(() => AssertScreenIs(1,
                     TokenClassification.Command, "echo",
                     TokenClassification.None, " ",
-                    Inverted, "foo ", Inverted, "bar")),
+                    Selected("foo "), "bar")),
                 _.Delete));
         }
 
@@ -404,8 +404,8 @@ public void TestSelectNextWord()
             Test("echo bar", Keys(
                 "foo echo bar", _.Home, _.CtrlShiftRightArrow,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "foo",
-                    TokenClassification.None, Inverted, " ", Inverted,
+                    TokenClassification.Command, Selected("foo"),
+                    TokenClassification.None, Selected(" "),
                     TokenClassification.None, "echo bar")),
                 _.Delete));
         }
@@ -418,7 +418,7 @@ public void TestSelectForwardWord()
             Test(" echo bar", Keys(
                 "foo echo bar", _.Home, _.AltShiftF,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "foo", Inverted,
+                    TokenClassification.Command, Selected("foo"),
                     TokenClassification.None, " echo bar")),
                 _.Delete));
         }
@@ -431,7 +431,7 @@ public void TestSelectShellForwardWord()
             Test(" echo bar", Keys(
                 "a\\b\\c echo bar", _.Home, _.CtrlZ,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "a\\b\\c", Inverted,
+                    TokenClassification.Command, Selected("a\\b\\c"),
                     TokenClassification.None, " echo bar")),
                 _.Delete));
         }
@@ -444,8 +444,7 @@ public void TestSelectShellNextWord()
             Test("echo bar", Keys(
                 "a\\b\\c echo bar", _.Home, _.CtrlZ,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "a\\b\\c",
-                    TokenClassification.None, Inverted, " ",
+                    TokenClassification.Command, Selected("a\\b\\c "),
                     TokenClassification.None, "echo bar")),
                 _.Delete));
         }
@@ -460,7 +459,7 @@ public void TestSelectShellBackwardWord()
                 CheckThat(() => AssertScreenIs(1,
                     TokenClassification.Command, "echo",
                     TokenClassification.None, " bar ",
-                    TokenClassification.String, Inverted, "'a b c'")),
+                    TokenClassification.String, Selected("'a b c'"))),
                 _.Delete));
         }
 
@@ -472,8 +471,7 @@ public void TestSelectBackwardsLine()
             Test("", Keys(
                 "echo foo", _.ShiftHome,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "echo",
-                    TokenClassification.None, Inverted, " foo")),
+                    TokenClassification.Command, Selected("echo foo"))),
                 _.Backspace));
         }
 
@@ -485,8 +483,7 @@ public void TestSelectLine()
             Test("", Keys(
                 "echo foo", _.Home, _.ShiftEnd,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "echo",
-                    TokenClassification.None, Inverted, " foo")),
+                    TokenClassification.Command, Selected("echo foo"))),
                 _.Delete));
         }
 
@@ -498,16 +495,14 @@ public void TestSelectAll()
             Test("", Keys(
                 "echo foo", _.CtrlA,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "echo",
-                    TokenClassification.None, Inverted, " foo")),
+                    TokenClassification.Command, Selected("echo foo"))),
                 _.Delete
                 ));
 
             Test("", Keys(
                 "echo foo", _.CtrlLeftArrow, _.CtrlA,
                 CheckThat(() => AssertScreenIs(1,
-                    TokenClassification.Command, Inverted, "echo",
-                    TokenClassification.None, Inverted, " foo")),
+                    TokenClassification.Command, Selected("echo foo"))),
                 CheckThat(() => AssertCursorLeftIs(8)),
                 _.Delete
                 ));

UnitTestPSReadLine/UnitTestReadLine.cs

@@ -326,6 +326,9 @@ private static void ToggleNegative(TestConsole c, bool b)
             c.Negative = b;
         }
         private static readonly Dictionary<string, Action<TestConsole>> EscapeSequenceActions = new Dictionary<string, Action<TestConsole>> {
+            {"\x1b[30;47m", c => {
+                c.ForegroundColor = ConsoleColor.Black;
+                c.BackgroundColor = ConsoleColor.Gray; } },
             {"\x1b[7m", c => ToggleNegative(c, true) },
             {"\x1b[27m", c => ToggleNegative(c, false) },
             {"\x1b[40m", c => c.BackgroundColor = ConsoleColor.Black},
@@ -577,8 +580,8 @@ private static void ExecuteOnSTAThread(Action action)
         private class NextLineToken { }
         static readonly NextLineToken NextLine = new NextLineToken();
 
-        private class InvertedToken { }
-        static readonly InvertedToken Inverted = new InvertedToken();
+        private class SelectionToken { public string _text; }
+        private static SelectionToken Selected(string s) { return new SelectionToken {_text = s}; }
 
         private CHAR_INFO[] CreateCharInfoBuffer(int lines, params object[] items)
         {
@@ -594,10 +597,9 @@ private CHAR_INFO[] CreateCharInfoBuffer(int lines, params object[] items)
                     result.Add(new CHAR_INFO((char)item, fg, bg));
                     continue;
                 }
-                if (item is InvertedToken)
+                if (item is SelectionToken st)
                 {
-                    fg = (ConsoleColor)((int)fg ^ 7);
-                    bg = (ConsoleColor)((int)bg ^ 7);
+                    result.AddRange(st._text.Select(c => new CHAR_INFO(c, ConsoleColor.Black, ConsoleColor.Gray)));
                     continue;
                 }
                 if (item is NextLineToken)