Merge pull request #1803 from contour-terminal/fix/vi-y0

[Vi] Fix y0 crash.

Author: christianparpart

metainfo.xml

@@ -116,6 +116,7 @@
           <li>Fixes handling of multiple windows and tabs (#1725)</li>
           <li>Fixes crash on scaling down some symbols during font size change</li>
           <li>Fixes mouse scrolling speed being too slow</li>
+          <li>Fixes crash in vi normal mode when using `y0` (#1801)</li>
           <li>Enables customizing predefined color palette (#1763)</li>
           <li>Ensure inserting new tabs happens right next to the currently active tab (#1695)</li>
           <li>Allow glyphs to underflow if they are not bigger than the cell size (#1603)</li>

src/vtbackend/MockTerm.h

@@ -69,9 +69,13 @@ class MockTerm: public Terminal::NullEvents
     std::string windowTitle;
     Terminal terminal;
 
+    std::string clipboardData;
+
     // Events overrides
     void setWindowTitle(std::string_view title) override { windowTitle = title; }
 
+    void copyToClipboard(std::string_view data) override { clipboardData = data; }
+
     static vtbackend::Settings createSettings(PageSize pageSize,
                                               LineCount maxHistoryLineCount,
                                               size_t ptyReadBufferSize)

src/vtbackend/ViCommands.cpp

@@ -349,10 +349,8 @@ void ViCommands::executeYank(ViMotion motion, unsigned count)
             break;
         }
         default: {
-            auto const [from, to] = translateToCellRange(motion, count);
-            // motion is inclusive but for yank we want to exclude the last cell which is the first cell of
-            // the next word
-            executeYank(from, { .line = to.line, .column = to.column - 1 });
+            auto const [from, to] = translateToCellRange(motion, count).ordered();
+            executeYank(from, to);
         }
         break;
     }

src/vtbackend/ViCommands_test.cpp

@@ -208,3 +208,15 @@ TEST_CASE("ViCommands:modeChanged", "[vi]")
     }
 }
 // NOLINTEND(misc-const-correctness)
+
+TEST_CASE("yank", "[vi]")
+{
+    auto mock = setupMockTerminal(
+        "Hello World", vtbackend::PageSize { vtbackend::LineCount(10), vtbackend::ColumnCount(40) });
+
+    mock.sendCharSequence("3l"); // Move cursor to second 'l'
+    REQUIRE(mock.terminal.normalModeCursorPosition() == 0_lineOffset + 3_columnOffset);
+    mock.sendCharSequence("y0");
+
+    CHECK(mock.clipboardData == "Hell");
+}

src/vtbackend/primitives.h

@@ -175,6 +175,7 @@ constexpr CellLocation operator-(CellLocation c, ColumnOffset x) noexcept
 {
     return CellLocation { .line = c.line, .column = c.column - x };
 }
+
 // Constructs a top-left and bottom-right coordinate-pair from given input.
 constexpr std::pair<CellLocation, CellLocation> orderedPoints(CellLocation a, CellLocation b) noexcept
 {
@@ -197,6 +198,12 @@ struct CellLocationRange
     CellLocation first;
     CellLocation second;
 
+    [[nodiscard]] CellLocationRange ordered() const noexcept
+    {
+        auto [a, b] = orderedPoints(first, second);
+        return CellLocationRange { .first = a, .second = b };
+    }
+
     [[nodiscard]] bool contains(CellLocation location) const noexcept
     {
         switch (abs(unbox(first.line) - unbox(second.line)))