Keep degenerate UIA text ranges degenerate after movement

src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp

@@ -583,7 +583,7 @@ class UiaTextRangeTests
                 {
                     5,
                     {4 , 0 + 1},
-                    {5 , 0 + 1}
+                    {4 , 0 + 1}
                 }
             },
 
@@ -694,6 +694,30 @@ class UiaTextRangeTests
                     {0, bottomRow},
                     {0, bottomRow}
                 }
+            },
+
+            MoveTest{
+                L"can move to a new row when necessary when moving forward",
+                { lastColumnIndex, 0 },
+                { lastColumnIndex, 0 },
+                5,
+                {
+                    5,
+                    {0, 0 + 5},
+                    {0, 0 + 5}
+                }
+            },
+
+            MoveTest{
+                L"can move to a new row when necessary when moving backward",
+                { 0, 7 },
+                { 0, 7 },
+                -5,
+                {
+                    -5,
+                    {0, 7 - 5},
+                    {0, 7 - 5}
+                }
             }
         };
         // clang-format on

src/types/UiaTextRangeBase.cpp

@@ -579,6 +579,7 @@ IFACEMETHODIMP UiaTextRangeBase::Move(_In_ TextUnit unit,
     // We can abstract this movement by moving _start, but disallowing moving to the end of the buffer
     constexpr auto endpoint = TextPatternRangeEndpoint::TextPatternRangeEndpoint_Start;
     constexpr auto preventBufferEnd = true;
+    const auto wasDegenerate = IsDegenerate();
     try
     {
         if (unit == TextUnit::TextUnit_Character)
@@ -603,8 +604,17 @@ IFACEMETHODIMP UiaTextRangeBase::Move(_In_ TextUnit unit,
     // If we actually moved...
     if (*pRetVal != 0)
     {
-        // then just expand to get our _end
-        ExpandToEnclosingUnit(unit);
+        if (wasDegenerate)
+        {
+            // GH#7342: The range was degenerate before the move.
+            // To keep it that way, move _end to the new _start.
+            _end = _start;
+        }
+        else
+        {
+            // then just expand to get our _end
+            ExpandToEnclosingUnit(unit);
+        }
     }
 
     UiaTracing::TextRange::Move(unit, count, *pRetVal, *this);