0, $ and ^

src/modes/mode.cpp

@@ -17,7 +17,12 @@ bool Mode::keyPress(std::shared_ptr<IEnvironment> env) {
 
     if (key.key == Key::Text) {
         auto intRep = static_cast<uint32_t>(key.symbol);
-        if (_shouldEnableNumbers && (intRep >= '0' && intRep <= '9')) {
+
+        /// "0" is a valid command also
+        if (_repetitions == 0 && intRep == '0') {
+            /// Do nothing
+        }
+        else if (_shouldEnableNumbers && (intRep >= '0' && intRep <= '9')) {
             auto number = intRep - '0';
             if (_repetitions) {
                 _repetitions = _repetitions * 10 + number;

src/script/vimcommands.cpp

@@ -10,6 +10,7 @@
 #include "text/fstring.h"
 #include "text/fstringview.h"
 #include "text/utf8char.h"
+#include "text/utf8charops.h"
 #include "views/editor.h"
 #include <array>
 #include <optional>
@@ -40,14 +41,26 @@ std::function<Cursor(Cursor)> combine(Args... args) {
 Cursor lastNonSpaceOnLine(Cursor cursor) {
     for (auto cur = cursor; cur != end(cursor); ++cur) {
         auto c = content(cur);
-        if (!(c == '\t' || c == ' ' || c == '\n' || c == '\r')) {
+        if (!isSpace(c)) {
             cursor = cur;
         }
     }
 
     return cursor;
 }
 
+Cursor firstNonSpaceOnLine(Cursor cursor) {
+    for (auto cur = home(cursor); cur != end(cursor); ++cur) {
+        auto c = content(cur);
+        cursor = cur;
+        if (!isSpace(c)) {
+            return cursor;
+        }
+    }
+
+    return cursor;
+}
+
 /// std::less is used to be able to compare with FString
 const static auto map =
     std::map<FString, std::function<Cursor(Cursor)>, std::less<>>{
@@ -59,6 +72,9 @@ const static auto map =
         {"w", combine(wordEnd, wrap(right, true), wordEnd, wordBegin)},
         {"e", combine(wrap(right, true), wordEnd)},
         {"b", wordBegin},
+        {"0", home},
+        {"$", end},
+        {"^", firstNonSpaceOnLine},
         {"g_", lastNonSpaceOnLine},
         {"gg", [](Cursor c) { return c.buffer().begin(); }},
         {"G", [](Cursor c) { return c.buffer().end(); }},

src/text.cpp

@@ -12,3 +12,4 @@
 #include "text/rawbuffer.cpp"
 #include "text/utf8caseconversion.cpp"
 #include "text/utf8char.cpp"
+#include "text/utf8charops.cpp"

src/text/utf8charops.cpp

@@ -0,0 +1,5 @@
+#include "utf8charops.h"
+
+bool isSpace(Utf8Char c) {
+    return (c == '\t' || c == ' ' || c == '\n' || c == '\r');
+}

src/text/utf8charops.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "text/utf8char.h"
+
+bool isSpace(Utf8Char);