diff --git a/Cargo.lock b/Cargo.lock
index da2362670d..e5f183c9ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ version = "0.1.0"
 dependencies = [
  "auto_update",
  "editor",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "language",
  "project",
@@ -52,9 +52,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
  "memchr",
 ]
@@ -113,6 +113,15 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049"
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -124,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.58"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
 
 [[package]]
 name = "arrayref"
@@ -148,9 +157,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
 name = "ascii"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109"
+checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
 [[package]]
 name = "assets"
@@ -174,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -184,10 +193,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-compression"
-version = "0.3.14"
+name = "async-compat"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695"
+checksum = "9b48b4ff0c2026db683dea961cd8ea874737f56cffca86fa84415eaddc51c00d"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "once_cell",
+ "pin-project-lite 0.2.9",
+ "tokio",
+]
+
+[[package]]
+name = "async-compression"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
 dependencies = [
  "flate2",
  "futures-core",
@@ -212,21 +234,23 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b3ca4f8ff117c37c278a2f7415ce9be55560b846b5bc4412aaa5d29c1c3dae2"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
 dependencies = [
  "async-lock",
+ "autocfg 1.1.0",
  "blocking",
  "futures-lite",
 ]
 
 [[package]]
 name = "async-io"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
+checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
 dependencies = [
+ "autocfg 1.1.0",
  "concurrent-queue",
  "futures-lite",
  "libc",
@@ -251,11 +275,12 @@ dependencies = [
 
 [[package]]
 name = "async-net"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5373304df79b9b4395068fb080369ec7178608827306ce4d081cba51cac551df"
+checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
 dependencies = [
  "async-io",
+ "autocfg 1.1.0",
  "blocking",
  "futures-lite",
 ]
@@ -265,17 +290,18 @@ name = "async-pipe"
 version = "0.1.3"
 source = "git+https://github.com/zed-industries/async-pipe-rs?rev=82d00a04211cf4e1236029aa03e6b6ce2a74c553#82d00a04211cf4e1236029aa03e6b6ce2a74c553"
 dependencies = [
- "futures",
+ "futures 0.3.24",
  "log",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
+checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
 dependencies = [
  "async-io",
+ "autocfg 1.1.0",
  "blocking",
  "cfg-if 1.0.0",
  "event-listener",
@@ -338,9 +364,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -435,15 +461,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.5.11"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2cc6e8e8c993cb61a005fab8c1e5093a29199b7253b05a6883999312935c1ff"
+checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043"
 dependencies = [
  "async-trait",
  "axum-core",
  "base64",
  "bitflags",
- "bytes",
+ "bytes 1.2.1",
  "futures-util",
  "headers",
  "http",
@@ -470,26 +496,28 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4d047478b986f14a13edad31a009e2e05cb241f9805d0d75e4cba4e129ad4d"
+checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b"
 dependencies = [
  "async-trait",
- "bytes",
+ "bytes 1.2.1",
  "futures-util",
  "http",
  "http-body",
  "mime",
+ "tower-layer",
+ "tower-service",
 ]
 
 [[package]]
 name = "axum-extra"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "277c75e6c814b061ae4947d02335d9659db9771b9950cca670002ae986372f44"
+checksum = "69034b3b0fd97923eee2ce8a47540edb21e07f48f87f67d44bb4271cec622bdb"
 dependencies = [
  "axum",
- "bytes",
+ "bytes 1.2.1",
  "futures-util",
  "http",
  "mime",
@@ -505,16 +533,16 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.5.3",
- "object",
+ "miniz_oxide 0.5.4",
+ "object 0.29.0",
  "rustc-demangle",
 ]
 
@@ -526,9 +554,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "base64ct"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851"
+checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474"
 
 [[package]]
 name = "bincode"
@@ -585,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
 dependencies = [
  "generic-array",
 ]
@@ -645,15 +673,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.10.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
 
 [[package]]
 name = "bytemuck"
-version = "1.10.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c53dfa917ec274df8ed3c572698f381a24eef2efba9492d797301b72b6db408a"
+checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
 
 [[package]]
 name = "byteorder"
@@ -661,6 +689,16 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "bytes"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+dependencies = [
+ "byteorder",
+ "iovec",
+]
+
 [[package]]
 name = "bytes"
 version = "1.2.1"
@@ -758,12 +796,12 @@ dependencies = [
  "bindgen",
  "block",
  "byteorder",
- "bytes",
+ "bytes 1.2.1",
  "cocoa",
  "core-foundation",
  "core-graphics",
  "foreign-types",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "hmac 0.12.1",
  "jwt",
@@ -774,7 +812,7 @@ dependencies = [
  "parking_lot 0.11.2",
  "postage",
  "serde",
- "sha2 0.10.2",
+ "sha2 0.10.6",
  "simplelog",
 ]
 
@@ -825,21 +863,23 @@ dependencies = [
  "postage",
  "settings",
  "theme",
- "time 0.3.11",
+ "time 0.3.15",
  "util",
  "workspace",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.19"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
 dependencies = [
- "libc",
+ "iana-time-zone",
+ "js-sys",
  "num-integer",
  "num-traits",
  "time 0.1.44",
+ "wasm-bindgen",
  "winapi 0.3.9",
 ]
 
@@ -860,9 +900,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.3.3"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
 dependencies = [
  "glob",
  "libc",
@@ -886,9 +926,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.8"
+version = "3.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83"
+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
 dependencies = [
  "atty",
  "bitflags",
@@ -898,14 +938,14 @@ dependencies = [
  "once_cell",
  "strsim 0.10.0",
  "termcolor",
- "textwrap 0.15.0",
+ "textwrap 0.15.1",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.7"
+version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -928,7 +968,7 @@ name = "cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.8",
+ "clap 3.2.22",
  "core-foundation",
  "core-services",
  "dirs 3.0.2",
@@ -946,7 +986,7 @@ dependencies = [
  "async-tungstenite",
  "collections",
  "db",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "image",
  "isahc",
@@ -961,11 +1001,11 @@ dependencies = [
  "sum_tree",
  "tempfile",
  "thiserror",
- "time 0.3.11",
+ "time 0.3.15",
  "tiny_http",
  "url",
  "util",
- "uuid 1.1.2",
+ "uuid 1.2.1",
 ]
 
 [[package]]
@@ -1013,6 +1053,16 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "collab"
 version = "0.1.0"
@@ -1023,14 +1073,14 @@ dependencies = [
  "axum",
  "axum-extra",
  "base64",
- "clap 3.2.8",
+ "clap 3.2.22",
  "client",
  "collections",
  "ctor",
  "editor",
  "env_logger",
  "envy",
- "futures",
+ "futures 0.3.24",
  "git",
  "gpui",
  "hyper",
@@ -1053,7 +1103,7 @@ dependencies = [
  "sha-1 0.9.8",
  "sqlx",
  "theme",
- "time 0.3.11",
+ "time 0.3.15",
  "tokio",
  "tokio-tungstenite",
  "toml",
@@ -1101,9 +1151,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.2"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
 dependencies = [
  "cache-padded",
 ]
@@ -1116,7 +1166,7 @@ dependencies = [
  "client",
  "collections",
  "editor",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "gpui",
  "language",
@@ -1140,7 +1190,7 @@ dependencies = [
  "client",
  "collections",
  "editor",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "gpui",
  "language",
@@ -1236,27 +1286,27 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7901fbba05decc537080b07cb3f1cadf53be7b7602ca8255786288a8692ae29a"
+checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ba1b45d243a4a28e12d26cd5f2507da74e77c45927d40de8b6ffbf088b46b5"
+checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea"
 dependencies = [
  "cranelift-bforest",
  "cranelift-codegen-meta",
@@ -1272,33 +1322,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cc30032171bf230ce22b99c07c3a1de1221cb5375bd6dbe6dbe77d0eed743c"
+checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23f2672426d2bb4c9c3ef53e023076cfc4d8922f0eeaebaf372c92fae8b5c69"
+checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "886c59a5e0de1f06dbb7da80db149c75de10d5e2caca07cdd9fef8a5918a6336"
+checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace74eeca11c439a9d4ed1a5cb9df31a54cd0f7fbddf82c8ce4ea8e9ad2a8fe0"
+checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1308,15 +1358,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db1ae52a5cc2cad0d86fdd3dcb16b7217d2f1e65ab4f5814aa4f014ad335fa43"
+checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b"
 
 [[package]]
 name = "cranelift-native"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dadcfb7852900780d37102bce5698bcd401736403f07b52e714ff7a180e0e22f"
+checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1325,9 +1375,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.85.1"
+version = "0.85.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84e3410960389110b88f97776f39f6d2c8becdaa4cd59e390e6b76d9d0e7190"
+checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1375,47 +1425,46 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.9"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
+checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
 dependencies = [
  "autocfg 1.1.0",
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
  "memoffset",
- "once_cell",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
 ]
 
 [[package]]
@@ -1431,19 +1480,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
 dependencies = [
  "cfg-if 1.0.0",
- "once_cell",
 ]
 
 [[package]]
 name = "crypto-common"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
  "typenum",
@@ -1461,9 +1509,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
+checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
 dependencies = [
  "quote",
  "syn",
@@ -1471,9 +1519,9 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f"
+checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
 dependencies = [
  "curl-sys",
  "libc",
@@ -1486,9 +1534,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.55+curl-7.83.1"
+version = "0.4.56+curl-7.83.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762"
+checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f"
 dependencies = [
  "cc",
  "libc",
@@ -1500,6 +1548,50 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "cxx"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "data-url"
 version = "0.1.1"
@@ -1534,13 +1626,13 @@ dependencies = [
 
 [[package]]
 name = "dhat"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47003dc9f6368a88e85956c3b2573a7e6872746a3e5d762a8885da3a136a0381"
+checksum = "0684eaa19a59be283a6f99369917b679bd4d1d06604b2eb2e2f87b4bbd67668d"
 dependencies = [
  "backtrace",
  "lazy_static",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -1579,11 +1671,11 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer 0.10.3",
  "crypto-common",
  "subtle",
 ]
@@ -1649,10 +1741,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "dotenv"
-version = "0.15.0"
+name = "dotenvy"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+checksum = "ed9155c8f4dc55c7470ae9da3f63c6785245093b3f6aeb0f5bf2e968efbba314"
+dependencies = [
+ "dirs 4.0.0",
+]
 
 [[package]]
 name = "drag_and_drop"
@@ -1676,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140206b78fb2bc3edbcfc9b5ccbd0b30699cfe8d348b8b31b330e47df5291a5a"
+checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
 
 [[package]]
 name = "easy-parallel"
@@ -1697,7 +1792,7 @@ dependencies = [
  "context_menu",
  "ctor",
  "env_logger",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "git",
  "gpui",
@@ -1732,9 +1827,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
 [[package]]
 name = "encoding_rs"
@@ -1747,9 +1842,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
 dependencies = [
  "atty",
  "humantime",
@@ -1769,9 +1864,9 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d013529d5574a60caeda29e179e695125448e5de52e3874f7b4c1d7360e18e"
+checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11"
 dependencies = [
  "serde",
 ]
@@ -1818,9 +1913,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "expat-sys"
@@ -1840,9 +1935,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
@@ -1890,7 +1985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.5.3",
+ "miniz_oxide 0.5.4",
 ]
 
 [[package]]
@@ -1963,11 +2058,10 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "matches",
  "percent-encoding",
 ]
 
@@ -2046,9 +2140,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
+
+[[package]]
+name = "futures"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2061,9 +2161,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2071,15 +2171,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2099,9 +2199,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
 
 [[package]]
 name = "futures-lite"
@@ -2120,9 +2220,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2131,22 +2231,23 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
 
 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
 
 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
 dependencies = [
+ "futures 0.1.31",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -2157,6 +2258,7 @@ dependencies = [
  "pin-project-lite 0.2.9",
  "pin-utils",
  "slab",
+ "tokio-io",
 ]
 
 [[package]]
@@ -2178,9 +2280,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
  "typenum",
  "version_check",
@@ -2220,9 +2322,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
 dependencies = [
  "fallible-iterator",
  "indexmap",
@@ -2237,7 +2339,7 @@ dependencies = [
  "async-trait",
  "clock",
  "collections",
- "futures",
+ "futures 0.3.24",
  "git2",
  "lazy_static",
  "log",
@@ -2315,7 +2417,7 @@ dependencies = [
  "etagere",
  "font-kit",
  "foreign-types",
- "futures",
+ "futures 0.3.24",
  "gpui_macros",
  "image",
  "lazy_static",
@@ -2340,7 +2442,7 @@ dependencies = [
  "smallvec",
  "smol",
  "sum_tree",
- "time 0.3.11",
+ "time 0.3.15",
  "tiny-skia",
  "tree-sitter",
  "usvg",
@@ -2359,11 +2461,11 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -2372,7 +2474,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util 0.7.3",
+ "tokio-util 0.7.4",
  "tracing",
 ]
 
@@ -2387,36 +2489,36 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
  "ahash",
 ]
 
 [[package]]
 name = "hashlink"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086"
+checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
 dependencies = [
- "hashbrown 0.12.1",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
 name = "headers"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
+checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
 dependencies = [
  "base64",
  "bitflags",
- "bytes",
+ "bytes 1.2.1",
  "headers-core",
  "http",
  "httpdate",
  "mime",
- "sha-1 0.10.0",
+ "sha1",
 ]
 
 [[package]]
@@ -2457,9 +2559,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37fb7dc756218a0559bfc21e4381f03cbb696cdaf959e7e95e927496f0564cd"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
 dependencies = [
  "libc",
 ]
@@ -2495,7 +2597,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.3",
+ "digest 0.10.5",
 ]
 
 [[package]]
@@ -2504,7 +2606,7 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "fnv",
  "itoa",
 ]
@@ -2515,7 +2617,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "http",
  "pin-project-lite 0.2.9",
 ]
@@ -2528,9 +2630,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
 
 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
@@ -2546,11 +2648,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.19"
+version = "0.14.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
+checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -2586,7 +2688,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "hyper",
  "native-tls",
  "tokio",
@@ -2594,12 +2696,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.2.3"
+name = "iana-time-zone"
+version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "matches",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -2610,7 +2735,7 @@ version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
 dependencies = [
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
  "globset",
  "lazy_static",
  "log",
@@ -2648,15 +2773,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg 1.1.0",
- "hashbrown 0.12.1",
+ "hashbrown 0.12.3",
  "serde",
 ]
 
 [[package]]
 name = "indoc"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e"
+checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3"
 
 [[package]]
 name = "instant"
@@ -2727,7 +2852,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c89a757e762896bdbdfadf2860d0f8b0cea5e363d8cf3e7bdfeb63d1d976352"
 dependencies = [
- "hermit-abi 0.2.3",
+ "hermit-abi 0.2.6",
  "io-lifetimes",
  "rustix",
  "winapi 0.3.9",
@@ -2741,7 +2866,7 @@ checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
 dependencies = [
  "async-channel",
  "castaway",
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
  "curl",
  "curl-sys",
  "encoding_rs",
@@ -2762,18 +2887,18 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
 
 [[package]]
 name = "ittapi-rs"
@@ -2786,9 +2911,9 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
 dependencies = [
  "libc",
 ]
@@ -2817,9 +2942,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.58"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2838,11 +2963,11 @@ checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f"
 dependencies = [
  "base64",
  "crypto-common",
- "digest 0.10.3",
+ "digest 0.10.5",
  "hmac 0.12.1",
  "serde",
  "serde_json",
- "sha2 0.10.2",
+ "sha2 0.10.6",
 ]
 
 [[package]]
@@ -2876,7 +3001,7 @@ dependencies = [
  "collections",
  "ctor",
  "env_logger",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "git",
  "gpui",
@@ -2931,9 +3056,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
 
 [[package]]
 name = "libgit2-sys"
@@ -2959,9 +3084,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
+checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565"
 
 [[package]]
 name = "libnghttp2-sys"
@@ -3008,6 +3133,15 @@ dependencies = [
  "safemem",
 ]
 
+[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -3037,7 +3171,7 @@ dependencies = [
  "anyhow",
  "core-foundation",
  "core-graphics",
- "futures",
+ "futures 0.3.24",
  "media",
  "parking_lot 0.11.2",
  "serde",
@@ -3046,9 +3180,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg 1.1.0",
  "scopeguard",
@@ -3074,7 +3208,7 @@ dependencies = [
  "collections",
  "ctor",
  "env_logger",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "log",
  "lsp-types",
@@ -3153,11 +3287,11 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "md-5"
-version = "0.10.1"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582"
+checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
- "digest 0.10.3",
+ "digest 0.10.5",
 ]
 
 [[package]]
@@ -3167,7 +3301,7 @@ dependencies = [
  "anyhow",
  "bindgen",
  "block",
- "bytes",
+ "bytes 1.2.1",
  "core-foundation",
  "foreign-types",
  "metal",
@@ -3261,9 +3395,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
 dependencies = [
  "adler",
 ]
@@ -3437,6 +3571,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.3"
@@ -3527,6 +3671,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nvim-rs"
+version = "0.5.0"
+source = "git+https://github.com/KillTheMule/nvim-rs?branch=master#d701c2790dcb2579f8f4d7003ba30e2100a7d25b"
+dependencies = [
+ "async-trait",
+ "futures 0.3.24",
+ "log",
+ "parity-tokio-ipc",
+ "rmp",
+ "rmpv",
+ "tokio",
+ "tokio-util 0.7.4",
+]
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -3559,10 +3718,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.13.0"
+name = "object"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
 [[package]]
 name = "opaque-debug"
@@ -3572,9 +3740,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.40"
+version = "0.10.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
+checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -3604,9 +3772,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.74"
+version = "0.9.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
+checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
 dependencies = [
  "autocfg 1.1.0",
  "cc",
@@ -3626,9 +3794,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.1.0"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
 
 [[package]]
 name = "outline"
@@ -3647,6 +3815,26 @@ dependencies = [
  "workspace",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parity-tokio-ipc"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
+dependencies = [
+ "futures 0.3.24",
+ "libc",
+ "log",
+ "rand 0.7.3",
+ "tokio",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "parking"
 version = "2.0.0"
@@ -3708,15 +3896,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77e0b28ace46c5a396546bcf443bf422b57049617433d8854227352a4a9b24e7"
 dependencies = [
  "base64ct",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
 
 [[package]]
 name = "pathfinder_color"
@@ -3774,16 +3962,17 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.1.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
 dependencies = [
+ "thiserror",
  "ucd-trie",
 ]
 
@@ -3821,18 +4010,18 @@ checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
 
 [[package]]
 name = "pin-project"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260"
+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74"
+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3873,7 +4062,7 @@ dependencies = [
  "indexmap",
  "line-wrap",
  "serde",
- "time 0.3.11",
+ "time 0.3.15",
  "xml-rs",
 ]
 
@@ -3926,10 +4115,11 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
 dependencies = [
+ "autocfg 1.1.0",
  "cfg-if 1.0.0",
  "libc",
  "log",
@@ -3951,7 +4141,7 @@ checksum = "a63d25391d04a097954b76aba742b6b5b74f213dfe3dbaeeb36e8ddc1c657f0b"
 dependencies = [
  "atomic",
  "crossbeam-queue",
- "futures",
+ "futures 0.3.24",
  "log",
  "pin-project",
  "pollster",
@@ -3991,9 +4181,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
  "unicode-ident",
 ]
@@ -4021,7 +4211,7 @@ dependencies = [
  "collections",
  "db",
  "fsevent",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "git",
  "gpui",
@@ -4041,7 +4231,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "sha2 0.10.2",
+ "sha2 0.10.6",
  "similar",
  "smol",
  "sum_tree",
@@ -4059,7 +4249,7 @@ version = "0.1.0"
 dependencies = [
  "context_menu",
  "editor",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "menu",
  "postage",
@@ -4078,7 +4268,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "editor",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "gpui",
  "language",
@@ -4096,9 +4286,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39"
+checksum = "45c8babc29389186697fe5a2a4859d697825496b83db5d0b65271cdc0488e88c"
 dependencies = [
  "cfg-if 1.0.0",
  "fnv",
@@ -4115,7 +4305,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "prost-derive 0.8.0",
 ]
 
@@ -4125,7 +4315,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "prost-derive 0.9.0",
 ]
 
@@ -4135,7 +4325,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "heck 0.3.3",
  "itertools",
  "lazy_static",
@@ -4181,30 +4371,30 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "prost 0.9.0",
 ]
 
 [[package]]
 name = "protobuf"
-version = "2.27.1"
+version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96"
+checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
 [[package]]
 name = "psm"
-version = "0.1.19"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd89aa18fbf9533a581355a22438101fe9c2ed8c9e2f0dcf520552a3afddf2"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
 dependencies = [
  "bitflags",
  "memchr",
@@ -4213,9 +4403,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
@@ -4254,7 +4444,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -4274,7 +4464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -4303,9 +4493,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
  "getrandom 0.2.7",
 ]
@@ -4337,9 +4527,9 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
 dependencies = [
- "crossbeam-channel 0.5.5",
+ "crossbeam-channel 0.5.6",
  "crossbeam-deque",
- "crossbeam-utils 0.8.10",
+ "crossbeam-utils 0.8.12",
  "num_cpus",
 ]
 
@@ -4360,9 +4550,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
@@ -4439,12 +4629,12 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.11"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
 dependencies = [
  "base64",
- "bytes",
+ "bytes 1.2.1",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -4455,10 +4645,10 @@ dependencies = [
  "hyper-tls",
  "ipnet",
  "js-sys",
- "lazy_static",
  "log",
  "mime",
  "native-tls",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite 0.2.9",
  "serde",
@@ -4492,9 +4682,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b221de559e4a29df3b957eec92bc0de6bc8eaf6ca9cfed43e5e1d67ff65a34"
+checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3"
 dependencies = [
  "bytemuck",
 ]
@@ -4514,6 +4704,27 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmpv"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de8813b3a2f95c5138fe5925bfb8784175d88d6bff059ba8ce090aa891319754"
+dependencies = [
+ "num-traits",
+ "rmp",
+]
+
 [[package]]
 name = "rocksdb"
 version = "0.18.0"
@@ -4544,7 +4755,7 @@ dependencies = [
  "collections",
  "ctor",
  "env_logger",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "parking_lot 0.11.2",
  "prost 0.8.0",
@@ -4582,9 +4793,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "6.4.0"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a17e5ac65b318f397182ae94e532da0ba56b88dd1200b774715d36c4943b1c3"
+checksum = "e26934cd67a1da1165efe61cba4047cc1b4a526019da609fcce13a1000afb5fa"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -4593,9 +4804,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "6.2.0"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e763e24ba2bf0c72bc6be883f967f794a019fafd1b86ba1daff9c91a7edd30"
+checksum = "e35d7b402e273544cc08e0824aa3404333fab8a90ac43589d3d5b72f4b346e12"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4606,12 +4817,12 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "7.2.0"
+version = "7.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756feca3afcbb1487a1d01f4ecd94cf8ec98ea074c55a69e7136d29fb6166029"
+checksum = "c1669d81dfabd1b5f8e2856b8bbe146c6192b0ba22162edc738ac0a5de18f054"
 dependencies = [
  "globset",
- "sha2 0.9.9",
+ "sha2 0.10.6",
  "walkdir",
 ]
 
@@ -4679,9 +4890,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
  "base64",
 ]
@@ -4704,9 +4915,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "safe_arch"
@@ -4753,9 +4964,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
+checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -4765,9 +4976,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
+checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4787,6 +4998,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
 [[package]]
 name = "scrypt"
 version = "0.7.0"
@@ -4852,9 +5069,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.6.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -4899,18 +5116,18 @@ checksum = "5a9f47faea3cad316faa914d013d24f471cd90bfca1a0c70f05a3f42c6441e99"
 
 [[package]]
 name = "serde"
-version = "1.0.138"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.138"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4939,9 +5156,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.82"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
  "indexmap",
  "itoa",
@@ -4951,18 +5168,18 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7868ad3b8196a8a0aea99a8220b124278ee5320a55e4fde97794b6f85b1a377"
+checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_repr"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed"
+checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4983,9 +5200,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
  "indexmap",
  "ryu",
@@ -5053,7 +5270,18 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.3",
+ "digest 0.10.5",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.5",
 ]
 
 [[package]]
@@ -5071,13 +5299,13 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.2"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.3",
+ "digest 0.10.5",
 ]
 
 [[package]]
@@ -5091,11 +5319,11 @@ dependencies = [
 
 [[package]]
 name = "shellexpand"
-version = "2.1.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829"
+checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
 dependencies = [
- "dirs-next",
+ "dirs 4.0.0",
 ]
 
 [[package]]
@@ -5181,9 +5409,12 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg 1.1.0",
+]
 
 [[package]]
 name = "slice-group-by"
@@ -5204,9 +5435,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "smol"
@@ -5246,9 +5477,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -5268,9 +5499,9 @@ checksum = "be6c3f39c37a4283ee4b43d1311c828f2e1fb0541e76ea0cb1a2abd9ef2f5b3b"
 
 [[package]]
 name = "sqlformat"
-version = "0.1.8"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4"
+checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a"
 dependencies = [
  "itertools",
  "nom",
@@ -5279,9 +5510,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4"
+checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -5289,19 +5520,20 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093"
+checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105"
 dependencies = [
  "ahash",
  "atoi",
  "base64",
  "bitflags",
  "byteorder",
- "bytes",
+ "bytes 1.2.1",
  "crc",
  "crossbeam-queue",
  "dirs 4.0.0",
+ "dotenvy",
  "either",
  "event-listener",
  "futures-channel",
@@ -5326,34 +5558,34 @@ dependencies = [
  "rustls-pemfile",
  "serde",
  "serde_json",
- "sha-1 0.10.0",
- "sha2 0.10.2",
+ "sha1",
+ "sha2 0.10.6",
  "smallvec",
  "sqlformat",
  "sqlx-rt",
  "stringprep",
  "thiserror",
- "time 0.3.11",
+ "time 0.3.15",
  "tokio-stream",
  "url",
- "uuid 1.1.2",
- "webpki-roots 0.22.3",
+ "uuid 1.2.1",
+ "webpki-roots 0.22.5",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-macros"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f"
+checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9"
 dependencies = [
- "dotenv",
+ "dotenvy",
  "either",
  "heck 0.4.0",
  "once_cell",
  "proc-macro2",
  "quote",
- "sha2 0.10.2",
+ "sha2 0.10.6",
  "sqlx-core",
  "sqlx-rt",
  "syn",
@@ -5362,9 +5594,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-rt"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f"
+checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396"
 dependencies = [
  "once_cell",
  "tokio",
@@ -5459,9 +5691,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5551,7 +5783,7 @@ dependencies = [
  "context_menu",
  "dirs 4.0.0",
  "editor",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "itertools",
  "lazy_static",
@@ -5607,9 +5839,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 
 [[package]]
 name = "theme"
@@ -5644,18 +5876,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5701,9 +5933,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.11"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217"
+checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c"
 dependencies = [
  "itoa",
  "libc",
@@ -5762,16 +5994,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.19.2"
+version = "1.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
 dependencies = [
- "bytes",
+ "autocfg 1.1.0",
+ "bytes 1.2.1",
  "libc",
  "memchr",
  "mio 0.8.4",
  "num_cpus",
- "once_cell",
  "parking_lot 0.12.1",
  "pin-project-lite 0.2.9",
  "signal-hook-registry",
@@ -5780,6 +6012,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "tokio-io"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
+dependencies = [
+ "bytes 0.4.12",
+ "futures 0.1.31",
+ "log",
+]
+
 [[package]]
 name = "tokio-io-timeout"
 version = "1.2.0"
@@ -5824,9 +6067,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
+checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.9",
@@ -5835,14 +6078,14 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.17.1"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
 dependencies = [
  "futures-util",
  "log",
  "tokio",
- "tungstenite 0.17.2",
+ "tungstenite 0.17.3",
 ]
 
 [[package]]
@@ -5851,7 +6094,7 @@ version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "futures-core",
  "futures-sink",
  "log",
@@ -5861,12 +6104,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
 dependencies = [
- "bytes",
+ "bytes 1.2.1",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "pin-project-lite 0.2.9",
  "tokio",
@@ -5891,7 +6135,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "base64",
- "bytes",
+ "bytes 1.2.1",
  "futures-core",
  "futures-util",
  "h2",
@@ -5927,7 +6171,7 @@ dependencies = [
  "rand 0.8.5",
  "slab",
  "tokio",
- "tokio-util 0.7.3",
+ "tokio-util 0.7.4",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -5940,7 +6184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
 dependencies = [
  "bitflags",
- "bytes",
+ "bytes 1.2.1",
  "futures-core",
  "futures-util",
  "http",
@@ -5966,9 +6210,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.35"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -5979,9 +6223,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5990,9 +6234,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -6031,12 +6275,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.14"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a713421342a5a666b7577783721d3117f1b69a393df803ee17bb73b1e122a59"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
 dependencies = [
- "ansi_term",
  "matchers",
+ "nu-ansi-term",
  "once_cell",
  "regex",
  "serde",
@@ -6061,9 +6305,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-c"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bdc5574c6cbc39c409246caeb1dd4d3c4bd6d30d4e9b399776086c20365fd24"
+checksum = "cca211f4827d4b4dc79f388bf67b6fa3bc8a8cfa642161ef24f99f371ba34c7b"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -6219,7 +6463,7 @@ checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1"
 dependencies = [
  "base64",
  "byteorder",
- "bytes",
+ "bytes 1.2.1",
  "http",
  "httparse",
  "log",
@@ -6232,13 +6476,13 @@ dependencies = [
 
 [[package]]
 name = "tungstenite"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
  "base64",
  "byteorder",
- "bytes",
+ "bytes 1.2.1",
  "http",
  "httparse",
  "log",
@@ -6257,9 +6501,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"
+checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
 
 [[package]]
 name = "unicase"
@@ -6296,30 +6540,30 @@ checksum = "7f9af028e052a610d99e066b33304625dea9613170a2563314490a4e6ec5cf7f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-script"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dd944fd05f2f0b5c674917aea8a4df6af84f2d8de3fe8d988b95d28fb8fb09"
+checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
 
 [[package]]
 name = "unicode-vo"
@@ -6329,15 +6573,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unicode_categories"
@@ -6347,9 +6591,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unindent"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44"
+checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112"
 
 [[package]]
 name = "untrusted"
@@ -6359,13 +6603,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
  "form_urlencoded",
  "idna",
- "matches",
  "percent-encoding",
  "serde",
 ]
@@ -6414,7 +6657,7 @@ name = "util"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "futures",
+ "futures 0.3.24",
  "git2",
  "lazy_static",
  "log",
@@ -6434,9 +6677,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
 dependencies = [
  "getrandom 0.2.7",
 ]
@@ -6484,6 +6727,8 @@ name = "vim"
 version = "0.1.0"
 dependencies = [
  "assets",
+ "async-compat",
+ "async-trait",
  "collections",
  "command_palette",
  "editor",
@@ -6492,10 +6737,13 @@ dependencies = [
  "itertools",
  "language",
  "log",
+ "nvim-rs",
  "project",
  "search",
  "serde",
+ "serde_json",
  "settings",
+ "tokio",
  "util",
  "workspace",
 ]
@@ -6567,9 +6815,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi-cap-std-sync"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c4e73ed64b92ae87b416f4274b3c827180b02b67f835f66a86fc4267b77349"
+checksum = "f086c5026d2fc3b268d138e65373f46422cc810f46d6e0776859c5027cb18728"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6591,9 +6839,9 @@ dependencies = [
 
 [[package]]
 name = "wasi-common"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc983eb93607a61f64152ec8728bf453f4dfdf22e7ab1784faac3297fe9a035e"
+checksum = "4e8844fede1c3787cc08853872f47e8bd91f6c939c7406bc7a5dba496b260c08"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -6609,9 +6857,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -6619,13 +6867,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -6634,9 +6882,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.31"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -6646,9 +6894,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6656,9 +6904,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6669,15 +6917,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.81"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.14.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61"
+checksum = "c64ac98d5d61192cc45c701b7e4bd0b9aff91e2edfc7a088406cfe2288581e2c"
 dependencies = [
  "leb128",
 ]
@@ -6693,9 +6941,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e76e2b2833bb0ece666ccdbed7b71b617d447da11f1bb61f4f2bab2648f745ee"
+checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6706,7 +6954,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "object",
+ "object 0.28.4",
  "once_cell",
  "paste",
  "psm",
@@ -6727,9 +6975,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743a9f142d93318262d7e1fe329394ff2e8f86a1df45ae5e4f0eedba215ca5ce"
+checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2"
 dependencies = [
  "anyhow",
  "base64",
@@ -6747,9 +6995,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc0f80afa1ce97083a7168e6b6948d015d6237369e9f4a511d38c9c4ac8fbb9"
+checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -6760,7 +7008,7 @@ dependencies = [
  "gimli",
  "log",
  "more-asserts",
- "object",
+ "object 0.28.4",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -6769,9 +7017,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0816d9365196f1f447060087e0f87239ccded830bd54970a1168b0c9c8e824c9"
+checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6"
 dependencies = [
  "anyhow",
  "cranelift-entity",
@@ -6779,7 +7027,7 @@ dependencies = [
  "indexmap",
  "log",
  "more-asserts",
- "object",
+ "object 0.28.4",
  "serde",
  "target-lexicon",
  "thiserror",
@@ -6789,9 +7037,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-fiber"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715afdb87a3bcf1eae3f098c742d650fb783abdb8a7ca87076ea1cabecabea5d"
+checksum = "3248be3c4911233535356025f6562193614a40155ee9094bb6a2b43f0dc82803"
 dependencies = [
  "cc",
  "rustix",
@@ -6800,9 +7048,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c687f33cfa0f89ec1646929d0ff102087052cf9f0d15533de56526b0da0d1b3"
+checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49"
 dependencies = [
  "addr2line",
  "anyhow",
@@ -6812,7 +7060,7 @@ dependencies = [
  "gimli",
  "ittapi-rs",
  "log",
- "object",
+ "object 0.28.4",
  "region",
  "rustc-demangle",
  "rustix",
@@ -6827,20 +7075,20 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b252d1d025f94f3954ba2111f12f3a22826a0764a11c150c2d46623115a69e27"
+checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac"
 dependencies = [
  "lazy_static",
- "object",
+ "object 0.28.4",
  "rustix",
 ]
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace251693103c9facbbd7df87a29a75e68016e48bc83c09133f2fda6b575e0ab"
+checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -6865,9 +7113,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-types"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d129b0487a95986692af8708ffde9c50b0568dcefd79200941d475713b4f40bb"
+checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -6877,9 +7125,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb49791530b3a3375897a6d5a8bfa9914101ef8a672d01c951e70b46fd953c15"
+checksum = "b68b7d77fb6f2975a6fe6cc4d0015d6b0cebb65c39fce1dd4cc00880dbf7789c"
 dependencies = [
  "anyhow",
  "wasi-cap-std-sync",
@@ -6899,9 +7147,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "43.0.0"
+version = "47.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408feaebf6dbf9d154957873b14d00e8fba4cbc17a8cbb1bc9e4c1db425c50a8"
+checksum = "02b98502f3978adea49551e801a6687678e6015317d7d9470a67fe813393f2a8"
 dependencies = [
  "leb128",
  "memchr",
@@ -6911,18 +7159,18 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.0.45"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b70bfff0cfaf33dc9d641196dbcd0023a2da8b4b9030c59535cb44e2884983b"
+checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898"
 dependencies = [
- "wast 43.0.0",
+ "wast 47.0.1",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.58"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6959,18 +7207,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
+checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
 dependencies = [
  "webpki 0.22.0",
 ]
 
 [[package]]
 name = "weezl"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c97e489d8f836838d497091de568cf16b117486d529ec5579233521065bd5e4"
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
 name = "wepoll-ffi"
@@ -6983,30 +7231,31 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.2.5"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 dependencies = [
  "either",
- "lazy_static",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
 name = "whoami"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8"
+checksum = "d6631b6a2fd59b1841b622e8f1a7ad241ef0a46f2d580464ce8140ac94cbd571"
 dependencies = [
+ "bumpalo",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wiggle"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91c38020359fabec5e5ce5a3f667af72e9a203bc6fe8caeb8931d3a870754d9d"
+checksum = "67dadac11343d2aabc8a906a0db0aaf7cb5046ec3d6fffccdaf2847dccdef8d6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7019,9 +7268,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-generate"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc4e4420b496b04920ae3e41424029aba95c15a5e2e2b4012d14ec83770a3ef"
+checksum = "63a1dccd6b3fbd9a27417f5d30ce9aa3ee9cf529aad453abbf88a49c5d605b79"
 dependencies = [
  "anyhow",
  "heck 0.4.0",
@@ -7034,9 +7283,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-macro"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e541a0be1f2c4d53471d8a9df81c2d8725a3f023d8259f555c65b03d515aaab"
+checksum = "f1c368d57d9560c34deaa67e06b0953ccf65edb906c525e5a2c866c849b48ec2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7181,7 +7430,7 @@ dependencies = [
  "collections",
  "context_menu",
  "drag_and_drop",
- "futures",
+ "futures 0.3.24",
  "gpui",
  "language",
  "log",
@@ -7265,7 +7514,7 @@ dependencies = [
  "env_logger",
  "file_finder",
  "fsevent",
- "futures",
+ "futures 0.3.24",
  "fuzzy",
  "go_to_line",
  "gpui",
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 5262daab5f..651484afcd 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -38,7 +38,23 @@
                 }
             ],
             "%": "vim::Matching",
-            "escape": "editor::Cancel"
+            "escape": "editor::Cancel",
+            "i": [
+                "vim::PushOperator",
+                {
+                    "Object": {
+                        "around": false
+                    }
+                }
+            ],
+            "a": [
+                "vim::PushOperator",
+                {
+                    "Object": {
+                        "around": true
+                    }
+                }
+            ]
         }
     },
     {
@@ -134,6 +150,20 @@
             "y": "vim::CurrentLine"
         }
     },
+    {
+        "context": "Editor && VimObject",
+        "bindings": {
+            "w": "vim::Word",
+            "shift-w": [
+                "vim::Word",
+                {
+                    "ignorePunctuation": true
+                }
+            ],
+            "s": "vim::Sentence",
+            "p": "vim::Paragraph"
+        }
+    },
     {
         "context": "Editor && vim_mode == visual",
         "bindings": {
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 58fc2e4fe7..ac85bf68ee 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -330,34 +330,91 @@ impl DisplaySnapshot {
         DisplayPoint(self.blocks_snapshot.max_point())
     }
 
+    /// Returns text chunks starting at the given display row until the end of the file
     pub fn text_chunks(&self, display_row: u32) -> impl Iterator<Item = &str> {
         self.blocks_snapshot
             .chunks(display_row..self.max_point().row() + 1, false, None)
             .map(|h| h.text)
     }
 
+    // Returns text chunks starting at the end of the given display row in reverse until the start of the file
+    pub fn reverse_text_chunks(&self, display_row: u32) -> impl Iterator<Item = &str> {
+        (0..=display_row).into_iter().rev().flat_map(|row| {
+            self.blocks_snapshot
+                .chunks(row..row + 1, false, None)
+                .map(|h| h.text)
+                .collect::<Vec<_>>()
+                .into_iter()
+                .rev()
+        })
+    }
+
     pub fn chunks(&self, display_rows: Range<u32>, language_aware: bool) -> DisplayChunks<'_> {
         self.blocks_snapshot
             .chunks(display_rows, language_aware, Some(&self.text_highlights))
     }
 
-    pub fn chars_at(&self, point: DisplayPoint) -> impl Iterator<Item = char> + '_ {
-        let mut column = 0;
-        let mut chars = self.text_chunks(point.row()).flat_map(str::chars);
-        while column < point.column() {
-            if let Some(c) = chars.next() {
-                column += c.len_utf8() as u32;
-            } else {
-                break;
-            }
-        }
-        chars
+    pub fn chars_at(
+        &self,
+        mut point: DisplayPoint,
+    ) -> impl Iterator<Item = (char, DisplayPoint)> + '_ {
+        point = DisplayPoint(self.blocks_snapshot.clip_point(point.0, Bias::Left));
+        self.text_chunks(point.row())
+            .flat_map(str::chars)
+            .skip_while({
+                let mut column = 0;
+                move |char| {
+                    let at_point = column >= point.column();
+                    column += char.len_utf8() as u32;
+                    !at_point
+                }
+            })
+            .map(move |ch| {
+                let result = (ch, point);
+                if ch == '\n' {
+                    *point.row_mut() += 1;
+                    *point.column_mut() = 0;
+                } else {
+                    *point.column_mut() += ch.len_utf8() as u32;
+                }
+                result
+            })
+    }
+
+    pub fn reverse_chars_at(
+        &self,
+        mut point: DisplayPoint,
+    ) -> impl Iterator<Item = (char, DisplayPoint)> + '_ {
+        point = DisplayPoint(self.blocks_snapshot.clip_point(point.0, Bias::Left));
+        self.reverse_text_chunks(point.row())
+            .flat_map(|chunk| chunk.chars().rev())
+            .skip_while({
+                let mut column = self.line_len(point.row());
+                if self.max_point().row() > point.row() {
+                    column += 1;
+                }
+
+                move |char| {
+                    let at_point = column <= point.column();
+                    column = column.saturating_sub(char.len_utf8() as u32);
+                    !at_point
+                }
+            })
+            .map(move |ch| {
+                if ch == '\n' {
+                    *point.row_mut() -= 1;
+                    *point.column_mut() = self.line_len(point.row());
+                } else {
+                    *point.column_mut() = point.column().saturating_sub(ch.len_utf8() as u32);
+                }
+                (ch, point)
+            })
     }
 
     pub fn column_to_chars(&self, display_row: u32, target: u32) -> u32 {
         let mut count = 0;
         let mut column = 0;
-        for c in self.chars_at(DisplayPoint::new(display_row, 0)) {
+        for (c, _) in self.chars_at(DisplayPoint::new(display_row, 0)) {
             if column >= target {
                 break;
             }
@@ -370,7 +427,7 @@ impl DisplaySnapshot {
     pub fn column_from_chars(&self, display_row: u32, char_count: u32) -> u32 {
         let mut column = 0;
 
-        for (count, c) in self.chars_at(DisplayPoint::new(display_row, 0)).enumerate() {
+        for (count, (c, _)) in self.chars_at(DisplayPoint::new(display_row, 0)).enumerate() {
             if c == '\n' || count >= char_count as usize {
                 break;
             }
@@ -454,7 +511,7 @@ impl DisplaySnapshot {
     pub fn line_indent(&self, display_row: u32) -> (u32, bool) {
         let mut indent = 0;
         let mut is_blank = true;
-        for c in self.chars_at(DisplayPoint::new(display_row, 0)) {
+        for (c, _) in self.chars_at(DisplayPoint::new(display_row, 0)) {
             if c == ' ' {
                 indent += 1;
             } else {
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1abe65d482..e59b024ebc 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4074,7 +4074,7 @@ impl Editor {
         self.change_selections(Some(Autoscroll::Fit), cx, |s| {
             s.move_cursors_with(|map, head, _| {
                 (
-                    movement::line_beginning(map, head, true),
+                    movement::indented_line_beginning(map, head, true),
                     SelectionGoal::None,
                 )
             });
@@ -4089,7 +4089,7 @@ impl Editor {
         self.change_selections(Some(Autoscroll::Fit), cx, |s| {
             s.move_heads_with(|map, head, _| {
                 (
-                    movement::line_beginning(map, head, action.stop_at_soft_wraps),
+                    movement::indented_line_beginning(map, head, action.stop_at_soft_wraps),
                     SelectionGoal::None,
                 )
             });
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index acf2e5887c..42bb027283 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -752,7 +752,7 @@ impl EditorElement {
                                 .snapshot
                                 .chars_at(cursor_position)
                                 .next()
-                                .and_then(|character| {
+                                .and_then(|(character, _)| {
                                     let font_id =
                                         cursor_row_layout.font_for_index(cursor_column)?;
                                     let text = character.to_string();
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 0db5cc0812..9261a6d445 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -101,6 +101,22 @@ pub fn line_beginning(
     map: &DisplaySnapshot,
     display_point: DisplayPoint,
     stop_at_soft_boundaries: bool,
+) -> DisplayPoint {
+    let point = display_point.to_point(map);
+    let soft_line_start = map.clip_point(DisplayPoint::new(display_point.row(), 0), Bias::Right);
+    let line_start = map.prev_line_boundary(point).1;
+
+    if stop_at_soft_boundaries && display_point != soft_line_start {
+        soft_line_start
+    } else {
+        line_start
+    }
+}
+
+pub fn indented_line_beginning(
+    map: &DisplaySnapshot,
+    display_point: DisplayPoint,
+    stop_at_soft_boundaries: bool,
 ) -> DisplayPoint {
     let point = display_point.to_point(map);
     let soft_line_start = map.clip_point(DisplayPoint::new(display_point.row(), 0), Bias::Right);
@@ -167,54 +183,79 @@ pub fn next_subword_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPo
     })
 }
 
-/// Scans for a boundary from the start of each line preceding the given end point until a boundary
-/// is found, indicated by the given predicate returning true. The predicate is called with the
-/// character to the left and right of the candidate boundary location, and will be called with `\n`
-/// characters indicating the start or end of a line. If the predicate returns true multiple times
-/// on a line, the *rightmost* boundary is returned.
+/// Scans for a boundary preceding the given start point `from` until a boundary is found, indicated by the
+/// given predicate returning true. The predicate is called with the character to the left and right
+/// of the candidate boundary location, and will be called with `\n` characters indicating the start
+/// or end of a line.
 pub fn find_preceding_boundary(
     map: &DisplaySnapshot,
-    end: DisplayPoint,
+    from: DisplayPoint,
     mut is_boundary: impl FnMut(char, char) -> bool,
 ) -> DisplayPoint {
-    let mut point = end;
-    loop {
-        *point.column_mut() = 0;
-        if point.row() > 0 {
-            if let Some(indent) = map.soft_wrap_indent(point.row() - 1) {
-                *point.column_mut() = indent;
+    let mut start_column = 0;
+    let mut soft_wrap_row = from.row() + 1;
+
+    let mut prev = None;
+    for (ch, point) in map.reverse_chars_at(from) {
+        // Recompute soft_wrap_indent if the row has changed
+        if point.row() != soft_wrap_row {
+            soft_wrap_row = point.row();
+
+            if point.row() == 0 {
+                start_column = 0;
+            } else if let Some(indent) = map.soft_wrap_indent(point.row() - 1) {
+                start_column = indent;
             }
         }
 
-        let mut boundary = None;
-        let mut prev_ch = if point.is_zero() { None } else { Some('\n') };
-        for ch in map.chars_at(point) {
-            if point >= end {
-                break;
-            }
-
-            if let Some(prev_ch) = prev_ch {
-                if is_boundary(prev_ch, ch) {
-                    boundary = Some(point);
-                }
-            }
-
-            if ch == '\n' {
-                break;
-            }
-
-            prev_ch = Some(ch);
-            *point.column_mut() += ch.len_utf8() as u32;
+        // If the current point is in the soft_wrap, skip comparing it
+        if point.column() < start_column {
+            continue;
         }
 
-        if let Some(boundary) = boundary {
-            return boundary;
-        } else if point.row() == 0 {
-            return DisplayPoint::zero();
-        } else {
-            *point.row_mut() -= 1;
+        if let Some((prev_ch, prev_point)) = prev {
+            if is_boundary(ch, prev_ch) {
+                return prev_point;
+            }
+        }
+
+        prev = Some((ch, point));
+    }
+    DisplayPoint::zero()
+}
+
+/// Scans for a boundary preceding the given start point `from` until a boundary is found, indicated by the
+/// given predicate returning true. The predicate is called with the character to the left and right
+/// of the candidate boundary location, and will be called with `\n` characters indicating the start
+/// or end of a line. If no boundary is found, the start of the line is returned.
+pub fn find_preceding_boundary_in_line(
+    map: &DisplaySnapshot,
+    from: DisplayPoint,
+    mut is_boundary: impl FnMut(char, char) -> bool,
+) -> DisplayPoint {
+    let mut start_column = 0;
+    if from.row() > 0 {
+        if let Some(indent) = map.soft_wrap_indent(from.row() - 1) {
+            start_column = indent;
         }
     }
+
+    let mut prev = None;
+    for (ch, point) in map.reverse_chars_at(from) {
+        if let Some((prev_ch, prev_point)) = prev {
+            if is_boundary(ch, prev_ch) {
+                return prev_point;
+            }
+        }
+
+        if ch == '\n' || point.column() < start_column {
+            break;
+        }
+
+        prev = Some((ch, point));
+    }
+
+    prev.map(|(_, point)| point).unwrap_or(from)
 }
 
 /// Scans for a boundary following the given start point until a boundary is found, indicated by the
@@ -223,26 +264,48 @@ pub fn find_preceding_boundary(
 /// or end of a line.
 pub fn find_boundary(
     map: &DisplaySnapshot,
-    mut point: DisplayPoint,
+    from: DisplayPoint,
     mut is_boundary: impl FnMut(char, char) -> bool,
 ) -> DisplayPoint {
     let mut prev_ch = None;
-    for ch in map.chars_at(point) {
+    for (ch, point) in map.chars_at(from) {
         if let Some(prev_ch) = prev_ch {
             if is_boundary(prev_ch, ch) {
-                break;
+                return map.clip_point(point, Bias::Right);
             }
         }
 
-        if ch == '\n' {
-            *point.row_mut() += 1;
-            *point.column_mut() = 0;
-        } else {
-            *point.column_mut() += ch.len_utf8() as u32;
-        }
         prev_ch = Some(ch);
     }
-    map.clip_point(point, Bias::Right)
+    map.clip_point(map.max_point(), Bias::Right)
+}
+
+/// Scans for a boundary following the given start point until a boundary is found, indicated by the
+/// given predicate returning true. The predicate is called with the character to the left and right
+/// of the candidate boundary location, and will be called with `\n` characters indicating the start
+/// or end of a line. If no boundary is found, the end of the line is returned
+pub fn find_boundary_in_line(
+    map: &DisplaySnapshot,
+    from: DisplayPoint,
+    mut is_boundary: impl FnMut(char, char) -> bool,
+) -> DisplayPoint {
+    let mut prev = None;
+    for (ch, point) in map.chars_at(from) {
+        if let Some((prev_ch, _)) = prev {
+            if is_boundary(prev_ch, ch) {
+                return map.clip_point(point, Bias::Right);
+            }
+        }
+
+        prev = Some((ch, point));
+
+        if ch == '\n' {
+            break;
+        }
+    }
+
+    // Return the last position checked so that we give a point right before the newline or eof.
+    map.clip_point(prev.map(|(_, point)| point).unwrap_or(from), Bias::Right)
 }
 
 pub fn is_inside_word(map: &DisplaySnapshot, point: DisplayPoint) -> bool {
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 5bc32cd5bd..6b72383fdb 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -7,7 +7,20 @@ edition = "2021"
 path = "src/vim.rs"
 doctest = false
 
+[features]
+neovim = ["nvim-rs", "async-compat", "async-trait", "tokio"]
+
 [dependencies]
+serde = { version = "1.0", features = ["derive", "rc"] }
+itertools = "0.10"
+log = { version = "0.4.16", features = ["kv_unstable_serde"] }
+
+async-compat = { version = "0.2.1", "optional" = true }
+async-trait = { version = "0.1", "optional" = true }
+nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true }
+tokio = { version = "1.15", "optional" = true }
+serde_json = { version = "1.0", features = ["preserve_order"] }
+
 assets = { path = "../assets" }
 collections = { path = "../collections" }
 command_palette = { path = "../command_palette" }
@@ -15,14 +28,12 @@ editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 language = { path = "../language" }
 search = { path = "../search" }
-serde = { version = "1.0", features = ["derive", "rc"] }
 settings = { path = "../settings" }
 workspace = { path = "../workspace" }
-itertools = "0.10"
-log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 
 [dev-dependencies]
 indoc = "1.0.4"
+
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
index a1d1c7b404..1b9b299bf3 100644
--- a/crates/vim/src/insert.rs
+++ b/crates/vim/src/insert.rs
@@ -26,7 +26,7 @@ fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext<Works
 
 #[cfg(test)]
 mod test {
-    use crate::{state::Mode, vim_test_context::VimTestContext};
+    use crate::{state::Mode, test_contexts::VimTestContext};
 
     #[gpui::test]
     async fn test_enter_and_exit_insert_mode(cx: &mut gpui::TestAppContext) {
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index b4667278ba..b4457e261b 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -206,7 +206,7 @@ impl Motion {
                 }
             }
 
-            selection.end = map.next_line_boundary(selection.end.to_point(map)).1;
+            (_, selection.end) = map.next_line_boundary(selection.end.to_point(map));
         } else {
             // If the motion is exclusive and the end of the motion is in column 1, the
             // end of the motion is moved to the end of the previous line and the motion
@@ -239,12 +239,12 @@ fn left(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
     map.clip_point(point, Bias::Left)
 }
 
-fn right(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
+pub(crate) fn right(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
     *point.column_mut() += 1;
     map.clip_point(point, Bias::Right)
 }
 
-fn next_word_start(
+pub(crate) fn next_word_start(
     map: &DisplaySnapshot,
     point: DisplayPoint,
     ignore_punctuation: bool,
@@ -255,7 +255,7 @@ fn next_word_start(
         let right_kind = char_kind(right).coerce_punctuation(ignore_punctuation);
         let at_newline = right == '\n';
 
-        let found = (left_kind != right_kind && !right.is_whitespace())
+        let found = (left_kind != right_kind && right_kind != CharKind::Whitespace)
             || at_newline && crossed_newline
             || at_newline && left == '\n'; // Prevents skipping repeated empty lines
 
@@ -272,23 +272,28 @@ fn next_word_end(
     ignore_punctuation: bool,
 ) -> DisplayPoint {
     *point.column_mut() += 1;
+    dbg!(point);
     point = movement::find_boundary(map, point, |left, right| {
+        dbg!(left);
         let left_kind = char_kind(left).coerce_punctuation(ignore_punctuation);
         let right_kind = char_kind(right).coerce_punctuation(ignore_punctuation);
 
-        left_kind != right_kind && !left.is_whitespace()
+        left_kind != right_kind && left_kind != CharKind::Whitespace
     });
+
+    dbg!(point);
+
     // find_boundary clips, so if the character after the next character is a newline or at the end of the document, we know
     // we have backtraced already
     if !map
         .chars_at(point)
         .nth(1)
-        .map(|c| c == '\n')
+        .map(|(c, _)| c == '\n')
         .unwrap_or(true)
     {
         *point.column_mut() = point.column().saturating_sub(1);
     }
-    map.clip_point(point, Bias::Left)
+    dbg!(map.clip_point(point, Bias::Left))
 }
 
 fn previous_word_start(
@@ -307,22 +312,21 @@ fn previous_word_start(
     point
 }
 
-fn first_non_whitespace(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
-    let mut column = 0;
-    for ch in map.chars_at(DisplayPoint::new(point.row(), 0)) {
+fn first_non_whitespace(map: &DisplaySnapshot, from: DisplayPoint) -> DisplayPoint {
+    let mut last_point = DisplayPoint::new(from.row(), 0);
+    for (ch, point) in map.chars_at(last_point) {
         if ch == '\n' {
-            return point;
+            return from;
         }
 
+        last_point = point;
+
         if char_kind(ch) != CharKind::Whitespace {
             break;
         }
-
-        column += ch.len_utf8() as u32;
     }
 
-    *point.column_mut() = column;
-    map.clip_point(point, Bias::Left)
+    map.clip_point(last_point, Bias::Left)
 }
 
 fn start_of_line(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index db5583b4ce..5345586743 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -6,6 +6,7 @@ use std::borrow::Cow;
 
 use crate::{
     motion::Motion,
+    object::Object,
     state::{Mode, Operator},
     Vim,
 };
@@ -16,7 +17,11 @@ use gpui::{actions, MutableAppContext, ViewContext};
 use language::{AutoindentMode, Point, SelectionGoal};
 use workspace::Workspace;
 
-use self::{change::change_over, delete::delete_over, yank::yank_over};
+use self::{
+    change::{change_motion, change_object},
+    delete::{delete_motion, delete_object},
+    yank::{yank_motion, yank_object},
+};
 
 actions!(
     vim,
@@ -43,22 +48,22 @@ pub fn init(cx: &mut MutableAppContext) {
     cx.add_action(insert_line_below);
     cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
         Vim::update(cx, |vim, cx| {
-            delete_over(vim, Motion::Left, cx);
+            delete_motion(vim, Motion::Left, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| {
         Vim::update(cx, |vim, cx| {
-            delete_over(vim, Motion::Right, cx);
+            delete_motion(vim, Motion::Right, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
-            change_over(vim, Motion::EndOfLine, cx);
+            change_motion(vim, Motion::EndOfLine, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
-            delete_over(vim, Motion::EndOfLine, cx);
+            delete_motion(vim, Motion::EndOfLine, cx);
         })
     });
     cx.add_action(paste);
@@ -70,17 +75,36 @@ pub fn normal_motion(motion: Motion, cx: &mut MutableAppContext) {
     Vim::update(cx, |vim, cx| {
         match vim.state.operator_stack.pop() {
             None => move_cursor(vim, motion, cx),
-            Some(Operator::Namespace(_)) => {
-                // Can't do anything for a namespace operator. Ignoring
+            Some(Operator::Change) => change_motion(vim, motion, cx),
+            Some(Operator::Delete) => delete_motion(vim, motion, cx),
+            Some(Operator::Yank) => yank_motion(vim, motion, cx),
+            _ => {
+                // Can't do anything for text objects or namespace operators. Ignoring
             }
-            Some(Operator::Change) => change_over(vim, motion, cx),
-            Some(Operator::Delete) => delete_over(vim, motion, cx),
-            Some(Operator::Yank) => yank_over(vim, motion, cx),
         }
         vim.clear_operator(cx);
     });
 }
 
+pub fn normal_object(object: Object, cx: &mut MutableAppContext) {
+    Vim::update(cx, |vim, cx| {
+        match vim.state.operator_stack.pop() {
+            Some(Operator::Object { around }) => match vim.state.operator_stack.pop() {
+                Some(Operator::Change) => change_object(vim, object, around, cx),
+                Some(Operator::Delete) => delete_object(vim, object, around, cx),
+                Some(Operator::Yank) => yank_object(vim, object, around, cx),
+                _ => {
+                    // Can't do anything for namespace operators. Ignoring
+                }
+            },
+            _ => {
+                // Can't do anything with change/delete/yank and text objects. Ignoring
+            }
+        }
+        vim.clear_operator(cx);
+    })
+}
+
 fn move_cursor(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
     vim.update_active_editor(cx, |editor, cx| {
         editor.change_selections(Some(Autoscroll::Fit), cx, |s| {
@@ -304,7 +328,7 @@ mod test {
             Mode::{self, *},
             Namespace, Operator,
         },
-        vim_test_context::VimTestContext,
+        test_contexts::VimTestContext,
     };
 
     #[gpui::test]
diff --git a/crates/vim/src/normal/change.rs b/crates/vim/src/normal/change.rs
index 8695c9668b..6835ea3b1c 100644
--- a/crates/vim/src/normal/change.rs
+++ b/crates/vim/src/normal/change.rs
@@ -1,4 +1,4 @@
-use crate::{motion::Motion, state::Mode, utils::copy_selections_content, Vim};
+use crate::{motion::Motion, object::Object, state::Mode, utils::copy_selections_content, Vim};
 use editor::{char_kind, movement, Autoscroll};
 use gpui::{impl_actions, MutableAppContext, ViewContext};
 use serde::Deserialize;
@@ -17,7 +17,7 @@ pub fn init(cx: &mut MutableAppContext) {
     cx.add_action(change_word);
 }
 
-pub fn change_over(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
+pub fn change_motion(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
     vim.update_active_editor(cx, |editor, cx| {
         editor.transact(cx, |editor, cx| {
             // We are swapping to insert mode anyway. Just set the line end clipping behavior now
@@ -34,6 +34,23 @@ pub fn change_over(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
     vim.switch_mode(Mode::Insert, false, cx)
 }
 
+pub fn change_object(vim: &mut Vim, object: Object, around: bool, cx: &mut MutableAppContext) {
+    vim.update_active_editor(cx, |editor, cx| {
+        editor.transact(cx, |editor, cx| {
+            // We are swapping to insert mode anyway. Just set the line end clipping behavior now
+            editor.set_clip_at_line_ends(false, cx);
+            editor.change_selections(Some(Autoscroll::Fit), cx, |s| {
+                s.move_with(|map, selection| {
+                    object.expand_selection(map, selection, around);
+                });
+            });
+            copy_selections_content(editor, false, cx);
+            editor.insert("", cx);
+        });
+    });
+    vim.switch_mode(Mode::Insert, false, cx);
+}
+
 // From the docs https://vimhelp.org/change.txt.html#cw
 // Special case: When the cursor is in a word, "cw" and "cW" do not include the
 // white space after a word, they only change up to the end of the word. This is
@@ -78,7 +95,7 @@ fn change_word(
 mod test {
     use indoc::indoc;
 
-    use crate::{state::Mode, vim_test_context::VimTestContext};
+    use crate::{state::Mode, test_contexts::VimTestContext};
 
     #[gpui::test]
     async fn test_change_h(cx: &mut gpui::TestAppContext) {
@@ -170,8 +187,7 @@ mod test {
                 test"},
             indoc! {"
                 Test test
-                ˇ
-                test"},
+                ˇ"},
         );
 
         let mut cx = cx.binding(["c", "shift-e"]);
@@ -193,6 +209,7 @@ mod test {
                 Test ˇ
                 test"},
         );
+        println!("Marker");
         cx.assert(
             indoc! {"
                 Test test
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index b2e228bdb1..e410024aea 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -1,9 +1,9 @@
-use crate::{motion::Motion, utils::copy_selections_content, Vim};
-use collections::HashMap;
-use editor::{Autoscroll, Bias};
+use crate::{motion::Motion, object::Object, utils::copy_selections_content, Vim};
+use collections::{HashMap, HashSet};
+use editor::{display_map::ToDisplayPoint, Autoscroll, Bias};
 use gpui::MutableAppContext;
 
-pub fn delete_over(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
+pub fn delete_motion(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
     vim.update_active_editor(cx, |editor, cx| {
         editor.transact(cx, |editor, cx| {
             editor.set_clip_at_line_ends(false, cx);
@@ -36,11 +36,67 @@ pub fn delete_over(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
     });
 }
 
+pub fn delete_object(vim: &mut Vim, object: Object, around: bool, cx: &mut MutableAppContext) {
+    vim.update_active_editor(cx, |editor, cx| {
+        editor.transact(cx, |editor, cx| {
+            editor.set_clip_at_line_ends(false, cx);
+            // Emulates behavior in vim where if we expanded backwards to include a newline
+            // the cursor gets set back to the start of the line
+            let mut should_move_to_start: HashSet<_> = Default::default();
+            editor.change_selections(Some(Autoscroll::Fit), cx, |s| {
+                s.move_with(|map, selection| {
+                    object.expand_selection(map, selection, around);
+                    let offset_range = selection.map(|p| p.to_offset(map, Bias::Left)).range();
+                    let contains_only_newlines = map
+                        .chars_at(selection.start)
+                        .take_while(|(_, p)| p < &selection.end)
+                        .all(|(char, _)| char == '\n')
+                        || offset_range.is_empty();
+                    let end_at_newline = map
+                        .chars_at(selection.end)
+                        .next()
+                        .map(|(c, _)| c == '\n')
+                        .unwrap_or(false);
+
+                    // If expanded range contains only newlines and
+                    // the object is around or sentence, expand to include a newline
+                    // at the end or start
+                    if (around || object == Object::Sentence) && contains_only_newlines {
+                        if end_at_newline {
+                            selection.end =
+                                (offset_range.end + '\n'.len_utf8()).to_display_point(map);
+                        } else if selection.start.row() > 0 {
+                            should_move_to_start.insert(selection.id);
+                            selection.start =
+                                (offset_range.start - '\n'.len_utf8()).to_display_point(map);
+                        }
+                    }
+                });
+            });
+            copy_selections_content(editor, false, cx);
+            editor.insert("", cx);
+
+            // Fixup cursor position after the deletion
+            editor.set_clip_at_line_ends(true, cx);
+            editor.change_selections(Some(Autoscroll::Fit), cx, |s| {
+                s.move_with(|map, selection| {
+                    let mut cursor = selection.head();
+                    if should_move_to_start.contains(&selection.id) {
+                        *cursor.column_mut() = 0;
+                    }
+                    cursor = map.clip_point(cursor, Bias::Left);
+                    selection.collapse_to(cursor, selection.goal)
+                });
+            });
+        });
+    });
+}
+
 #[cfg(test)]
 mod test {
     use indoc::indoc;
 
-    use crate::{state::Mode, vim_test_context::VimTestContext};
+    use crate::{state::Mode, test_contexts::VimTestContext};
 
     #[gpui::test]
     async fn test_delete_h(cx: &mut gpui::TestAppContext) {
@@ -140,8 +196,7 @@ mod test {
                 test"},
             indoc! {"
                 Test test
-                ˇ
-                test"},
+                ˇ"},
         );
 
         let mut cx = cx.binding(["d", "shift-e"]);
diff --git a/crates/vim/src/normal/yank.rs b/crates/vim/src/normal/yank.rs
index 17a9e47d3d..11f5371cc6 100644
--- a/crates/vim/src/normal/yank.rs
+++ b/crates/vim/src/normal/yank.rs
@@ -1,8 +1,8 @@
-use crate::{motion::Motion, utils::copy_selections_content, Vim};
+use crate::{motion::Motion, object::Object, utils::copy_selections_content, Vim};
 use collections::HashMap;
 use gpui::MutableAppContext;
 
-pub fn yank_over(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
+pub fn yank_motion(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
     vim.update_active_editor(cx, |editor, cx| {
         editor.transact(cx, |editor, cx| {
             editor.set_clip_at_line_ends(false, cx);
@@ -24,3 +24,26 @@ pub fn yank_over(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
         });
     });
 }
+
+pub fn yank_object(vim: &mut Vim, object: Object, around: bool, cx: &mut MutableAppContext) {
+    vim.update_active_editor(cx, |editor, cx| {
+        editor.transact(cx, |editor, cx| {
+            editor.set_clip_at_line_ends(false, cx);
+            let mut original_positions: HashMap<_, _> = Default::default();
+            editor.change_selections(None, cx, |s| {
+                s.move_with(|map, selection| {
+                    let original_position = (selection.head(), selection.goal);
+                    object.expand_selection(map, selection, around);
+                    original_positions.insert(selection.id, original_position);
+                });
+            });
+            copy_selections_content(editor, false, cx);
+            editor.change_selections(None, cx, |s| {
+                s.move_with(|_, selection| {
+                    let (head, goal) = original_positions.remove(&selection.id).unwrap();
+                    selection.collapse_to(head, goal);
+                });
+            });
+        });
+    });
+}
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
new file mode 100644
index 0000000000..5c03bda2d9
--- /dev/null
+++ b/crates/vim/src/object.rs
@@ -0,0 +1,488 @@
+use std::ops::Range;
+
+use editor::{char_kind, display_map::DisplaySnapshot, movement, Bias, CharKind, DisplayPoint};
+use gpui::{actions, impl_actions, MutableAppContext};
+use language::Selection;
+use serde::Deserialize;
+use workspace::Workspace;
+
+use crate::{motion, normal::normal_object, state::Mode, visual::visual_object, Vim};
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum Object {
+    Word { ignore_punctuation: bool },
+    Sentence,
+    Paragraph,
+}
+
+#[derive(Clone, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+struct Word {
+    #[serde(default)]
+    ignore_punctuation: bool,
+}
+
+actions!(vim, [Sentence, Paragraph]);
+impl_actions!(vim, [Word]);
+
+pub fn init(cx: &mut MutableAppContext) {
+    cx.add_action(
+        |_: &mut Workspace, &Word { ignore_punctuation }: &Word, cx: _| {
+            object(Object::Word { ignore_punctuation }, cx)
+        },
+    );
+    cx.add_action(|_: &mut Workspace, _: &Sentence, cx: _| object(Object::Sentence, cx));
+    cx.add_action(|_: &mut Workspace, _: &Paragraph, cx: _| object(Object::Paragraph, cx));
+}
+
+fn object(object: Object, cx: &mut MutableAppContext) {
+    match Vim::read(cx).state.mode {
+        Mode::Normal => normal_object(object, cx),
+        Mode::Visual { .. } => visual_object(object, cx),
+        Mode::Insert => {
+            // Shouldn't execute a text object in insert mode. Ignoring
+        }
+    }
+}
+
+impl Object {
+    pub fn object_range(
+        self,
+        map: &DisplaySnapshot,
+        relative_to: DisplayPoint,
+        around: bool,
+    ) -> Range<DisplayPoint> {
+        match self {
+            Object::Word { ignore_punctuation } => {
+                if around {
+                    around_word(map, relative_to, ignore_punctuation)
+                } else {
+                    in_word(map, relative_to, ignore_punctuation)
+                }
+            }
+            Object::Sentence => sentence(map, relative_to, around),
+            _ => relative_to..relative_to,
+        }
+    }
+
+    pub fn expand_selection(
+        self,
+        map: &DisplaySnapshot,
+        selection: &mut Selection<DisplayPoint>,
+        around: bool,
+    ) {
+        let range = self.object_range(map, selection.head(), around);
+        selection.start = range.start;
+        selection.end = range.end;
+    }
+}
+
+/// Return a range that surrounds the word relative_to is in
+/// If relative_to is at the start of a word, return the word.
+/// If relative_to is between words, return the space between
+fn in_word(
+    map: &DisplaySnapshot,
+    relative_to: DisplayPoint,
+    ignore_punctuation: bool,
+) -> Range<DisplayPoint> {
+    // Use motion::right so that we consider the character under the cursor when looking for the start
+    let start = movement::find_preceding_boundary_in_line(
+        map,
+        motion::right(map, relative_to),
+        |left, right| {
+            char_kind(left).coerce_punctuation(ignore_punctuation)
+                != char_kind(right).coerce_punctuation(ignore_punctuation)
+        },
+    );
+    let end = movement::find_boundary_in_line(map, relative_to, |left, right| {
+        char_kind(left).coerce_punctuation(ignore_punctuation)
+            != char_kind(right).coerce_punctuation(ignore_punctuation)
+    });
+
+    start..end
+}
+
+/// Return a range that surrounds the word and following whitespace
+/// relative_to is in.
+/// If relative_to is at the start of a word, return the word and following whitespace.
+/// If relative_to is between words, return the whitespace back and the following word
+
+/// if in word
+///   delete that word
+///   if there is whitespace following the word, delete that as well
+///   otherwise, delete any preceding whitespace
+/// otherwise
+///   delete whitespace around cursor
+///   delete word following the cursor
+fn around_word(
+    map: &DisplaySnapshot,
+    relative_to: DisplayPoint,
+    ignore_punctuation: bool,
+) -> Range<DisplayPoint> {
+    let in_word = map
+        .chars_at(relative_to)
+        .next()
+        .map(|(c, _)| char_kind(c) != CharKind::Whitespace)
+        .unwrap_or(false);
+
+    if in_word {
+        around_containing_word(map, relative_to, ignore_punctuation)
+    } else {
+        around_next_word(map, relative_to, ignore_punctuation)
+    }
+}
+
+fn around_containing_word(
+    map: &DisplaySnapshot,
+    relative_to: DisplayPoint,
+    ignore_punctuation: bool,
+) -> Range<DisplayPoint> {
+    expand_to_include_whitespace(map, in_word(map, relative_to, ignore_punctuation), true)
+}
+
+fn around_next_word(
+    map: &DisplaySnapshot,
+    relative_to: DisplayPoint,
+    ignore_punctuation: bool,
+) -> Range<DisplayPoint> {
+    // Get the start of the word
+    let start = movement::find_preceding_boundary_in_line(
+        map,
+        motion::right(map, relative_to),
+        |left, right| {
+            char_kind(left).coerce_punctuation(ignore_punctuation)
+                != char_kind(right).coerce_punctuation(ignore_punctuation)
+        },
+    );
+
+    let mut word_found = false;
+    let end = movement::find_boundary(map, relative_to, |left, right| {
+        let left_kind = char_kind(left).coerce_punctuation(ignore_punctuation);
+        let right_kind = char_kind(right).coerce_punctuation(ignore_punctuation);
+
+        let found = (word_found && left_kind != right_kind) || right == '\n' && left == '\n';
+
+        if right_kind != CharKind::Whitespace {
+            word_found = true;
+        }
+
+        found
+    });
+
+    start..end
+}
+
+// /// Return the range containing a sentence.
+// fn sentence(map: &DisplaySnapshot, relative_to: DisplayPoint, around: bool) -> Range<DisplayPoint> {
+//     let mut previous_end = relative_to;
+//     let mut start = None;
+
+//     // Seek backwards to find a period or double newline. Record the last non whitespace character as the
+//     // possible start of the sentence. Alternatively if two newlines are found right after each other, return that.
+//     let mut rev_chars = map.reverse_chars_at(relative_to).peekable();
+//     while let Some((char, point)) = rev_chars.next() {
+//         dbg!(char, point);
+//         if char == '.' {
+//             break;
+//         }
+
+//         if char == '\n'
+//             && (rev_chars.peek().map(|(c, _)| c == &'\n').unwrap_or(false) || start.is_none())
+//         {
+//             break;
+//         }
+
+//         if !char.is_whitespace() {
+//             start = Some(point);
+//         }
+
+//         previous_end = point;
+//     }
+
+//     let mut end = relative_to;
+//     let mut chars = map.chars_at(relative_to).peekable();
+//     while let Some((char, point)) = chars.next() {
+//         if !char.is_whitespace() {
+//             if start.is_none() {
+//                 start = Some(point);
+//             }
+
+//             // Set the end to the point after the current non whitespace character
+//             end = point;
+//             *end.column_mut() += char.len_utf8() as u32;
+//         }
+
+//         if char == '.' {
+//             break;
+//         }
+
+//         if char == '\n' {
+//             if start.is_none() {
+//                 if let Some((_, next_point)) = chars.peek() {
+//                     end = *next_point;
+//                 }
+//                 break;
+
+//             if chars.peek().map(|(c, _)| c == &'\n').unwrap_or(false) {
+//                 break;
+//             }
+//         }
+//     }
+
+//     start.unwrap_or(previous_end)..end
+// }
+
+fn sentence(map: &DisplaySnapshot, relative_to: DisplayPoint, around: bool) -> Range<DisplayPoint> {
+    let mut start = None;
+    let mut previous_end = relative_to;
+
+    for (char, point) in map.reverse_chars_at(relative_to) {
+        if is_sentence_end(map, point) {
+            break;
+        }
+
+        if is_possible_sentence_start(char) {
+            start = Some(point);
+        }
+
+        previous_end = point;
+    }
+
+    // Handle case where cursor was before the sentence start
+    let mut chars = map.chars_at(relative_to).peekable();
+    if start.is_none() {
+        if let Some((char, point)) = chars.peek() {
+            if is_possible_sentence_start(*char) {
+                start = Some(*point);
+            }
+        }
+    }
+
+    let mut end = relative_to;
+    for (char, point) in chars {
+        if start.is_some() {
+            if !char.is_whitespace() {
+                end = point;
+                *end.column_mut() += char.len_utf8() as u32;
+                end = map.clip_point(end, Bias::Left);
+            }
+
+            if is_sentence_end(map, point) {
+                break;
+            }
+        } else if is_possible_sentence_start(char) {
+            if around {
+                start = Some(point);
+            } else {
+                end = point;
+                break;
+            }
+        }
+    }
+
+    let mut range = start.unwrap_or(previous_end)..end;
+    if around {
+        range = expand_to_include_whitespace(map, range, false);
+    }
+
+    range
+}
+
+fn is_possible_sentence_start(character: char) -> bool {
+    !character.is_whitespace() && character != '.'
+}
+
+const SENTENCE_END_PUNCTUATION: &[char] = &['.', '!', '?'];
+const SENTENCE_END_FILLERS: &[char] = &[')', ']', '"', '\''];
+const SENTENCE_END_WHITESPACE: &[char] = &[' ', '\t', '\n'];
+fn is_sentence_end(map: &DisplaySnapshot, point: DisplayPoint) -> bool {
+    let mut chars = map.chars_at(point).peekable();
+
+    if let Some((char, _)) = chars.next() {
+        if char == '\n' && chars.peek().map(|(c, _)| c == &'\n').unwrap_or(false) {
+            return true;
+        }
+
+        if !SENTENCE_END_PUNCTUATION.contains(&char) {
+            return false;
+        }
+    } else {
+        return false;
+    }
+
+    for (char, _) in chars {
+        if SENTENCE_END_WHITESPACE.contains(&char) {
+            return true;
+        }
+
+        if !SENTENCE_END_FILLERS.contains(&char) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/// Expands the passed range to include whitespace on one side or the other in a line. Attempts to add the
+/// whitespace to the end first and falls back to the start if there was none.
+fn expand_to_include_whitespace(
+    map: &DisplaySnapshot,
+    mut range: Range<DisplayPoint>,
+    stop_at_newline: bool,
+) -> Range<DisplayPoint> {
+    let mut whitespace_included = false;
+    for (char, point) in map.chars_at(range.end) {
+        range.end = point;
+
+        if char == '\n' && stop_at_newline {
+            break;
+        }
+
+        if char.is_whitespace() {
+            whitespace_included = true;
+        } else {
+            break;
+        }
+    }
+
+    if !whitespace_included {
+        for (char, point) in map.reverse_chars_at(range.start) {
+            if char == '\n' && stop_at_newline {
+                break;
+            }
+
+            if !char.is_whitespace() {
+                break;
+            }
+
+            range.start = point;
+        }
+    }
+
+    range
+}
+
+#[cfg(test)]
+mod test {
+    use indoc::indoc;
+
+    use crate::test_contexts::NeovimBackedTestContext;
+
+    const WORD_LOCATIONS: &'static str = indoc! {"
+        The quick ˇbrowˇnˇ   
+        fox ˇjuˇmpsˇ over
+        the lazy dogˇ  
+        ˇ
+        ˇ
+        ˇ
+        Thˇeˇ-ˇquˇickˇ ˇbrownˇ 
+        ˇ  
+        ˇ  
+        ˇ  fox-jumpˇs over
+        the lazy dogˇ 
+        ˇ
+        "};
+
+    #[gpui::test]
+    async fn test_change_in_word(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_change_in_word", cx)
+            .await
+            .binding(["c", "i", "w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+        let mut cx = cx.consume().binding(["c", "i", "shift-w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+    }
+
+    #[gpui::test]
+    async fn test_delete_in_word(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_delete_in_word", cx)
+            .await
+            .binding(["d", "i", "w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+        let mut cx = cx.consume().binding(["d", "i", "shift-w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+    }
+
+    #[gpui::test]
+    async fn test_change_around_word(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_change_around_word", cx)
+            .await
+            .binding(["c", "a", "w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+        let mut cx = cx.consume().binding(["c", "a", "shift-w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+    }
+
+    #[gpui::test]
+    async fn test_delete_around_word(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_delete_around_word", cx)
+            .await
+            .binding(["d", "a", "w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+        let mut cx = cx.consume().binding(["d", "a", "shift-w"]);
+        cx.assert_all(WORD_LOCATIONS).await;
+    }
+
+    const SENTENCE_EXAMPLES: &[&'static str] = &[
+        "ˇThe quick ˇbrownˇ?ˇ ˇFox Jˇumpsˇ!ˇ Ovˇer theˇ lazyˇ.",
+        indoc! {"
+            ˇThe quick ˇbrownˇ   
+            fox jumps over
+            the lazy doˇgˇ.ˇ ˇThe quick ˇ
+            brown fox jumps over
+        "},
+        // Double newlines are broken currently
+        // indoc! {"
+        //     The quick brown fox jumps.
+        //     Over the lazy dog
+        //     ˇ
+        //     ˇ
+        //     ˇ  fox-jumpˇs over
+        //     the lazy dog.ˇ
+        //     ˇ
+        // "},
+        r#"The quick brown.)]'" Brown fox jumps."#,
+    ];
+
+    #[gpui::test]
+    async fn test_change_in_sentence(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_change_in_sentence", cx)
+            .await
+            .binding(["c", "i", "s"]);
+        for sentence_example in SENTENCE_EXAMPLES {
+            cx.assert_all(sentence_example).await;
+        }
+    }
+
+    #[gpui::test]
+    async fn test_delete_in_sentence(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_delete_in_sentence", cx)
+            .await
+            .binding(["d", "i", "s"]);
+        for sentence_example in SENTENCE_EXAMPLES {
+            cx.assert_all(sentence_example).await;
+        }
+    }
+
+    #[gpui::test]
+    #[ignore] // End cursor position is incorrect
+    async fn test_change_around_sentence(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_change_around_sentence", cx)
+            .await
+            .binding(["c", "a", "s"]);
+        for sentence_example in SENTENCE_EXAMPLES {
+            cx.assert_all(sentence_example).await;
+        }
+    }
+
+    #[gpui::test]
+    #[ignore] // End cursor position is incorrect
+    async fn test_delete_around_sentence(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_delete_around_sentence", cx)
+            .await
+            .binding(["d", "a", "s"]);
+        for sentence_example in SENTENCE_EXAMPLES {
+            cx.assert_all(sentence_example).await;
+        }
+    }
+}
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index e556048ea8..29a51664ee 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -1,8 +1,8 @@
 use editor::CursorShape;
 use gpui::keymap::Context;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub enum Mode {
     Normal,
     Insert,
@@ -26,6 +26,7 @@ pub enum Operator {
     Change,
     Delete,
     Yank,
+    Object { around: bool },
 }
 
 #[derive(Default)]
@@ -77,7 +78,12 @@ impl VimState {
             context.set.insert("VimControl".to_string());
         }
 
-        Operator::set_context(self.operator_stack.last(), &mut context);
+        let active_operator = self.operator_stack.last();
+        if matches!(active_operator, Some(Operator::Object { .. })) {
+            context.set.insert("VimObject".to_string());
+        }
+
+        Operator::set_context(active_operator, &mut context);
 
         context
     }
@@ -87,6 +93,8 @@ impl Operator {
     pub fn set_context(operator: Option<&Operator>, context: &mut Context) {
         let operator_context = match operator {
             Some(Operator::Namespace(Namespace::G)) => "g",
+            Some(Operator::Object { around: false }) => "i",
+            Some(Operator::Object { around: true }) => "a",
             Some(Operator::Change) => "c",
             Some(Operator::Delete) => "d",
             Some(Operator::Yank) => "y",
diff --git a/crates/vim/src/test_contexts.rs b/crates/vim/src/test_contexts.rs
new file mode 100644
index 0000000000..1a65be251b
--- /dev/null
+++ b/crates/vim/src/test_contexts.rs
@@ -0,0 +1,9 @@
+mod neovim_backed_binding_test_context;
+mod neovim_backed_test_context;
+mod vim_binding_test_context;
+mod vim_test_context;
+
+pub use neovim_backed_binding_test_context::*;
+pub use neovim_backed_test_context::*;
+pub use vim_binding_test_context::*;
+pub use vim_test_context::*;
diff --git a/crates/vim/src/test_contexts/neovim_backed_binding_test_context.rs b/crates/vim/src/test_contexts/neovim_backed_binding_test_context.rs
new file mode 100644
index 0000000000..b732bfa19c
--- /dev/null
+++ b/crates/vim/src/test_contexts/neovim_backed_binding_test_context.rs
@@ -0,0 +1,56 @@
+use std::ops::{Deref, DerefMut};
+
+use util::test::marked_text_offsets;
+
+use super::NeovimBackedTestContext;
+
+pub struct NeovimBackedBindingTestContext<'a, const COUNT: usize> {
+    cx: NeovimBackedTestContext<'a>,
+    keystrokes_under_test: [&'static str; COUNT],
+}
+
+impl<'a, const COUNT: usize> NeovimBackedBindingTestContext<'a, COUNT> {
+    pub fn new(
+        keystrokes_under_test: [&'static str; COUNT],
+        cx: NeovimBackedTestContext<'a>,
+    ) -> Self {
+        Self {
+            cx,
+            keystrokes_under_test,
+        }
+    }
+
+    pub fn consume(self) -> NeovimBackedTestContext<'a> {
+        self.cx
+    }
+
+    pub async fn assert(&mut self, initial_state: &str) {
+        self.cx
+            .assert_binding_matches(self.keystrokes_under_test, initial_state)
+            .await
+    }
+
+    pub async fn assert_all(&mut self, marked_positions: &str) {
+        let (unmarked_text, cursor_offsets) = marked_text_offsets(marked_positions);
+
+        for cursor_offset in cursor_offsets.iter() {
+            let mut marked_text = unmarked_text.clone();
+            marked_text.insert(*cursor_offset, 'ˇ');
+            self.assert(&marked_text).await;
+        }
+    }
+}
+
+impl<'a, const COUNT: usize> Deref for NeovimBackedBindingTestContext<'a, COUNT> {
+    type Target = NeovimBackedTestContext<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.cx
+    }
+}
+
+impl<'a, const COUNT: usize> DerefMut for NeovimBackedBindingTestContext<'a, COUNT> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.cx
+    }
+}
diff --git a/crates/vim/src/test_contexts/neovim_backed_test_context.rs b/crates/vim/src/test_contexts/neovim_backed_test_context.rs
new file mode 100644
index 0000000000..12654c7fb9
--- /dev/null
+++ b/crates/vim/src/test_contexts/neovim_backed_test_context.rs
@@ -0,0 +1,374 @@
+use std::{
+    ops::{Deref, DerefMut},
+    path::PathBuf,
+};
+
+use editor::DisplayPoint;
+use gpui::keymap::Keystroke;
+
+#[cfg(feature = "neovim")]
+use async_compat::Compat;
+#[cfg(feature = "neovim")]
+use async_trait::async_trait;
+#[cfg(feature = "neovim")]
+use nvim_rs::{
+    create::tokio::new_child_cmd, error::LoopError, Handler, Neovim, UiAttachOptions, Value,
+};
+#[cfg(feature = "neovim")]
+use tokio::{
+    process::{Child, ChildStdin, Command},
+    task::JoinHandle,
+};
+
+use crate::state::Mode;
+
+use super::{NeovimBackedBindingTestContext, VimTestContext};
+
+pub struct NeovimBackedTestContext<'a> {
+    cx: VimTestContext<'a>,
+    test_case_id: &'static str,
+    data_counter: usize,
+    #[cfg(feature = "neovim")]
+    nvim: Neovim<nvim_rs::compat::tokio::Compat<ChildStdin>>,
+    #[cfg(feature = "neovim")]
+    _join_handle: JoinHandle<Result<(), Box<LoopError>>>,
+    #[cfg(feature = "neovim")]
+    _child: Child,
+}
+
+impl<'a> NeovimBackedTestContext<'a> {
+    pub async fn new(
+        test_case_id: &'static str,
+        cx: &'a mut gpui::TestAppContext,
+    ) -> NeovimBackedTestContext<'a> {
+        let cx = VimTestContext::new(cx, true).await;
+
+        #[cfg(feature = "neovim")]
+        let handler = NvimHandler {};
+        #[cfg(feature = "neovim")]
+        let (nvim, join_handle, child) = Compat::new(async {
+            let (nvim, join_handle, child) = new_child_cmd(
+                &mut Command::new("nvim").arg("--embed").arg("--clean"),
+                handler,
+            )
+            .await
+            .expect("Could not connect to neovim process");
+
+            nvim.ui_attach(100, 100, &UiAttachOptions::default())
+                .await
+                .expect("Could not attach to ui");
+
+            (nvim, join_handle, child)
+        })
+        .await;
+
+        let result = Self {
+            cx,
+            test_case_id,
+            data_counter: 0,
+            #[cfg(feature = "neovim")]
+            nvim,
+            #[cfg(feature = "neovim")]
+            _join_handle: join_handle,
+            #[cfg(feature = "neovim")]
+            _child: child,
+        };
+
+        #[cfg(feature = "neovim")]
+        {
+            result.clear_test_data()
+        }
+
+        result
+    }
+
+    pub async fn simulate_shared_keystroke(&mut self, keystroke_text: &str) {
+        let keystroke = Keystroke::parse(keystroke_text).unwrap();
+
+        #[cfg(feature = "neovim")]
+        {
+            let special = keystroke.shift
+                || keystroke.ctrl
+                || keystroke.alt
+                || keystroke.cmd
+                || keystroke.key.len() > 1;
+            let start = if special { "<" } else { "" };
+            let shift = if keystroke.shift { "S-" } else { "" };
+            let ctrl = if keystroke.ctrl { "C-" } else { "" };
+            let alt = if keystroke.alt { "M-" } else { "" };
+            let cmd = if keystroke.cmd { "D-" } else { "" };
+            let end = if special { ">" } else { "" };
+
+            let key = format!("{start}{shift}{ctrl}{alt}{cmd}{}{end}", keystroke.key);
+
+            self.nvim
+                .input(&key)
+                .await
+                .expect("Could not input keystroke");
+        }
+
+        let window_id = self.window_id;
+        self.cx.dispatch_keystroke(window_id, keystroke, false);
+    }
+
+    pub async fn simulate_shared_keystrokes<const COUNT: usize>(
+        &mut self,
+        keystroke_texts: [&str; COUNT],
+    ) {
+        for keystroke_text in keystroke_texts.into_iter() {
+            self.simulate_shared_keystroke(keystroke_text).await;
+        }
+    }
+
+    pub async fn set_shared_state(&mut self, marked_text: &str) {
+        self.set_state(marked_text, Mode::Normal);
+
+        #[cfg(feature = "neovim")]
+        {
+            let cursor_point =
+                self.editor(|editor, cx| editor.selections.newest::<language::Point>(cx));
+            let nvim_buffer = self
+                .nvim
+                .get_current_buf()
+                .await
+                .expect("Could not get neovim buffer");
+            let mut lines = self
+                .buffer_text()
+                .lines()
+                .map(|line| line.to_string())
+                .collect::<Vec<_>>();
+
+            if lines.len() > 1 {
+                // Add final newline which is missing from buffer_text
+                lines.push("".to_string());
+            }
+
+            nvim_buffer
+                .set_lines(0, -1, false, lines)
+                .await
+                .expect("Could not set nvim buffer text");
+
+            self.nvim
+                .input("<escape>")
+                .await
+                .expect("Could not send escape to nvim");
+            self.nvim
+                .input("<escape>")
+                .await
+                .expect("Could not send escape to nvim");
+
+            let nvim_window = self
+                .nvim
+                .get_current_win()
+                .await
+                .expect("Could not get neovim window");
+            nvim_window
+                .set_cursor((
+                    cursor_point.head().row as i64 + 1,
+                    cursor_point.head().column as i64,
+                ))
+                .await
+                .expect("Could not set nvim cursor position");
+        }
+    }
+
+    pub async fn assert_state_matches(&mut self) {
+        assert_eq!(self.neovim_text().await, self.buffer_text());
+
+        let zed_head = self.update_editor(|editor, cx| editor.selections.newest_display(cx).head());
+        assert_eq!(self.neovim_head().await, zed_head);
+
+        if let Some(neovim_mode) = self.neovim_mode().await {
+            assert_eq!(neovim_mode, self.mode());
+        }
+    }
+
+    #[cfg(feature = "neovim")]
+    pub async fn neovim_text(&mut self) -> String {
+        let nvim_buffer = self
+            .nvim
+            .get_current_buf()
+            .await
+            .expect("Could not get neovim buffer");
+        let text = nvim_buffer
+            .get_lines(0, -1, false)
+            .await
+            .expect("Could not get buffer text")
+            .join("\n");
+
+        self.write_test_data(text.clone(), "text");
+        text
+    }
+
+    #[cfg(not(feature = "neovim"))]
+    pub async fn neovim_text(&mut self) -> String {
+        self.read_test_data("text")
+    }
+
+    #[cfg(feature = "neovim")]
+    pub async fn neovim_head(&mut self) -> DisplayPoint {
+        let nvim_row: u32 = self
+            .nvim
+            .command_output("echo line('.')")
+            .await
+            .unwrap()
+            .parse::<u32>()
+            .unwrap()
+            - 1; // Neovim rows start at 1
+        let nvim_column: u32 = self
+            .nvim
+            .command_output("echo col('.')")
+            .await
+            .unwrap()
+            .parse::<u32>()
+            .unwrap()
+            - 1; // Neovim columns start at 1
+
+        let serialized = format!("{},{}", nvim_row.to_string(), nvim_column.to_string());
+        self.write_test_data(serialized, "head");
+
+        DisplayPoint::new(nvim_row, nvim_column)
+    }
+
+    #[cfg(not(feature = "neovim"))]
+    pub async fn neovim_head(&mut self) -> DisplayPoint {
+        let serialized = self.read_test_data("head");
+        let mut components = serialized.split(',');
+        let nvim_row = components.next().unwrap().parse::<u32>().unwrap();
+        let nvim_column = components.next().unwrap().parse::<u32>().unwrap();
+
+        DisplayPoint::new(nvim_row, nvim_column)
+    }
+
+    #[cfg(feature = "neovim")]
+    pub async fn neovim_mode(&mut self) -> Option<Mode> {
+        let nvim_mode_text = self
+            .nvim
+            .get_mode()
+            .await
+            .expect("Could not get mode")
+            .into_iter()
+            .find_map(|(key, value)| {
+                if key.as_str() == Some("mode") {
+                    Some(value.as_str().unwrap().to_owned())
+                } else {
+                    None
+                }
+            })
+            .expect("Could not find mode value");
+
+        let mode = match nvim_mode_text.as_ref() {
+            "i" => Some(Mode::Insert),
+            "n" => Some(Mode::Normal),
+            "v" => Some(Mode::Visual { line: false }),
+            "V" => Some(Mode::Visual { line: true }),
+            _ => None,
+        };
+
+        let serialized = serde_json::to_string(&mode).expect("Could not serialize mode");
+
+        self.write_test_data(serialized, "mode");
+
+        mode
+    }
+
+    #[cfg(not(feature = "neovim"))]
+    pub async fn neovim_mode(&mut self) -> Option<Mode> {
+        let serialized = self.read_test_data("mode");
+        serde_json::from_str(&serialized).expect("Could not deserialize test data")
+    }
+
+    fn test_data_directory(&self) -> PathBuf {
+        let mut data_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        data_path.push("test_data");
+        data_path.push(self.test_case_id);
+        data_path
+    }
+
+    fn next_data_path(&mut self, kind: &str) -> PathBuf {
+        let mut data_path = self.test_data_directory();
+        data_path.push(format!("{}{}.txt", self.data_counter, kind));
+        self.data_counter += 1;
+        data_path
+    }
+
+    #[cfg(not(feature = "neovim"))]
+    fn read_test_data(&mut self, kind: &str) -> String {
+        let path = self.next_data_path(kind);
+        std::fs::read_to_string(path).expect(
+            "Could not read test data. Is it generated? Try running test with '--features neovim'",
+        )
+    }
+
+    #[cfg(feature = "neovim")]
+    fn write_test_data(&mut self, data: String, kind: &str) {
+        let path = self.next_data_path(kind);
+        std::fs::create_dir_all(path.parent().unwrap())
+            .expect("Could not create test data directory");
+        std::fs::write(path, data).expect("Could not write out test data");
+    }
+
+    #[cfg(feature = "neovim")]
+    fn clear_test_data(&self) {
+        // If the path does not exist, no biggy, we will create it
+        std::fs::remove_dir_all(self.test_data_directory()).ok();
+    }
+
+    pub async fn assert_binding_matches<const COUNT: usize>(
+        &mut self,
+        keystrokes: [&str; COUNT],
+        initial_state: &str,
+    ) {
+        dbg!(keystrokes, initial_state);
+        self.set_shared_state(initial_state).await;
+        self.simulate_shared_keystrokes(keystrokes).await;
+        self.assert_state_matches().await;
+    }
+
+    pub fn binding<const COUNT: usize>(
+        self,
+        keystrokes: [&'static str; COUNT],
+    ) -> NeovimBackedBindingTestContext<'a, COUNT> {
+        NeovimBackedBindingTestContext::new(keystrokes, self)
+    }
+}
+
+#[derive(Clone)]
+struct NvimHandler {}
+
+#[cfg(feature = "neovim")]
+#[async_trait]
+impl Handler for NvimHandler {
+    type Writer = nvim_rs::compat::tokio::Compat<ChildStdin>;
+
+    async fn handle_request(
+        &self,
+        _event_name: String,
+        _arguments: Vec<Value>,
+        _neovim: Neovim<Self::Writer>,
+    ) -> Result<Value, Value> {
+        unimplemented!();
+    }
+
+    async fn handle_notify(
+        &self,
+        _event_name: String,
+        _arguments: Vec<Value>,
+        _neovim: Neovim<Self::Writer>,
+    ) {
+    }
+}
+
+impl<'a> Deref for NeovimBackedTestContext<'a> {
+    type Target = VimTestContext<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.cx
+    }
+}
+
+impl<'a> DerefMut for NeovimBackedTestContext<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.cx
+    }
+}
diff --git a/crates/vim/src/test_contexts/vim_binding_test_context.rs b/crates/vim/src/test_contexts/vim_binding_test_context.rs
new file mode 100644
index 0000000000..0974684a34
--- /dev/null
+++ b/crates/vim/src/test_contexts/vim_binding_test_context.rs
@@ -0,0 +1,69 @@
+use std::ops::{Deref, DerefMut};
+
+use crate::*;
+
+use super::VimTestContext;
+
+pub struct VimBindingTestContext<'a, const COUNT: usize> {
+    cx: VimTestContext<'a>,
+    keystrokes_under_test: [&'static str; COUNT],
+    mode_before: Mode,
+    mode_after: Mode,
+}
+
+impl<'a, const COUNT: usize> VimBindingTestContext<'a, COUNT> {
+    pub fn new(
+        keystrokes_under_test: [&'static str; COUNT],
+        mode_before: Mode,
+        mode_after: Mode,
+        cx: VimTestContext<'a>,
+    ) -> Self {
+        Self {
+            cx,
+            keystrokes_under_test,
+            mode_before,
+            mode_after,
+        }
+    }
+
+    pub fn binding<const NEW_COUNT: usize>(
+        self,
+        keystrokes_under_test: [&'static str; NEW_COUNT],
+    ) -> VimBindingTestContext<'a, NEW_COUNT> {
+        VimBindingTestContext {
+            keystrokes_under_test,
+            cx: self.cx,
+            mode_before: self.mode_before,
+            mode_after: self.mode_after,
+        }
+    }
+
+    pub fn mode_after(mut self, mode_after: Mode) -> Self {
+        self.mode_after = mode_after;
+        self
+    }
+
+    pub fn assert(&mut self, initial_state: &str, state_after: &str) {
+        self.cx.assert_binding(
+            self.keystrokes_under_test,
+            initial_state,
+            self.mode_before,
+            state_after,
+            self.mode_after,
+        )
+    }
+}
+
+impl<'a, const COUNT: usize> Deref for VimBindingTestContext<'a, COUNT> {
+    type Target = VimTestContext<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.cx
+    }
+}
+
+impl<'a, const COUNT: usize> DerefMut for VimBindingTestContext<'a, COUNT> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.cx
+    }
+}
diff --git a/crates/vim/src/vim_test_context.rs b/crates/vim/src/test_contexts/vim_test_context.rs
similarity index 75%
rename from crates/vim/src/vim_test_context.rs
rename to crates/vim/src/test_contexts/vim_test_context.rs
index 0e77b05ba2..229b5e0a8e 100644
--- a/crates/vim/src/vim_test_context.rs
+++ b/crates/vim/src/test_contexts/vim_test_context.rs
@@ -8,6 +8,8 @@ use workspace::{pane, AppState, WorkspaceHandle};
 
 use crate::{state::Operator, *};
 
+use super::VimBindingTestContext;
+
 pub struct VimTestContext<'a> {
     cx: EditorTestContext<'a>,
     workspace: ViewHandle<Workspace>,
@@ -168,67 +170,3 @@ impl<'a> DerefMut for VimTestContext<'a> {
         &mut self.cx
     }
 }
-
-pub struct VimBindingTestContext<'a, const COUNT: usize> {
-    cx: VimTestContext<'a>,
-    keystrokes_under_test: [&'static str; COUNT],
-    mode_before: Mode,
-    mode_after: Mode,
-}
-
-impl<'a, const COUNT: usize> VimBindingTestContext<'a, COUNT> {
-    pub fn new(
-        keystrokes_under_test: [&'static str; COUNT],
-        mode_before: Mode,
-        mode_after: Mode,
-        cx: VimTestContext<'a>,
-    ) -> Self {
-        Self {
-            cx,
-            keystrokes_under_test,
-            mode_before,
-            mode_after,
-        }
-    }
-
-    pub fn binding<const NEW_COUNT: usize>(
-        self,
-        keystrokes_under_test: [&'static str; NEW_COUNT],
-    ) -> VimBindingTestContext<'a, NEW_COUNT> {
-        VimBindingTestContext {
-            keystrokes_under_test,
-            cx: self.cx,
-            mode_before: self.mode_before,
-            mode_after: self.mode_after,
-        }
-    }
-
-    pub fn mode_after(mut self, mode_after: Mode) -> Self {
-        self.mode_after = mode_after;
-        self
-    }
-
-    pub fn assert(&mut self, initial_state: &str, state_after: &str) {
-        self.cx.assert_binding(
-            self.keystrokes_under_test,
-            initial_state,
-            self.mode_before,
-            state_after,
-            self.mode_after,
-        )
-    }
-}
-
-impl<'a, const COUNT: usize> Deref for VimBindingTestContext<'a, COUNT> {
-    type Target = VimTestContext<'a>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.cx
-    }
-}
-
-impl<'a, const COUNT: usize> DerefMut for VimBindingTestContext<'a, COUNT> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.cx
-    }
-}
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index ecad33ce3f..234eb0361b 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -1,10 +1,11 @@
 #[cfg(test)]
-mod vim_test_context;
+mod test_contexts;
 
 mod editor_events;
 mod insert;
 mod motion;
 mod normal;
+mod object;
 mod state;
 mod utils;
 mod visual;
@@ -32,6 +33,7 @@ pub fn init(cx: &mut MutableAppContext) {
     normal::init(cx);
     visual::init(cx);
     insert::init(cx);
+    object::init(cx);
     motion::init(cx);
 
     // Vim Actions
@@ -144,7 +146,8 @@ impl Vim {
     }
 
     fn pop_operator(&mut self, cx: &mut MutableAppContext) -> Operator {
-        let popped_operator = self.state.operator_stack.pop().expect("Operator popped when no operator was on the stack. This likely means there is an invalid keymap config");
+        let popped_operator = self.state.operator_stack.pop()
+            .expect("Operator popped when no operator was on the stack. This likely means there is an invalid keymap config");
         self.sync_vim_settings(cx);
         popped_operator
     }
@@ -210,7 +213,10 @@ mod test {
     use indoc::indoc;
     use search::BufferSearchBar;
 
-    use crate::{state::Mode, vim_test_context::VimTestContext};
+    use crate::{
+        state::Mode,
+        test_contexts::{NeovimBackedTestContext, VimTestContext},
+    };
 
     #[gpui::test]
     async fn test_initially_disabled(cx: &mut gpui::TestAppContext) {
@@ -219,6 +225,19 @@ mod test {
         cx.assert_editor_state("hjklˇ");
     }
 
+    #[gpui::test]
+    async fn test_neovim(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new("test_neovim", cx).await;
+
+        cx.simulate_shared_keystroke("i").await;
+        cx.simulate_shared_keystrokes([
+            "shift-T", "e", "s", "t", " ", "t", "e", "s", "t", "escape", "0", "d", "w",
+        ])
+        .await;
+        cx.assert_state_matches().await;
+        cx.assert_editor_state("ˇtest");
+    }
+
     #[gpui::test]
     async fn test_toggle_through_settings(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index d468393027..bbd6c8cfd9 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -6,7 +6,7 @@ use gpui::{actions, MutableAppContext, ViewContext};
 use language::{AutoindentMode, SelectionGoal};
 use workspace::Workspace;
 
-use crate::{motion::Motion, state::Mode, utils::copy_selections_content, Vim};
+use crate::{motion::Motion, object::Object, state::Mode, utils::copy_selections_content, Vim};
 
 actions!(vim, [VisualDelete, VisualChange, VisualYank, VisualPaste]);
 
@@ -43,6 +43,8 @@ pub fn visual_motion(motion: Motion, cx: &mut MutableAppContext) {
     });
 }
 
+pub fn visual_object(_object: Object, _cx: &mut MutableAppContext) {}
+
 pub fn change(_: &mut Workspace, _: &VisualChange, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
         vim.update_active_editor(cx, |editor, cx| {
@@ -274,7 +276,7 @@ pub fn paste(_: &mut Workspace, _: &VisualPaste, cx: &mut ViewContext<Workspace>
 mod test {
     use indoc::indoc;
 
-    use crate::{state::Mode, vim_test_context::VimTestContext};
+    use crate::{state::Mode, test_contexts::VimTestContext};
 
     #[gpui::test]
     async fn test_enter_visual_mode(cx: &mut gpui::TestAppContext) {
diff --git a/crates/vim/test_data/test_change_around_sentence/0text.txt b/crates/vim/test_data/test_change_around_sentence/0text.txt
new file mode 100644
index 0000000000..d2b92e8000
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/0text.txt
@@ -0,0 +1 @@
+Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/10head.txt b/crates/vim/test_data/test_change_around_sentence/10head.txt
new file mode 100644
index 0000000000..5df80e23c6
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/10head.txt
@@ -0,0 +1 @@
+0,16
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/1head.txt b/crates/vim/test_data/test_change_around_sentence/1head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/1head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/2mode.txt b/crates/vim/test_data/test_change_around_sentence/2mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/2mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/3text.txt b/crates/vim/test_data/test_change_around_sentence/3text.txt
new file mode 100644
index 0000000000..d2b92e8000
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/3text.txt
@@ -0,0 +1 @@
+Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/4head.txt b/crates/vim/test_data/test_change_around_sentence/4head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/4head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/5mode.txt b/crates/vim/test_data/test_change_around_sentence/5mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/5mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/6text.txt b/crates/vim/test_data/test_change_around_sentence/6text.txt
new file mode 100644
index 0000000000..d2b92e8000
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/6text.txt
@@ -0,0 +1 @@
+Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/7head.txt b/crates/vim/test_data/test_change_around_sentence/7head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/7head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/8mode.txt b/crates/vim/test_data/test_change_around_sentence/8mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/8mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_sentence/9text.txt b/crates/vim/test_data/test_change_around_sentence/9text.txt
new file mode 100644
index 0000000000..5e3a12964d
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_sentence/9text.txt
@@ -0,0 +1 @@
+The quick brown? Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/0text.txt b/crates/vim/test_data/test_change_around_word/0text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/0text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/100head.txt b/crates/vim/test_data/test_change_around_word/100head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/100head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/101mode.txt b/crates/vim/test_data/test_change_around_word/101mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/101mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/102text.txt b/crates/vim/test_data/test_change_around_word/102text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/102text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/103head.txt b/crates/vim/test_data/test_change_around_word/103head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/103head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/104mode.txt b/crates/vim/test_data/test_change_around_word/104mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/104mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/105text.txt b/crates/vim/test_data/test_change_around_word/105text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/105text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/106head.txt b/crates/vim/test_data/test_change_around_word/106head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/106head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/107mode.txt b/crates/vim/test_data/test_change_around_word/107mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/107mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/108text.txt b/crates/vim/test_data/test_change_around_word/108text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/108text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/109head.txt b/crates/vim/test_data/test_change_around_word/109head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/109head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/10head.txt b/crates/vim/test_data/test_change_around_word/10head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/10head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/110mode.txt b/crates/vim/test_data/test_change_around_word/110mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/110mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/111text.txt b/crates/vim/test_data/test_change_around_word/111text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/111text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/112head.txt b/crates/vim/test_data/test_change_around_word/112head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/112head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/113mode.txt b/crates/vim/test_data/test_change_around_word/113mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/113mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/114text.txt b/crates/vim/test_data/test_change_around_word/114text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/114text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/115head.txt b/crates/vim/test_data/test_change_around_word/115head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/115head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/116mode.txt b/crates/vim/test_data/test_change_around_word/116mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/116mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/117text.txt b/crates/vim/test_data/test_change_around_word/117text.txt
new file mode 100644
index 0000000000..0e9094161a
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/117text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/118head.txt b/crates/vim/test_data/test_change_around_word/118head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/118head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/119mode.txt b/crates/vim/test_data/test_change_around_word/119mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/119mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/11mode.txt b/crates/vim/test_data/test_change_around_word/11mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/11mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/120text.txt b/crates/vim/test_data/test_change_around_word/120text.txt
new file mode 100644
index 0000000000..fa73eb37b8
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/120text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+ over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/121head.txt b/crates/vim/test_data/test_change_around_word/121head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/121head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/122mode.txt b/crates/vim/test_data/test_change_around_word/122mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/122mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/123text.txt b/crates/vim/test_data/test_change_around_word/123text.txt
new file mode 100644
index 0000000000..4fe33b47eb
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/123text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+ over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/124head.txt b/crates/vim/test_data/test_change_around_word/124head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/124head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/125mode.txt b/crates/vim/test_data/test_change_around_word/125mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/125mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/126text.txt b/crates/vim/test_data/test_change_around_word/126text.txt
new file mode 100644
index 0000000000..35dd5816fc
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/126text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+ over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/127head.txt b/crates/vim/test_data/test_change_around_word/127head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/127head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/128mode.txt b/crates/vim/test_data/test_change_around_word/128mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/128mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/129text.txt b/crates/vim/test_data/test_change_around_word/129text.txt
new file mode 100644
index 0000000000..1bac4587a7
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/129text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/12text.txt b/crates/vim/test_data/test_change_around_word/12text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/12text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/130head.txt b/crates/vim/test_data/test_change_around_word/130head.txt
new file mode 100644
index 0000000000..edb3544f9a
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/130head.txt
@@ -0,0 +1 @@
+9,2
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/131mode.txt b/crates/vim/test_data/test_change_around_word/131mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/131mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/132text.txt b/crates/vim/test_data/test_change_around_word/132text.txt
new file mode 100644
index 0000000000..912316a9f7
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/132text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_change_around_word/133head.txt b/crates/vim/test_data/test_change_around_word/133head.txt
new file mode 100644
index 0000000000..00f5ae6cbb
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/133head.txt
@@ -0,0 +1 @@
+10,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/134mode.txt b/crates/vim/test_data/test_change_around_word/134mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/134mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/135text.txt b/crates/vim/test_data/test_change_around_word/135text.txt
new file mode 100644
index 0000000000..1563710058
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/135text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
diff --git a/crates/vim/test_data/test_change_around_word/136head.txt b/crates/vim/test_data/test_change_around_word/136head.txt
new file mode 100644
index 0000000000..94dbddc699
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/136head.txt
@@ -0,0 +1 @@
+11,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/137mode.txt b/crates/vim/test_data/test_change_around_word/137mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/137mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/13head.txt b/crates/vim/test_data/test_change_around_word/13head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/13head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/14mode.txt b/crates/vim/test_data/test_change_around_word/14mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/14mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/15text.txt b/crates/vim/test_data/test_change_around_word/15text.txt
new file mode 100644
index 0000000000..262feeae96
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/15text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/16head.txt b/crates/vim/test_data/test_change_around_word/16head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/16head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/17mode.txt b/crates/vim/test_data/test_change_around_word/17mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/17mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/18text.txt b/crates/vim/test_data/test_change_around_word/18text.txt
new file mode 100644
index 0000000000..ba0aea82d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/18text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/19head.txt b/crates/vim/test_data/test_change_around_word/19head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/19head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/1head.txt b/crates/vim/test_data/test_change_around_word/1head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/1head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/20mode.txt b/crates/vim/test_data/test_change_around_word/20mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/20mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/21text.txt b/crates/vim/test_data/test_change_around_word/21text.txt
new file mode 100644
index 0000000000..783e049f86
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/21text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/22head.txt b/crates/vim/test_data/test_change_around_word/22head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/22head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/23mode.txt b/crates/vim/test_data/test_change_around_word/23mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/23mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/24text.txt b/crates/vim/test_data/test_change_around_word/24text.txt
new file mode 100644
index 0000000000..783e049f86
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/24text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/25head.txt b/crates/vim/test_data/test_change_around_word/25head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/25head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/26mode.txt b/crates/vim/test_data/test_change_around_word/26mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/26mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/27text.txt b/crates/vim/test_data/test_change_around_word/27text.txt
new file mode 100644
index 0000000000..252419d291
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/27text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/28head.txt b/crates/vim/test_data/test_change_around_word/28head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/28head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/29mode.txt b/crates/vim/test_data/test_change_around_word/29mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/29mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/2mode.txt b/crates/vim/test_data/test_change_around_word/2mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/2mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/30text.txt b/crates/vim/test_data/test_change_around_word/30text.txt
new file mode 100644
index 0000000000..609747299b
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/30text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/31head.txt b/crates/vim/test_data/test_change_around_word/31head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/31head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/32mode.txt b/crates/vim/test_data/test_change_around_word/32mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/32mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/33text.txt b/crates/vim/test_data/test_change_around_word/33text.txt
new file mode 100644
index 0000000000..12ede0f513
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/33text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+Thequick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/34head.txt b/crates/vim/test_data/test_change_around_word/34head.txt
new file mode 100644
index 0000000000..c20df71d5e
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/34head.txt
@@ -0,0 +1 @@
+6,3
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/35mode.txt b/crates/vim/test_data/test_change_around_word/35mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/35mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/36text.txt b/crates/vim/test_data/test_change_around_word/36text.txt
new file mode 100644
index 0000000000..4a6d943982
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/36text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/37head.txt b/crates/vim/test_data/test_change_around_word/37head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/37head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/38mode.txt b/crates/vim/test_data/test_change_around_word/38mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/38mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/39text.txt b/crates/vim/test_data/test_change_around_word/39text.txt
new file mode 100644
index 0000000000..4a6d943982
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/39text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/3text.txt b/crates/vim/test_data/test_change_around_word/3text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/3text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/40head.txt b/crates/vim/test_data/test_change_around_word/40head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/40head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/41mode.txt b/crates/vim/test_data/test_change_around_word/41mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/41mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/42text.txt b/crates/vim/test_data/test_change_around_word/42text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/42text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/43head.txt b/crates/vim/test_data/test_change_around_word/43head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/43head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/44mode.txt b/crates/vim/test_data/test_change_around_word/44mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/44mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/45text.txt b/crates/vim/test_data/test_change_around_word/45text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/45text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/46head.txt b/crates/vim/test_data/test_change_around_word/46head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/46head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/47mode.txt b/crates/vim/test_data/test_change_around_word/47mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/47mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/48text.txt b/crates/vim/test_data/test_change_around_word/48text.txt
new file mode 100644
index 0000000000..13b7d1cb51
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/48text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/49head.txt b/crates/vim/test_data/test_change_around_word/49head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/49head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/4head.txt b/crates/vim/test_data/test_change_around_word/4head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/4head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/50mode.txt b/crates/vim/test_data/test_change_around_word/50mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/50mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/51text.txt b/crates/vim/test_data/test_change_around_word/51text.txt
new file mode 100644
index 0000000000..3976ef9c85
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/51text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/52head.txt b/crates/vim/test_data/test_change_around_word/52head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/52head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/53mode.txt b/crates/vim/test_data/test_change_around_word/53mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/53mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/54text.txt b/crates/vim/test_data/test_change_around_word/54text.txt
new file mode 100644
index 0000000000..b5ca31babe
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/54text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/55head.txt b/crates/vim/test_data/test_change_around_word/55head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/55head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/56mode.txt b/crates/vim/test_data/test_change_around_word/56mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/56mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/57text.txt b/crates/vim/test_data/test_change_around_word/57text.txt
new file mode 100644
index 0000000000..0eaface506
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/57text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/58head.txt b/crates/vim/test_data/test_change_around_word/58head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/58head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/59mode.txt b/crates/vim/test_data/test_change_around_word/59mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/59mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/5mode.txt b/crates/vim/test_data/test_change_around_word/5mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/5mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/60text.txt b/crates/vim/test_data/test_change_around_word/60text.txt
new file mode 100644
index 0000000000..d8b9b05b79
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/60text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/61head.txt b/crates/vim/test_data/test_change_around_word/61head.txt
new file mode 100644
index 0000000000..e0460d1bc5
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/61head.txt
@@ -0,0 +1 @@
+9,6
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/62mode.txt b/crates/vim/test_data/test_change_around_word/62mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/62mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/63text.txt b/crates/vim/test_data/test_change_around_word/63text.txt
new file mode 100644
index 0000000000..912316a9f7
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/63text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_change_around_word/64head.txt b/crates/vim/test_data/test_change_around_word/64head.txt
new file mode 100644
index 0000000000..00f5ae6cbb
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/64head.txt
@@ -0,0 +1 @@
+10,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/65mode.txt b/crates/vim/test_data/test_change_around_word/65mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/65mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/66text.txt b/crates/vim/test_data/test_change_around_word/66text.txt
new file mode 100644
index 0000000000..1563710058
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/66text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
diff --git a/crates/vim/test_data/test_change_around_word/67head.txt b/crates/vim/test_data/test_change_around_word/67head.txt
new file mode 100644
index 0000000000..94dbddc699
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/67head.txt
@@ -0,0 +1 @@
+11,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/68mode.txt b/crates/vim/test_data/test_change_around_word/68mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/68mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/69text.txt b/crates/vim/test_data/test_change_around_word/69text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/69text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/6text.txt b/crates/vim/test_data/test_change_around_word/6text.txt
new file mode 100644
index 0000000000..3678c219a3
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/6text.txt
@@ -0,0 +1,11 @@
+The quick brown jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/70head.txt b/crates/vim/test_data/test_change_around_word/70head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/70head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/71mode.txt b/crates/vim/test_data/test_change_around_word/71mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/71mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/72text.txt b/crates/vim/test_data/test_change_around_word/72text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/72text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/73head.txt b/crates/vim/test_data/test_change_around_word/73head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/73head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/74mode.txt b/crates/vim/test_data/test_change_around_word/74mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/74mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/75text.txt b/crates/vim/test_data/test_change_around_word/75text.txt
new file mode 100644
index 0000000000..3678c219a3
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/75text.txt
@@ -0,0 +1,11 @@
+The quick brown jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/76head.txt b/crates/vim/test_data/test_change_around_word/76head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/76head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/77mode.txt b/crates/vim/test_data/test_change_around_word/77mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/77mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/78text.txt b/crates/vim/test_data/test_change_around_word/78text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/78text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/79head.txt b/crates/vim/test_data/test_change_around_word/79head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/79head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/7head.txt b/crates/vim/test_data/test_change_around_word/7head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/7head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/80mode.txt b/crates/vim/test_data/test_change_around_word/80mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/80mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/81text.txt b/crates/vim/test_data/test_change_around_word/81text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/81text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/82head.txt b/crates/vim/test_data/test_change_around_word/82head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/82head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/83mode.txt b/crates/vim/test_data/test_change_around_word/83mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/83mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/84text.txt b/crates/vim/test_data/test_change_around_word/84text.txt
new file mode 100644
index 0000000000..262feeae96
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/84text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/85head.txt b/crates/vim/test_data/test_change_around_word/85head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/85head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/86mode.txt b/crates/vim/test_data/test_change_around_word/86mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/86mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/87text.txt b/crates/vim/test_data/test_change_around_word/87text.txt
new file mode 100644
index 0000000000..ba0aea82d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/87text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/88head.txt b/crates/vim/test_data/test_change_around_word/88head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/88head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/89mode.txt b/crates/vim/test_data/test_change_around_word/89mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/89mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/8mode.txt b/crates/vim/test_data/test_change_around_word/8mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/8mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/90text.txt b/crates/vim/test_data/test_change_around_word/90text.txt
new file mode 100644
index 0000000000..783e049f86
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/90text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/91head.txt b/crates/vim/test_data/test_change_around_word/91head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/91head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/92mode.txt b/crates/vim/test_data/test_change_around_word/92mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/92mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/93text.txt b/crates/vim/test_data/test_change_around_word/93text.txt
new file mode 100644
index 0000000000..783e049f86
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/93text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/94head.txt b/crates/vim/test_data/test_change_around_word/94head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/94head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/95mode.txt b/crates/vim/test_data/test_change_around_word/95mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/95mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/96text.txt b/crates/vim/test_data/test_change_around_word/96text.txt
new file mode 100644
index 0000000000..523f6002f4
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/96text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/97head.txt b/crates/vim/test_data/test_change_around_word/97head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/97head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/98mode.txt b/crates/vim/test_data/test_change_around_word/98mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/98mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_around_word/99text.txt b/crates/vim/test_data/test_change_around_word/99text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/99text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_around_word/9text.txt b/crates/vim/test_data/test_change_around_word/9text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_change_around_word/9text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_sentence/0text.txt b/crates/vim/test_data/test_change_in_sentence/0text.txt
new file mode 100644
index 0000000000..fd36730b8d
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/0text.txt
@@ -0,0 +1 @@
+ Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/10head.txt b/crates/vim/test_data/test_change_in_sentence/10head.txt
new file mode 100644
index 0000000000..5df80e23c6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/10head.txt
@@ -0,0 +1 @@
+0,16
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/11mode.txt b/crates/vim/test_data/test_change_in_sentence/11mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/11mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/12text.txt b/crates/vim/test_data/test_change_in_sentence/12text.txt
new file mode 100644
index 0000000000..40eacc6489
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/12text.txt
@@ -0,0 +1 @@
+The quick brown?  Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/13head.txt b/crates/vim/test_data/test_change_in_sentence/13head.txt
new file mode 100644
index 0000000000..40d2f2ab55
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/13head.txt
@@ -0,0 +1 @@
+0,17
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/14mode.txt b/crates/vim/test_data/test_change_in_sentence/14mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/14mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/15text.txt b/crates/vim/test_data/test_change_in_sentence/15text.txt
new file mode 100644
index 0000000000..40eacc6489
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/15text.txt
@@ -0,0 +1 @@
+The quick brown?  Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/16head.txt b/crates/vim/test_data/test_change_in_sentence/16head.txt
new file mode 100644
index 0000000000..40d2f2ab55
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/16head.txt
@@ -0,0 +1 @@
+0,17
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/17mode.txt b/crates/vim/test_data/test_change_in_sentence/17mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/17mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/18text.txt b/crates/vim/test_data/test_change_in_sentence/18text.txt
new file mode 100644
index 0000000000..40eacc6489
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/18text.txt
@@ -0,0 +1 @@
+The quick brown?  Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/19head.txt b/crates/vim/test_data/test_change_in_sentence/19head.txt
new file mode 100644
index 0000000000..40d2f2ab55
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/19head.txt
@@ -0,0 +1 @@
+0,17
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/1head.txt b/crates/vim/test_data/test_change_in_sentence/1head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/1head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/20mode.txt b/crates/vim/test_data/test_change_in_sentence/20mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/20mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/21text.txt b/crates/vim/test_data/test_change_in_sentence/21text.txt
new file mode 100644
index 0000000000..ef17a5f7fb
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/21text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps!Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/22head.txt b/crates/vim/test_data/test_change_in_sentence/22head.txt
new file mode 100644
index 0000000000..17beb4d83f
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/22head.txt
@@ -0,0 +1 @@
+0,27
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/23mode.txt b/crates/vim/test_data/test_change_in_sentence/23mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/23mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/24text.txt b/crates/vim/test_data/test_change_in_sentence/24text.txt
new file mode 100644
index 0000000000..d81c10974f
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/24text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps! 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/25head.txt b/crates/vim/test_data/test_change_in_sentence/25head.txt
new file mode 100644
index 0000000000..588ae97095
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/25head.txt
@@ -0,0 +1 @@
+0,28
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/26mode.txt b/crates/vim/test_data/test_change_in_sentence/26mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/26mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/27text.txt b/crates/vim/test_data/test_change_in_sentence/27text.txt
new file mode 100644
index 0000000000..d81c10974f
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/27text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps! 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/28head.txt b/crates/vim/test_data/test_change_in_sentence/28head.txt
new file mode 100644
index 0000000000..588ae97095
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/28head.txt
@@ -0,0 +1 @@
+0,28
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/29mode.txt b/crates/vim/test_data/test_change_in_sentence/29mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/29mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/2mode.txt b/crates/vim/test_data/test_change_in_sentence/2mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/2mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/30text.txt b/crates/vim/test_data/test_change_in_sentence/30text.txt
new file mode 100644
index 0000000000..d81c10974f
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/30text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps! 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/31head.txt b/crates/vim/test_data/test_change_in_sentence/31head.txt
new file mode 100644
index 0000000000..588ae97095
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/31head.txt
@@ -0,0 +1 @@
+0,28
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/32mode.txt b/crates/vim/test_data/test_change_in_sentence/32mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/32mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/33text.txt b/crates/vim/test_data/test_change_in_sentence/33text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/33text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_change_in_sentence/34head.txt b/crates/vim/test_data/test_change_in_sentence/34head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/34head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/35mode.txt b/crates/vim/test_data/test_change_in_sentence/35mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/35mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/36text.txt b/crates/vim/test_data/test_change_in_sentence/36text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/36text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_change_in_sentence/37head.txt b/crates/vim/test_data/test_change_in_sentence/37head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/37head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/38mode.txt b/crates/vim/test_data/test_change_in_sentence/38mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/38mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/39text.txt b/crates/vim/test_data/test_change_in_sentence/39text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/39text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_change_in_sentence/3text.txt b/crates/vim/test_data/test_change_in_sentence/3text.txt
new file mode 100644
index 0000000000..fd36730b8d
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/3text.txt
@@ -0,0 +1 @@
+ Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/40head.txt b/crates/vim/test_data/test_change_in_sentence/40head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/40head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/41mode.txt b/crates/vim/test_data/test_change_in_sentence/41mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/41mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/42text.txt b/crates/vim/test_data/test_change_in_sentence/42text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/42text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_change_in_sentence/43head.txt b/crates/vim/test_data/test_change_in_sentence/43head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/43head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/44mode.txt b/crates/vim/test_data/test_change_in_sentence/44mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/44mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/45text.txt b/crates/vim/test_data/test_change_in_sentence/45text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/45text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_change_in_sentence/46head.txt b/crates/vim/test_data/test_change_in_sentence/46head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/46head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/47mode.txt b/crates/vim/test_data/test_change_in_sentence/47mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/47mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/48text.txt b/crates/vim/test_data/test_change_in_sentence/48text.txt
new file mode 100644
index 0000000000..bbf10c5693
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/48text.txt
@@ -0,0 +1,4 @@
+The quick brown   
+fox jumps over
+the lazy dog.The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_change_in_sentence/49head.txt b/crates/vim/test_data/test_change_in_sentence/49head.txt
new file mode 100644
index 0000000000..26560586d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/49head.txt
@@ -0,0 +1 @@
+2,13
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/4head.txt b/crates/vim/test_data/test_change_in_sentence/4head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/4head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/50mode.txt b/crates/vim/test_data/test_change_in_sentence/50mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/50mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/51text.txt b/crates/vim/test_data/test_change_in_sentence/51text.txt
new file mode 100644
index 0000000000..0b535bbbaf
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/51text.txt
@@ -0,0 +1,3 @@
+The quick brown   
+fox jumps over
+the lazy dog. 
diff --git a/crates/vim/test_data/test_change_in_sentence/52head.txt b/crates/vim/test_data/test_change_in_sentence/52head.txt
new file mode 100644
index 0000000000..e9aafafade
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/52head.txt
@@ -0,0 +1 @@
+2,14
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/53mode.txt b/crates/vim/test_data/test_change_in_sentence/53mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/53mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/54text.txt b/crates/vim/test_data/test_change_in_sentence/54text.txt
new file mode 100644
index 0000000000..0b535bbbaf
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/54text.txt
@@ -0,0 +1,3 @@
+The quick brown   
+fox jumps over
+the lazy dog. 
diff --git a/crates/vim/test_data/test_change_in_sentence/55head.txt b/crates/vim/test_data/test_change_in_sentence/55head.txt
new file mode 100644
index 0000000000..e9aafafade
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/55head.txt
@@ -0,0 +1 @@
+2,14
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/56mode.txt b/crates/vim/test_data/test_change_in_sentence/56mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/56mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/5mode.txt b/crates/vim/test_data/test_change_in_sentence/5mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/5mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/6text.txt b/crates/vim/test_data/test_change_in_sentence/6text.txt
new file mode 100644
index 0000000000..fd36730b8d
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/6text.txt
@@ -0,0 +1 @@
+ Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/7head.txt b/crates/vim/test_data/test_change_in_sentence/7head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/7head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/8mode.txt b/crates/vim/test_data/test_change_in_sentence/8mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/8mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_sentence/9text.txt b/crates/vim/test_data/test_change_in_sentence/9text.txt
new file mode 100644
index 0000000000..9e4b6dcc50
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_sentence/9text.txt
@@ -0,0 +1 @@
+The quick brown?Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/0text.txt b/crates/vim/test_data/test_change_in_word/0text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/0text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/100head.txt b/crates/vim/test_data/test_change_in_word/100head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/100head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/101mode.txt b/crates/vim/test_data/test_change_in_word/101mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/101mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/102text.txt b/crates/vim/test_data/test_change_in_word/102text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/102text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/103head.txt b/crates/vim/test_data/test_change_in_word/103head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/103head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/104mode.txt b/crates/vim/test_data/test_change_in_word/104mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/104mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/105text.txt b/crates/vim/test_data/test_change_in_word/105text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/105text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/106head.txt b/crates/vim/test_data/test_change_in_word/106head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/106head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/107mode.txt b/crates/vim/test_data/test_change_in_word/107mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/107mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/108text.txt b/crates/vim/test_data/test_change_in_word/108text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/108text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/109head.txt b/crates/vim/test_data/test_change_in_word/109head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/109head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/10head.txt b/crates/vim/test_data/test_change_in_word/10head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/10head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/110mode.txt b/crates/vim/test_data/test_change_in_word/110mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/110mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/111text.txt b/crates/vim/test_data/test_change_in_word/111text.txt
new file mode 100644
index 0000000000..7d13d92d35
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/111text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quickbrown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/112head.txt b/crates/vim/test_data/test_change_in_word/112head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/112head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/113mode.txt b/crates/vim/test_data/test_change_in_word/113mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/113mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/114text.txt b/crates/vim/test_data/test_change_in_word/114text.txt
new file mode 100644
index 0000000000..95b76ce25b
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/114text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick  
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/115head.txt b/crates/vim/test_data/test_change_in_word/115head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/115head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/116mode.txt b/crates/vim/test_data/test_change_in_word/116mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/116mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/117text.txt b/crates/vim/test_data/test_change_in_word/117text.txt
new file mode 100644
index 0000000000..805a5ebe4c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/117text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/118head.txt b/crates/vim/test_data/test_change_in_word/118head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/118head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/119mode.txt b/crates/vim/test_data/test_change_in_word/119mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/119mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/11mode.txt b/crates/vim/test_data/test_change_in_word/11mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/11mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/120text.txt b/crates/vim/test_data/test_change_in_word/120text.txt
new file mode 100644
index 0000000000..1d797e34b8
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/120text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/121head.txt b/crates/vim/test_data/test_change_in_word/121head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/121head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/122mode.txt b/crates/vim/test_data/test_change_in_word/122mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/122mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/123text.txt b/crates/vim/test_data/test_change_in_word/123text.txt
new file mode 100644
index 0000000000..8a35adfa26
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/123text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/124head.txt b/crates/vim/test_data/test_change_in_word/124head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/124head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/125mode.txt b/crates/vim/test_data/test_change_in_word/125mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/125mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/126text.txt b/crates/vim/test_data/test_change_in_word/126text.txt
new file mode 100644
index 0000000000..26e9d0a1b6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/126text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/127head.txt b/crates/vim/test_data/test_change_in_word/127head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/127head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/128mode.txt b/crates/vim/test_data/test_change_in_word/128mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/128mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/129text.txt b/crates/vim/test_data/test_change_in_word/129text.txt
new file mode 100644
index 0000000000..c2c9c0edb0
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/129text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+   over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/12text.txt b/crates/vim/test_data/test_change_in_word/12text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/12text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/130head.txt b/crates/vim/test_data/test_change_in_word/130head.txt
new file mode 100644
index 0000000000..edb3544f9a
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/130head.txt
@@ -0,0 +1 @@
+9,2
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/131mode.txt b/crates/vim/test_data/test_change_in_word/131mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/131mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/132text.txt b/crates/vim/test_data/test_change_in_word/132text.txt
new file mode 100644
index 0000000000..4b2cd80611
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/132text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
+
diff --git a/crates/vim/test_data/test_change_in_word/133head.txt b/crates/vim/test_data/test_change_in_word/133head.txt
new file mode 100644
index 0000000000..00f5ae6cbb
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/133head.txt
@@ -0,0 +1 @@
+10,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/134mode.txt b/crates/vim/test_data/test_change_in_word/134mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/134mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/135text.txt b/crates/vim/test_data/test_change_in_word/135text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/135text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/136head.txt b/crates/vim/test_data/test_change_in_word/136head.txt
new file mode 100644
index 0000000000..94dbddc699
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/136head.txt
@@ -0,0 +1 @@
+11,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/137mode.txt b/crates/vim/test_data/test_change_in_word/137mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/137mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/13head.txt b/crates/vim/test_data/test_change_in_word/13head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/13head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/14mode.txt b/crates/vim/test_data/test_change_in_word/14mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/14mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/15text.txt b/crates/vim/test_data/test_change_in_word/15text.txt
new file mode 100644
index 0000000000..282218da91
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/15text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumpsover
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/16head.txt b/crates/vim/test_data/test_change_in_word/16head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/16head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/17mode.txt b/crates/vim/test_data/test_change_in_word/17mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/17mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/18text.txt b/crates/vim/test_data/test_change_in_word/18text.txt
new file mode 100644
index 0000000000..0b042b7c39
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/18text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/19head.txt b/crates/vim/test_data/test_change_in_word/19head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/19head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/1head.txt b/crates/vim/test_data/test_change_in_word/1head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/1head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/20mode.txt b/crates/vim/test_data/test_change_in_word/20mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/20mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/21text.txt b/crates/vim/test_data/test_change_in_word/21text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/21text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/22head.txt b/crates/vim/test_data/test_change_in_word/22head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/22head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/23mode.txt b/crates/vim/test_data/test_change_in_word/23mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/23mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/24text.txt b/crates/vim/test_data/test_change_in_word/24text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/24text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/25head.txt b/crates/vim/test_data/test_change_in_word/25head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/25head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/26mode.txt b/crates/vim/test_data/test_change_in_word/26mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/26mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/27text.txt b/crates/vim/test_data/test_change_in_word/27text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/27text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/28head.txt b/crates/vim/test_data/test_change_in_word/28head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/28head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/29mode.txt b/crates/vim/test_data/test_change_in_word/29mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/29mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/2mode.txt b/crates/vim/test_data/test_change_in_word/2mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/2mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/30text.txt b/crates/vim/test_data/test_change_in_word/30text.txt
new file mode 100644
index 0000000000..609747299b
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/30text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/31head.txt b/crates/vim/test_data/test_change_in_word/31head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/31head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/32mode.txt b/crates/vim/test_data/test_change_in_word/32mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/32mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/33text.txt b/crates/vim/test_data/test_change_in_word/33text.txt
new file mode 100644
index 0000000000..12ede0f513
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/33text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+Thequick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/34head.txt b/crates/vim/test_data/test_change_in_word/34head.txt
new file mode 100644
index 0000000000..c20df71d5e
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/34head.txt
@@ -0,0 +1 @@
+6,3
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/35mode.txt b/crates/vim/test_data/test_change_in_word/35mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/35mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/36text.txt b/crates/vim/test_data/test_change_in_word/36text.txt
new file mode 100644
index 0000000000..3b3f900a05
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/36text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The- brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/37head.txt b/crates/vim/test_data/test_change_in_word/37head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/37head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/38mode.txt b/crates/vim/test_data/test_change_in_word/38mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/38mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/39text.txt b/crates/vim/test_data/test_change_in_word/39text.txt
new file mode 100644
index 0000000000..3b3f900a05
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/39text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The- brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/3text.txt b/crates/vim/test_data/test_change_in_word/3text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/3text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/40head.txt b/crates/vim/test_data/test_change_in_word/40head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/40head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/41mode.txt b/crates/vim/test_data/test_change_in_word/41mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/41mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/42text.txt b/crates/vim/test_data/test_change_in_word/42text.txt
new file mode 100644
index 0000000000..7d13d92d35
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/42text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quickbrown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/43head.txt b/crates/vim/test_data/test_change_in_word/43head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/43head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/44mode.txt b/crates/vim/test_data/test_change_in_word/44mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/44mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/45text.txt b/crates/vim/test_data/test_change_in_word/45text.txt
new file mode 100644
index 0000000000..95b76ce25b
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/45text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick  
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/46head.txt b/crates/vim/test_data/test_change_in_word/46head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/46head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/47mode.txt b/crates/vim/test_data/test_change_in_word/47mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/47mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/48text.txt b/crates/vim/test_data/test_change_in_word/48text.txt
new file mode 100644
index 0000000000..805a5ebe4c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/48text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/49head.txt b/crates/vim/test_data/test_change_in_word/49head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/49head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/4head.txt b/crates/vim/test_data/test_change_in_word/4head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/4head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/50mode.txt b/crates/vim/test_data/test_change_in_word/50mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/50mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/51text.txt b/crates/vim/test_data/test_change_in_word/51text.txt
new file mode 100644
index 0000000000..1d797e34b8
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/51text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/52head.txt b/crates/vim/test_data/test_change_in_word/52head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/52head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/53mode.txt b/crates/vim/test_data/test_change_in_word/53mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/53mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/54text.txt b/crates/vim/test_data/test_change_in_word/54text.txt
new file mode 100644
index 0000000000..8a35adfa26
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/54text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/55head.txt b/crates/vim/test_data/test_change_in_word/55head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/55head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/56mode.txt b/crates/vim/test_data/test_change_in_word/56mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/56mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/57text.txt b/crates/vim/test_data/test_change_in_word/57text.txt
new file mode 100644
index 0000000000..26e9d0a1b6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/57text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/58head.txt b/crates/vim/test_data/test_change_in_word/58head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/58head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/59mode.txt b/crates/vim/test_data/test_change_in_word/59mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/59mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/5mode.txt b/crates/vim/test_data/test_change_in_word/5mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/5mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/60text.txt b/crates/vim/test_data/test_change_in_word/60text.txt
new file mode 100644
index 0000000000..816bf47cf0
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/60text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox- over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/61head.txt b/crates/vim/test_data/test_change_in_word/61head.txt
new file mode 100644
index 0000000000..e0460d1bc5
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/61head.txt
@@ -0,0 +1 @@
+9,6
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/62mode.txt b/crates/vim/test_data/test_change_in_word/62mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/62mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/63text.txt b/crates/vim/test_data/test_change_in_word/63text.txt
new file mode 100644
index 0000000000..4b2cd80611
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/63text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
+
diff --git a/crates/vim/test_data/test_change_in_word/64head.txt b/crates/vim/test_data/test_change_in_word/64head.txt
new file mode 100644
index 0000000000..00f5ae6cbb
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/64head.txt
@@ -0,0 +1 @@
+10,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/65mode.txt b/crates/vim/test_data/test_change_in_word/65mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/65mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/66text.txt b/crates/vim/test_data/test_change_in_word/66text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/66text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/67head.txt b/crates/vim/test_data/test_change_in_word/67head.txt
new file mode 100644
index 0000000000..94dbddc699
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/67head.txt
@@ -0,0 +1 @@
+11,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/68mode.txt b/crates/vim/test_data/test_change_in_word/68mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/68mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/69text.txt b/crates/vim/test_data/test_change_in_word/69text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/69text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/6text.txt b/crates/vim/test_data/test_change_in_word/6text.txt
new file mode 100644
index 0000000000..35fd5c89ba
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/6text.txt
@@ -0,0 +1,12 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/70head.txt b/crates/vim/test_data/test_change_in_word/70head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/70head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/71mode.txt b/crates/vim/test_data/test_change_in_word/71mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/71mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/72text.txt b/crates/vim/test_data/test_change_in_word/72text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/72text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/73head.txt b/crates/vim/test_data/test_change_in_word/73head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/73head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/74mode.txt b/crates/vim/test_data/test_change_in_word/74mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/74mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/75text.txt b/crates/vim/test_data/test_change_in_word/75text.txt
new file mode 100644
index 0000000000..35fd5c89ba
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/75text.txt
@@ -0,0 +1,12 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/76head.txt b/crates/vim/test_data/test_change_in_word/76head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/76head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/77mode.txt b/crates/vim/test_data/test_change_in_word/77mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/77mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/78text.txt b/crates/vim/test_data/test_change_in_word/78text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/78text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/79head.txt b/crates/vim/test_data/test_change_in_word/79head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/79head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/7head.txt b/crates/vim/test_data/test_change_in_word/7head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/7head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/80mode.txt b/crates/vim/test_data/test_change_in_word/80mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/80mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/81text.txt b/crates/vim/test_data/test_change_in_word/81text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/81text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/82head.txt b/crates/vim/test_data/test_change_in_word/82head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/82head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/83mode.txt b/crates/vim/test_data/test_change_in_word/83mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/83mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/84text.txt b/crates/vim/test_data/test_change_in_word/84text.txt
new file mode 100644
index 0000000000..282218da91
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/84text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumpsover
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/85head.txt b/crates/vim/test_data/test_change_in_word/85head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/85head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/86mode.txt b/crates/vim/test_data/test_change_in_word/86mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/86mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/87text.txt b/crates/vim/test_data/test_change_in_word/87text.txt
new file mode 100644
index 0000000000..0b042b7c39
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/87text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/88head.txt b/crates/vim/test_data/test_change_in_word/88head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/88head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/89mode.txt b/crates/vim/test_data/test_change_in_word/89mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/89mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/8mode.txt b/crates/vim/test_data/test_change_in_word/8mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/8mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/90text.txt b/crates/vim/test_data/test_change_in_word/90text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/90text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/91head.txt b/crates/vim/test_data/test_change_in_word/91head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/91head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/92mode.txt b/crates/vim/test_data/test_change_in_word/92mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/92mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/93text.txt b/crates/vim/test_data/test_change_in_word/93text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/93text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/94head.txt b/crates/vim/test_data/test_change_in_word/94head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/94head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/95mode.txt b/crates/vim/test_data/test_change_in_word/95mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/95mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/96text.txt b/crates/vim/test_data/test_change_in_word/96text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/96text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/97head.txt b/crates/vim/test_data/test_change_in_word/97head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/97head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/98mode.txt b/crates/vim/test_data/test_change_in_word/98mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/98mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_change_in_word/99text.txt b/crates/vim/test_data/test_change_in_word/99text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/99text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_change_in_word/9text.txt b/crates/vim/test_data/test_change_in_word/9text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_change_in_word/9text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_sentence/0text.txt b/crates/vim/test_data/test_delete_around_sentence/0text.txt
new file mode 100644
index 0000000000..d2b92e8000
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/0text.txt
@@ -0,0 +1 @@
+Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/10head.txt b/crates/vim/test_data/test_delete_around_sentence/10head.txt
new file mode 100644
index 0000000000..5df80e23c6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/10head.txt
@@ -0,0 +1 @@
+0,16
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/1head.txt b/crates/vim/test_data/test_delete_around_sentence/1head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/1head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/2mode.txt b/crates/vim/test_data/test_delete_around_sentence/2mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/2mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/3text.txt b/crates/vim/test_data/test_delete_around_sentence/3text.txt
new file mode 100644
index 0000000000..d2b92e8000
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/3text.txt
@@ -0,0 +1 @@
+Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/4head.txt b/crates/vim/test_data/test_delete_around_sentence/4head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/4head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/5mode.txt b/crates/vim/test_data/test_delete_around_sentence/5mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/5mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/6text.txt b/crates/vim/test_data/test_delete_around_sentence/6text.txt
new file mode 100644
index 0000000000..d2b92e8000
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/6text.txt
@@ -0,0 +1 @@
+Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/7head.txt b/crates/vim/test_data/test_delete_around_sentence/7head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/7head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/8mode.txt b/crates/vim/test_data/test_delete_around_sentence/8mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/8mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_sentence/9text.txt b/crates/vim/test_data/test_delete_around_sentence/9text.txt
new file mode 100644
index 0000000000..5e3a12964d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_sentence/9text.txt
@@ -0,0 +1 @@
+The quick brown? Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/0text.txt b/crates/vim/test_data/test_delete_around_word/0text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/0text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/100head.txt b/crates/vim/test_data/test_delete_around_word/100head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/100head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/101mode.txt b/crates/vim/test_data/test_delete_around_word/101mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/101mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/102text.txt b/crates/vim/test_data/test_delete_around_word/102text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/102text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/103head.txt b/crates/vim/test_data/test_delete_around_word/103head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/103head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/104mode.txt b/crates/vim/test_data/test_delete_around_word/104mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/104mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/105text.txt b/crates/vim/test_data/test_delete_around_word/105text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/105text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/106head.txt b/crates/vim/test_data/test_delete_around_word/106head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/106head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/107mode.txt b/crates/vim/test_data/test_delete_around_word/107mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/107mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/108text.txt b/crates/vim/test_data/test_delete_around_word/108text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/108text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/109head.txt b/crates/vim/test_data/test_delete_around_word/109head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/109head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/10head.txt b/crates/vim/test_data/test_delete_around_word/10head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/10head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/110mode.txt b/crates/vim/test_data/test_delete_around_word/110mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/110mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/111text.txt b/crates/vim/test_data/test_delete_around_word/111text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/111text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/112head.txt b/crates/vim/test_data/test_delete_around_word/112head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/112head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/113mode.txt b/crates/vim/test_data/test_delete_around_word/113mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/113mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/114text.txt b/crates/vim/test_data/test_delete_around_word/114text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/114text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/115head.txt b/crates/vim/test_data/test_delete_around_word/115head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/115head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/116mode.txt b/crates/vim/test_data/test_delete_around_word/116mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/116mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/117text.txt b/crates/vim/test_data/test_delete_around_word/117text.txt
new file mode 100644
index 0000000000..0e9094161a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/117text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/118head.txt b/crates/vim/test_data/test_delete_around_word/118head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/118head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/119mode.txt b/crates/vim/test_data/test_delete_around_word/119mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/119mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/11mode.txt b/crates/vim/test_data/test_delete_around_word/11mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/11mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/120text.txt b/crates/vim/test_data/test_delete_around_word/120text.txt
new file mode 100644
index 0000000000..fa73eb37b8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/120text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+ over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/121head.txt b/crates/vim/test_data/test_delete_around_word/121head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/121head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/122mode.txt b/crates/vim/test_data/test_delete_around_word/122mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/122mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/123text.txt b/crates/vim/test_data/test_delete_around_word/123text.txt
new file mode 100644
index 0000000000..4fe33b47eb
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/123text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+ over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/124head.txt b/crates/vim/test_data/test_delete_around_word/124head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/124head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/125mode.txt b/crates/vim/test_data/test_delete_around_word/125mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/125mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/126text.txt b/crates/vim/test_data/test_delete_around_word/126text.txt
new file mode 100644
index 0000000000..35dd5816fc
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/126text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+ over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/127head.txt b/crates/vim/test_data/test_delete_around_word/127head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/127head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/128mode.txt b/crates/vim/test_data/test_delete_around_word/128mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/128mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/129text.txt b/crates/vim/test_data/test_delete_around_word/129text.txt
new file mode 100644
index 0000000000..1bac4587a7
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/129text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/12text.txt b/crates/vim/test_data/test_delete_around_word/12text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/12text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/130head.txt b/crates/vim/test_data/test_delete_around_word/130head.txt
new file mode 100644
index 0000000000..edb3544f9a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/130head.txt
@@ -0,0 +1 @@
+9,2
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/131mode.txt b/crates/vim/test_data/test_delete_around_word/131mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/131mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/132text.txt b/crates/vim/test_data/test_delete_around_word/132text.txt
new file mode 100644
index 0000000000..912316a9f7
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/132text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_delete_around_word/133head.txt b/crates/vim/test_data/test_delete_around_word/133head.txt
new file mode 100644
index 0000000000..63ee4f53ac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/133head.txt
@@ -0,0 +1 @@
+10,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/134mode.txt b/crates/vim/test_data/test_delete_around_word/134mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/134mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/135text.txt b/crates/vim/test_data/test_delete_around_word/135text.txt
new file mode 100644
index 0000000000..3c4e8c2398
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/135text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/136head.txt b/crates/vim/test_data/test_delete_around_word/136head.txt
new file mode 100644
index 0000000000..ec50c7d44f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/136head.txt
@@ -0,0 +1 @@
+10,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/137mode.txt b/crates/vim/test_data/test_delete_around_word/137mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/137mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/13head.txt b/crates/vim/test_data/test_delete_around_word/13head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/13head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/14mode.txt b/crates/vim/test_data/test_delete_around_word/14mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/14mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/15text.txt b/crates/vim/test_data/test_delete_around_word/15text.txt
new file mode 100644
index 0000000000..262feeae96
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/15text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/16head.txt b/crates/vim/test_data/test_delete_around_word/16head.txt
new file mode 100644
index 0000000000..413d7dd4d2
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/16head.txt
@@ -0,0 +1 @@
+1,8
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/17mode.txt b/crates/vim/test_data/test_delete_around_word/17mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/17mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/18text.txt b/crates/vim/test_data/test_delete_around_word/18text.txt
new file mode 100644
index 0000000000..ba0aea82d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/18text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/19head.txt b/crates/vim/test_data/test_delete_around_word/19head.txt
new file mode 100644
index 0000000000..06ce34087d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/19head.txt
@@ -0,0 +1 @@
+2,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/1head.txt b/crates/vim/test_data/test_delete_around_word/1head.txt
new file mode 100644
index 0000000000..2871b36925
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/1head.txt
@@ -0,0 +1 @@
+0,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/20mode.txt b/crates/vim/test_data/test_delete_around_word/20mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/20mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/21text.txt b/crates/vim/test_data/test_delete_around_word/21text.txt
new file mode 100644
index 0000000000..ead25fb9d0
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/21text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/22head.txt b/crates/vim/test_data/test_delete_around_word/22head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/22head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/23mode.txt b/crates/vim/test_data/test_delete_around_word/23mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/23mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/24text.txt b/crates/vim/test_data/test_delete_around_word/24text.txt
new file mode 100644
index 0000000000..ead25fb9d0
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/24text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/25head.txt b/crates/vim/test_data/test_delete_around_word/25head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/25head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/26mode.txt b/crates/vim/test_data/test_delete_around_word/26mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/26mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/27text.txt b/crates/vim/test_data/test_delete_around_word/27text.txt
new file mode 100644
index 0000000000..252419d291
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/27text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/28head.txt b/crates/vim/test_data/test_delete_around_word/28head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/28head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/29mode.txt b/crates/vim/test_data/test_delete_around_word/29mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/29mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/2mode.txt b/crates/vim/test_data/test_delete_around_word/2mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/2mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/30text.txt b/crates/vim/test_data/test_delete_around_word/30text.txt
new file mode 100644
index 0000000000..609747299b
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/30text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/31head.txt b/crates/vim/test_data/test_delete_around_word/31head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/31head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/32mode.txt b/crates/vim/test_data/test_delete_around_word/32mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/32mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/33text.txt b/crates/vim/test_data/test_delete_around_word/33text.txt
new file mode 100644
index 0000000000..12ede0f513
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/33text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+Thequick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/34head.txt b/crates/vim/test_data/test_delete_around_word/34head.txt
new file mode 100644
index 0000000000..c20df71d5e
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/34head.txt
@@ -0,0 +1 @@
+6,3
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/35mode.txt b/crates/vim/test_data/test_delete_around_word/35mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/35mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/36text.txt b/crates/vim/test_data/test_delete_around_word/36text.txt
new file mode 100644
index 0000000000..4a6d943982
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/36text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/37head.txt b/crates/vim/test_data/test_delete_around_word/37head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/37head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/38mode.txt b/crates/vim/test_data/test_delete_around_word/38mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/38mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/39text.txt b/crates/vim/test_data/test_delete_around_word/39text.txt
new file mode 100644
index 0000000000..4a6d943982
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/39text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/3text.txt b/crates/vim/test_data/test_delete_around_word/3text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/3text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/40head.txt b/crates/vim/test_data/test_delete_around_word/40head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/40head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/41mode.txt b/crates/vim/test_data/test_delete_around_word/41mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/41mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/42text.txt b/crates/vim/test_data/test_delete_around_word/42text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/42text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/43head.txt b/crates/vim/test_data/test_delete_around_word/43head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/43head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/44mode.txt b/crates/vim/test_data/test_delete_around_word/44mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/44mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/45text.txt b/crates/vim/test_data/test_delete_around_word/45text.txt
new file mode 100644
index 0000000000..f05cdd88c1
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/45text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/46head.txt b/crates/vim/test_data/test_delete_around_word/46head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/46head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/47mode.txt b/crates/vim/test_data/test_delete_around_word/47mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/47mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/48text.txt b/crates/vim/test_data/test_delete_around_word/48text.txt
new file mode 100644
index 0000000000..13b7d1cb51
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/48text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/49head.txt b/crates/vim/test_data/test_delete_around_word/49head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/49head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/4head.txt b/crates/vim/test_data/test_delete_around_word/4head.txt
new file mode 100644
index 0000000000..2871b36925
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/4head.txt
@@ -0,0 +1 @@
+0,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/50mode.txt b/crates/vim/test_data/test_delete_around_word/50mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/50mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/51text.txt b/crates/vim/test_data/test_delete_around_word/51text.txt
new file mode 100644
index 0000000000..3976ef9c85
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/51text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/52head.txt b/crates/vim/test_data/test_delete_around_word/52head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/52head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/53mode.txt b/crates/vim/test_data/test_delete_around_word/53mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/53mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/54text.txt b/crates/vim/test_data/test_delete_around_word/54text.txt
new file mode 100644
index 0000000000..b5ca31babe
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/54text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/55head.txt b/crates/vim/test_data/test_delete_around_word/55head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/55head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/56mode.txt b/crates/vim/test_data/test_delete_around_word/56mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/56mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/57text.txt b/crates/vim/test_data/test_delete_around_word/57text.txt
new file mode 100644
index 0000000000..0eaface506
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/57text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/58head.txt b/crates/vim/test_data/test_delete_around_word/58head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/58head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/59mode.txt b/crates/vim/test_data/test_delete_around_word/59mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/59mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/5mode.txt b/crates/vim/test_data/test_delete_around_word/5mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/5mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/60text.txt b/crates/vim/test_data/test_delete_around_word/60text.txt
new file mode 100644
index 0000000000..d8b9b05b79
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/60text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/61head.txt b/crates/vim/test_data/test_delete_around_word/61head.txt
new file mode 100644
index 0000000000..e0460d1bc5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/61head.txt
@@ -0,0 +1 @@
+9,6
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/62mode.txt b/crates/vim/test_data/test_delete_around_word/62mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/62mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/63text.txt b/crates/vim/test_data/test_delete_around_word/63text.txt
new file mode 100644
index 0000000000..912316a9f7
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/63text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_delete_around_word/64head.txt b/crates/vim/test_data/test_delete_around_word/64head.txt
new file mode 100644
index 0000000000..63ee4f53ac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/64head.txt
@@ -0,0 +1 @@
+10,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/65mode.txt b/crates/vim/test_data/test_delete_around_word/65mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/65mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/66text.txt b/crates/vim/test_data/test_delete_around_word/66text.txt
new file mode 100644
index 0000000000..3c4e8c2398
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/66text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/67head.txt b/crates/vim/test_data/test_delete_around_word/67head.txt
new file mode 100644
index 0000000000..ec50c7d44f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/67head.txt
@@ -0,0 +1 @@
+10,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/68mode.txt b/crates/vim/test_data/test_delete_around_word/68mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/68mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/69text.txt b/crates/vim/test_data/test_delete_around_word/69text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/69text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/6text.txt b/crates/vim/test_data/test_delete_around_word/6text.txt
new file mode 100644
index 0000000000..3678c219a3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/6text.txt
@@ -0,0 +1,11 @@
+The quick brown jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/70head.txt b/crates/vim/test_data/test_delete_around_word/70head.txt
new file mode 100644
index 0000000000..2871b36925
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/70head.txt
@@ -0,0 +1 @@
+0,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/71mode.txt b/crates/vim/test_data/test_delete_around_word/71mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/71mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/72text.txt b/crates/vim/test_data/test_delete_around_word/72text.txt
new file mode 100644
index 0000000000..366beed733
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/72text.txt
@@ -0,0 +1,12 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/73head.txt b/crates/vim/test_data/test_delete_around_word/73head.txt
new file mode 100644
index 0000000000..2871b36925
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/73head.txt
@@ -0,0 +1 @@
+0,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/74mode.txt b/crates/vim/test_data/test_delete_around_word/74mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/74mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/75text.txt b/crates/vim/test_data/test_delete_around_word/75text.txt
new file mode 100644
index 0000000000..3678c219a3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/75text.txt
@@ -0,0 +1,11 @@
+The quick brown jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/76head.txt b/crates/vim/test_data/test_delete_around_word/76head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/76head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/77mode.txt b/crates/vim/test_data/test_delete_around_word/77mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/77mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/78text.txt b/crates/vim/test_data/test_delete_around_word/78text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/78text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/79head.txt b/crates/vim/test_data/test_delete_around_word/79head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/79head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/7head.txt b/crates/vim/test_data/test_delete_around_word/7head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/7head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/80mode.txt b/crates/vim/test_data/test_delete_around_word/80mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/80mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/81text.txt b/crates/vim/test_data/test_delete_around_word/81text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/81text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/82head.txt b/crates/vim/test_data/test_delete_around_word/82head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/82head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/83mode.txt b/crates/vim/test_data/test_delete_around_word/83mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/83mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/84text.txt b/crates/vim/test_data/test_delete_around_word/84text.txt
new file mode 100644
index 0000000000..262feeae96
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/84text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/85head.txt b/crates/vim/test_data/test_delete_around_word/85head.txt
new file mode 100644
index 0000000000..413d7dd4d2
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/85head.txt
@@ -0,0 +1 @@
+1,8
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/86mode.txt b/crates/vim/test_data/test_delete_around_word/86mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/86mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/87text.txt b/crates/vim/test_data/test_delete_around_word/87text.txt
new file mode 100644
index 0000000000..ba0aea82d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/87text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/88head.txt b/crates/vim/test_data/test_delete_around_word/88head.txt
new file mode 100644
index 0000000000..06ce34087d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/88head.txt
@@ -0,0 +1 @@
+2,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/89mode.txt b/crates/vim/test_data/test_delete_around_word/89mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/89mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/8mode.txt b/crates/vim/test_data/test_delete_around_word/8mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/8mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/90text.txt b/crates/vim/test_data/test_delete_around_word/90text.txt
new file mode 100644
index 0000000000..ead25fb9d0
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/90text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/91head.txt b/crates/vim/test_data/test_delete_around_word/91head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/91head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/92mode.txt b/crates/vim/test_data/test_delete_around_word/92mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/92mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/93text.txt b/crates/vim/test_data/test_delete_around_word/93text.txt
new file mode 100644
index 0000000000..ead25fb9d0
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/93text.txt
@@ -0,0 +1,10 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/94head.txt b/crates/vim/test_data/test_delete_around_word/94head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/94head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/95mode.txt b/crates/vim/test_data/test_delete_around_word/95mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/95mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/96text.txt b/crates/vim/test_data/test_delete_around_word/96text.txt
new file mode 100644
index 0000000000..523f6002f4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/96text.txt
@@ -0,0 +1,11 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/97head.txt b/crates/vim/test_data/test_delete_around_word/97head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/97head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/98mode.txt b/crates/vim/test_data/test_delete_around_word/98mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/98mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_around_word/99text.txt b/crates/vim/test_data/test_delete_around_word/99text.txt
new file mode 100644
index 0000000000..c8a5876179
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/99text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_around_word/9text.txt b/crates/vim/test_data/test_delete_around_word/9text.txt
new file mode 100644
index 0000000000..2feb66cfb9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_around_word/9text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_sentence/0text.txt b/crates/vim/test_data/test_delete_in_sentence/0text.txt
new file mode 100644
index 0000000000..fd36730b8d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/0text.txt
@@ -0,0 +1 @@
+ Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/10head.txt b/crates/vim/test_data/test_delete_in_sentence/10head.txt
new file mode 100644
index 0000000000..5df80e23c6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/10head.txt
@@ -0,0 +1 @@
+0,16
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/11mode.txt b/crates/vim/test_data/test_delete_in_sentence/11mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/11mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/12text.txt b/crates/vim/test_data/test_delete_in_sentence/12text.txt
new file mode 100644
index 0000000000..40eacc6489
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/12text.txt
@@ -0,0 +1 @@
+The quick brown?  Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/13head.txt b/crates/vim/test_data/test_delete_in_sentence/13head.txt
new file mode 100644
index 0000000000..40d2f2ab55
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/13head.txt
@@ -0,0 +1 @@
+0,17
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/14mode.txt b/crates/vim/test_data/test_delete_in_sentence/14mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/14mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/15text.txt b/crates/vim/test_data/test_delete_in_sentence/15text.txt
new file mode 100644
index 0000000000..40eacc6489
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/15text.txt
@@ -0,0 +1 @@
+The quick brown?  Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/16head.txt b/crates/vim/test_data/test_delete_in_sentence/16head.txt
new file mode 100644
index 0000000000..40d2f2ab55
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/16head.txt
@@ -0,0 +1 @@
+0,17
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/17mode.txt b/crates/vim/test_data/test_delete_in_sentence/17mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/17mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/18text.txt b/crates/vim/test_data/test_delete_in_sentence/18text.txt
new file mode 100644
index 0000000000..40eacc6489
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/18text.txt
@@ -0,0 +1 @@
+The quick brown?  Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/19head.txt b/crates/vim/test_data/test_delete_in_sentence/19head.txt
new file mode 100644
index 0000000000..40d2f2ab55
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/19head.txt
@@ -0,0 +1 @@
+0,17
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/1head.txt b/crates/vim/test_data/test_delete_in_sentence/1head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/1head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/20mode.txt b/crates/vim/test_data/test_delete_in_sentence/20mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/20mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/21text.txt b/crates/vim/test_data/test_delete_in_sentence/21text.txt
new file mode 100644
index 0000000000..ef17a5f7fb
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/21text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps!Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/22head.txt b/crates/vim/test_data/test_delete_in_sentence/22head.txt
new file mode 100644
index 0000000000..17beb4d83f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/22head.txt
@@ -0,0 +1 @@
+0,27
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/23mode.txt b/crates/vim/test_data/test_delete_in_sentence/23mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/23mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/24text.txt b/crates/vim/test_data/test_delete_in_sentence/24text.txt
new file mode 100644
index 0000000000..d81c10974f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/24text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps! 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/25head.txt b/crates/vim/test_data/test_delete_in_sentence/25head.txt
new file mode 100644
index 0000000000..17beb4d83f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/25head.txt
@@ -0,0 +1 @@
+0,27
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/26mode.txt b/crates/vim/test_data/test_delete_in_sentence/26mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/26mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/27text.txt b/crates/vim/test_data/test_delete_in_sentence/27text.txt
new file mode 100644
index 0000000000..d81c10974f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/27text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps! 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/28head.txt b/crates/vim/test_data/test_delete_in_sentence/28head.txt
new file mode 100644
index 0000000000..17beb4d83f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/28head.txt
@@ -0,0 +1 @@
+0,27
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/29mode.txt b/crates/vim/test_data/test_delete_in_sentence/29mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/29mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/2mode.txt b/crates/vim/test_data/test_delete_in_sentence/2mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/2mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/30text.txt b/crates/vim/test_data/test_delete_in_sentence/30text.txt
new file mode 100644
index 0000000000..d81c10974f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/30text.txt
@@ -0,0 +1 @@
+The quick brown? Fox Jumps! 
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/31head.txt b/crates/vim/test_data/test_delete_in_sentence/31head.txt
new file mode 100644
index 0000000000..17beb4d83f
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/31head.txt
@@ -0,0 +1 @@
+0,27
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/32mode.txt b/crates/vim/test_data/test_delete_in_sentence/32mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/32mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/33text.txt b/crates/vim/test_data/test_delete_in_sentence/33text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/33text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_delete_in_sentence/34head.txt b/crates/vim/test_data/test_delete_in_sentence/34head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/34head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/35mode.txt b/crates/vim/test_data/test_delete_in_sentence/35mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/35mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/36text.txt b/crates/vim/test_data/test_delete_in_sentence/36text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/36text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_delete_in_sentence/37head.txt b/crates/vim/test_data/test_delete_in_sentence/37head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/37head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/38mode.txt b/crates/vim/test_data/test_delete_in_sentence/38mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/38mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/39text.txt b/crates/vim/test_data/test_delete_in_sentence/39text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/39text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_delete_in_sentence/3text.txt b/crates/vim/test_data/test_delete_in_sentence/3text.txt
new file mode 100644
index 0000000000..fd36730b8d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/3text.txt
@@ -0,0 +1 @@
+ Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/40head.txt b/crates/vim/test_data/test_delete_in_sentence/40head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/40head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/41mode.txt b/crates/vim/test_data/test_delete_in_sentence/41mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/41mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/42text.txt b/crates/vim/test_data/test_delete_in_sentence/42text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/42text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_delete_in_sentence/43head.txt b/crates/vim/test_data/test_delete_in_sentence/43head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/43head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/44mode.txt b/crates/vim/test_data/test_delete_in_sentence/44mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/44mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/45text.txt b/crates/vim/test_data/test_delete_in_sentence/45text.txt
new file mode 100644
index 0000000000..561ed0800c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/45text.txt
@@ -0,0 +1,2 @@
+ The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_delete_in_sentence/46head.txt b/crates/vim/test_data/test_delete_in_sentence/46head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/46head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/47mode.txt b/crates/vim/test_data/test_delete_in_sentence/47mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/47mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/48text.txt b/crates/vim/test_data/test_delete_in_sentence/48text.txt
new file mode 100644
index 0000000000..bbf10c5693
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/48text.txt
@@ -0,0 +1,4 @@
+The quick brown   
+fox jumps over
+the lazy dog.The quick 
+brown fox jumps over
diff --git a/crates/vim/test_data/test_delete_in_sentence/49head.txt b/crates/vim/test_data/test_delete_in_sentence/49head.txt
new file mode 100644
index 0000000000..26560586d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/49head.txt
@@ -0,0 +1 @@
+2,13
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/4head.txt b/crates/vim/test_data/test_delete_in_sentence/4head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/4head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/50mode.txt b/crates/vim/test_data/test_delete_in_sentence/50mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/50mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/51text.txt b/crates/vim/test_data/test_delete_in_sentence/51text.txt
new file mode 100644
index 0000000000..0b535bbbaf
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/51text.txt
@@ -0,0 +1,3 @@
+The quick brown   
+fox jumps over
+the lazy dog. 
diff --git a/crates/vim/test_data/test_delete_in_sentence/52head.txt b/crates/vim/test_data/test_delete_in_sentence/52head.txt
new file mode 100644
index 0000000000..26560586d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/52head.txt
@@ -0,0 +1 @@
+2,13
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/53mode.txt b/crates/vim/test_data/test_delete_in_sentence/53mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/53mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/54text.txt b/crates/vim/test_data/test_delete_in_sentence/54text.txt
new file mode 100644
index 0000000000..0b535bbbaf
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/54text.txt
@@ -0,0 +1,3 @@
+The quick brown   
+fox jumps over
+the lazy dog. 
diff --git a/crates/vim/test_data/test_delete_in_sentence/55head.txt b/crates/vim/test_data/test_delete_in_sentence/55head.txt
new file mode 100644
index 0000000000..26560586d9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/55head.txt
@@ -0,0 +1 @@
+2,13
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/56mode.txt b/crates/vim/test_data/test_delete_in_sentence/56mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/56mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/5mode.txt b/crates/vim/test_data/test_delete_in_sentence/5mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/5mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/6text.txt b/crates/vim/test_data/test_delete_in_sentence/6text.txt
new file mode 100644
index 0000000000..fd36730b8d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/6text.txt
@@ -0,0 +1 @@
+ Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/7head.txt b/crates/vim/test_data/test_delete_in_sentence/7head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/7head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/8mode.txt b/crates/vim/test_data/test_delete_in_sentence/8mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/8mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_sentence/9text.txt b/crates/vim/test_data/test_delete_in_sentence/9text.txt
new file mode 100644
index 0000000000..9e4b6dcc50
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_sentence/9text.txt
@@ -0,0 +1 @@
+The quick brown?Fox Jumps! Over the lazy.
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/0text.txt b/crates/vim/test_data/test_delete_in_word/0text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/0text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/100head.txt b/crates/vim/test_data/test_delete_in_word/100head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/100head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/101mode.txt b/crates/vim/test_data/test_delete_in_word/101mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/101mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/102text.txt b/crates/vim/test_data/test_delete_in_word/102text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/102text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/103head.txt b/crates/vim/test_data/test_delete_in_word/103head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/103head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/104mode.txt b/crates/vim/test_data/test_delete_in_word/104mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/104mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/105text.txt b/crates/vim/test_data/test_delete_in_word/105text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/105text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/106head.txt b/crates/vim/test_data/test_delete_in_word/106head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/106head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/107mode.txt b/crates/vim/test_data/test_delete_in_word/107mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/107mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/108text.txt b/crates/vim/test_data/test_delete_in_word/108text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/108text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/109head.txt b/crates/vim/test_data/test_delete_in_word/109head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/109head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/10head.txt b/crates/vim/test_data/test_delete_in_word/10head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/10head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/110mode.txt b/crates/vim/test_data/test_delete_in_word/110mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/110mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/111text.txt b/crates/vim/test_data/test_delete_in_word/111text.txt
new file mode 100644
index 0000000000..7d13d92d35
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/111text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quickbrown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/112head.txt b/crates/vim/test_data/test_delete_in_word/112head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/112head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/113mode.txt b/crates/vim/test_data/test_delete_in_word/113mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/113mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/114text.txt b/crates/vim/test_data/test_delete_in_word/114text.txt
new file mode 100644
index 0000000000..95b76ce25b
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/114text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick  
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/115head.txt b/crates/vim/test_data/test_delete_in_word/115head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/115head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/116mode.txt b/crates/vim/test_data/test_delete_in_word/116mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/116mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/117text.txt b/crates/vim/test_data/test_delete_in_word/117text.txt
new file mode 100644
index 0000000000..805a5ebe4c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/117text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/118head.txt b/crates/vim/test_data/test_delete_in_word/118head.txt
new file mode 100644
index 0000000000..afce6fe58c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/118head.txt
@@ -0,0 +1 @@
+6,14
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/119mode.txt b/crates/vim/test_data/test_delete_in_word/119mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/119mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/11mode.txt b/crates/vim/test_data/test_delete_in_word/11mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/11mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/120text.txt b/crates/vim/test_data/test_delete_in_word/120text.txt
new file mode 100644
index 0000000000..1d797e34b8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/120text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/121head.txt b/crates/vim/test_data/test_delete_in_word/121head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/121head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/122mode.txt b/crates/vim/test_data/test_delete_in_word/122mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/122mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/123text.txt b/crates/vim/test_data/test_delete_in_word/123text.txt
new file mode 100644
index 0000000000..8a35adfa26
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/123text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/124head.txt b/crates/vim/test_data/test_delete_in_word/124head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/124head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/125mode.txt b/crates/vim/test_data/test_delete_in_word/125mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/125mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/126text.txt b/crates/vim/test_data/test_delete_in_word/126text.txt
new file mode 100644
index 0000000000..26e9d0a1b6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/126text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/127head.txt b/crates/vim/test_data/test_delete_in_word/127head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/127head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/128mode.txt b/crates/vim/test_data/test_delete_in_word/128mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/128mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/129text.txt b/crates/vim/test_data/test_delete_in_word/129text.txt
new file mode 100644
index 0000000000..c2c9c0edb0
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/129text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+   over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/12text.txt b/crates/vim/test_data/test_delete_in_word/12text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/12text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/130head.txt b/crates/vim/test_data/test_delete_in_word/130head.txt
new file mode 100644
index 0000000000..edb3544f9a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/130head.txt
@@ -0,0 +1 @@
+9,2
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/131mode.txt b/crates/vim/test_data/test_delete_in_word/131mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/131mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/132text.txt b/crates/vim/test_data/test_delete_in_word/132text.txt
new file mode 100644
index 0000000000..4b2cd80611
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/132text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
+
diff --git a/crates/vim/test_data/test_delete_in_word/133head.txt b/crates/vim/test_data/test_delete_in_word/133head.txt
new file mode 100644
index 0000000000..63ee4f53ac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/133head.txt
@@ -0,0 +1 @@
+10,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/134mode.txt b/crates/vim/test_data/test_delete_in_word/134mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/134mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/135text.txt b/crates/vim/test_data/test_delete_in_word/135text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/135text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/136head.txt b/crates/vim/test_data/test_delete_in_word/136head.txt
new file mode 100644
index 0000000000..94dbddc699
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/136head.txt
@@ -0,0 +1 @@
+11,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/137mode.txt b/crates/vim/test_data/test_delete_in_word/137mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/137mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/13head.txt b/crates/vim/test_data/test_delete_in_word/13head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/13head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/14mode.txt b/crates/vim/test_data/test_delete_in_word/14mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/14mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/15text.txt b/crates/vim/test_data/test_delete_in_word/15text.txt
new file mode 100644
index 0000000000..282218da91
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/15text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumpsover
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/16head.txt b/crates/vim/test_data/test_delete_in_word/16head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/16head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/17mode.txt b/crates/vim/test_data/test_delete_in_word/17mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/17mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/18text.txt b/crates/vim/test_data/test_delete_in_word/18text.txt
new file mode 100644
index 0000000000..0b042b7c39
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/18text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/19head.txt b/crates/vim/test_data/test_delete_in_word/19head.txt
new file mode 100644
index 0000000000..06ce34087d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/19head.txt
@@ -0,0 +1 @@
+2,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/1head.txt b/crates/vim/test_data/test_delete_in_word/1head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/1head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/20mode.txt b/crates/vim/test_data/test_delete_in_word/20mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/20mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/21text.txt b/crates/vim/test_data/test_delete_in_word/21text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/21text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/22head.txt b/crates/vim/test_data/test_delete_in_word/22head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/22head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/23mode.txt b/crates/vim/test_data/test_delete_in_word/23mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/23mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/24text.txt b/crates/vim/test_data/test_delete_in_word/24text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/24text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/25head.txt b/crates/vim/test_data/test_delete_in_word/25head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/25head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/26mode.txt b/crates/vim/test_data/test_delete_in_word/26mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/26mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/27text.txt b/crates/vim/test_data/test_delete_in_word/27text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/27text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/28head.txt b/crates/vim/test_data/test_delete_in_word/28head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/28head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/29mode.txt b/crates/vim/test_data/test_delete_in_word/29mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/29mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/2mode.txt b/crates/vim/test_data/test_delete_in_word/2mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/2mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/30text.txt b/crates/vim/test_data/test_delete_in_word/30text.txt
new file mode 100644
index 0000000000..609747299b
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/30text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/31head.txt b/crates/vim/test_data/test_delete_in_word/31head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/31head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/32mode.txt b/crates/vim/test_data/test_delete_in_word/32mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/32mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/33text.txt b/crates/vim/test_data/test_delete_in_word/33text.txt
new file mode 100644
index 0000000000..12ede0f513
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/33text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+Thequick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/34head.txt b/crates/vim/test_data/test_delete_in_word/34head.txt
new file mode 100644
index 0000000000..c20df71d5e
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/34head.txt
@@ -0,0 +1 @@
+6,3
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/35mode.txt b/crates/vim/test_data/test_delete_in_word/35mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/35mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/36text.txt b/crates/vim/test_data/test_delete_in_word/36text.txt
new file mode 100644
index 0000000000..3b3f900a05
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/36text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The- brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/37head.txt b/crates/vim/test_data/test_delete_in_word/37head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/37head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/38mode.txt b/crates/vim/test_data/test_delete_in_word/38mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/38mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/39text.txt b/crates/vim/test_data/test_delete_in_word/39text.txt
new file mode 100644
index 0000000000..3b3f900a05
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/39text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The- brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/3text.txt b/crates/vim/test_data/test_delete_in_word/3text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/3text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/40head.txt b/crates/vim/test_data/test_delete_in_word/40head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/40head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/41mode.txt b/crates/vim/test_data/test_delete_in_word/41mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/41mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/42text.txt b/crates/vim/test_data/test_delete_in_word/42text.txt
new file mode 100644
index 0000000000..7d13d92d35
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/42text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quickbrown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/43head.txt b/crates/vim/test_data/test_delete_in_word/43head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/43head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/44mode.txt b/crates/vim/test_data/test_delete_in_word/44mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/44mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/45text.txt b/crates/vim/test_data/test_delete_in_word/45text.txt
new file mode 100644
index 0000000000..95b76ce25b
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/45text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick  
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/46head.txt b/crates/vim/test_data/test_delete_in_word/46head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/46head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/47mode.txt b/crates/vim/test_data/test_delete_in_word/47mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/47mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/48text.txt b/crates/vim/test_data/test_delete_in_word/48text.txt
new file mode 100644
index 0000000000..805a5ebe4c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/48text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/49head.txt b/crates/vim/test_data/test_delete_in_word/49head.txt
new file mode 100644
index 0000000000..afce6fe58c
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/49head.txt
@@ -0,0 +1 @@
+6,14
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/4head.txt b/crates/vim/test_data/test_delete_in_word/4head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/4head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/50mode.txt b/crates/vim/test_data/test_delete_in_word/50mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/50mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/51text.txt b/crates/vim/test_data/test_delete_in_word/51text.txt
new file mode 100644
index 0000000000..1d797e34b8
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/51text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/52head.txt b/crates/vim/test_data/test_delete_in_word/52head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/52head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/53mode.txt b/crates/vim/test_data/test_delete_in_word/53mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/53mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/54text.txt b/crates/vim/test_data/test_delete_in_word/54text.txt
new file mode 100644
index 0000000000..8a35adfa26
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/54text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/55head.txt b/crates/vim/test_data/test_delete_in_word/55head.txt
new file mode 100644
index 0000000000..ded56a5926
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/55head.txt
@@ -0,0 +1 @@
+8,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/56mode.txt b/crates/vim/test_data/test_delete_in_word/56mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/56mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/57text.txt b/crates/vim/test_data/test_delete_in_word/57text.txt
new file mode 100644
index 0000000000..26e9d0a1b6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/57text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/58head.txt b/crates/vim/test_data/test_delete_in_word/58head.txt
new file mode 100644
index 0000000000..8e69e0ad79
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/58head.txt
@@ -0,0 +1 @@
+9,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/59mode.txt b/crates/vim/test_data/test_delete_in_word/59mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/59mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/5mode.txt b/crates/vim/test_data/test_delete_in_word/5mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/5mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/60text.txt b/crates/vim/test_data/test_delete_in_word/60text.txt
new file mode 100644
index 0000000000..816bf47cf0
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/60text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox- over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/61head.txt b/crates/vim/test_data/test_delete_in_word/61head.txt
new file mode 100644
index 0000000000..e0460d1bc5
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/61head.txt
@@ -0,0 +1 @@
+9,6
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/62mode.txt b/crates/vim/test_data/test_delete_in_word/62mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/62mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/63text.txt b/crates/vim/test_data/test_delete_in_word/63text.txt
new file mode 100644
index 0000000000..4b2cd80611
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/63text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog
+
diff --git a/crates/vim/test_data/test_delete_in_word/64head.txt b/crates/vim/test_data/test_delete_in_word/64head.txt
new file mode 100644
index 0000000000..63ee4f53ac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/64head.txt
@@ -0,0 +1 @@
+10,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/65mode.txt b/crates/vim/test_data/test_delete_in_word/65mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/65mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/66text.txt b/crates/vim/test_data/test_delete_in_word/66text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/66text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/67head.txt b/crates/vim/test_data/test_delete_in_word/67head.txt
new file mode 100644
index 0000000000..94dbddc699
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/67head.txt
@@ -0,0 +1 @@
+11,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/68mode.txt b/crates/vim/test_data/test_delete_in_word/68mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/68mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/69text.txt b/crates/vim/test_data/test_delete_in_word/69text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/69text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/6text.txt b/crates/vim/test_data/test_delete_in_word/6text.txt
new file mode 100644
index 0000000000..35fd5c89ba
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/6text.txt
@@ -0,0 +1,12 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/70head.txt b/crates/vim/test_data/test_delete_in_word/70head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/70head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/71mode.txt b/crates/vim/test_data/test_delete_in_word/71mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/71mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/72text.txt b/crates/vim/test_data/test_delete_in_word/72text.txt
new file mode 100644
index 0000000000..481389e676
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/72text.txt
@@ -0,0 +1,12 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/73head.txt b/crates/vim/test_data/test_delete_in_word/73head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/73head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/74mode.txt b/crates/vim/test_data/test_delete_in_word/74mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/74mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/75text.txt b/crates/vim/test_data/test_delete_in_word/75text.txt
new file mode 100644
index 0000000000..35fd5c89ba
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/75text.txt
@@ -0,0 +1,12 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/76head.txt b/crates/vim/test_data/test_delete_in_word/76head.txt
new file mode 100644
index 0000000000..8b208cec2d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/76head.txt
@@ -0,0 +1 @@
+0,14
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/77mode.txt b/crates/vim/test_data/test_delete_in_word/77mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/77mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/78text.txt b/crates/vim/test_data/test_delete_in_word/78text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/78text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/79head.txt b/crates/vim/test_data/test_delete_in_word/79head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/79head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/7head.txt b/crates/vim/test_data/test_delete_in_word/7head.txt
new file mode 100644
index 0000000000..8b208cec2d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/7head.txt
@@ -0,0 +1 @@
+0,14
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/80mode.txt b/crates/vim/test_data/test_delete_in_word/80mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/80mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/81text.txt b/crates/vim/test_data/test_delete_in_word/81text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/81text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/82head.txt b/crates/vim/test_data/test_delete_in_word/82head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/82head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/83mode.txt b/crates/vim/test_data/test_delete_in_word/83mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/83mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/84text.txt b/crates/vim/test_data/test_delete_in_word/84text.txt
new file mode 100644
index 0000000000..282218da91
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/84text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumpsover
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/85head.txt b/crates/vim/test_data/test_delete_in_word/85head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/85head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/86mode.txt b/crates/vim/test_data/test_delete_in_word/86mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/86mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/87text.txt b/crates/vim/test_data/test_delete_in_word/87text.txt
new file mode 100644
index 0000000000..0b042b7c39
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/87text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/88head.txt b/crates/vim/test_data/test_delete_in_word/88head.txt
new file mode 100644
index 0000000000..06ce34087d
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/88head.txt
@@ -0,0 +1 @@
+2,11
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/89mode.txt b/crates/vim/test_data/test_delete_in_word/89mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/89mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/8mode.txt b/crates/vim/test_data/test_delete_in_word/8mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/8mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/90text.txt b/crates/vim/test_data/test_delete_in_word/90text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/90text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/91head.txt b/crates/vim/test_data/test_delete_in_word/91head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/91head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/92mode.txt b/crates/vim/test_data/test_delete_in_word/92mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/92mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/93text.txt b/crates/vim/test_data/test_delete_in_word/93text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/93text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/94head.txt b/crates/vim/test_data/test_delete_in_word/94head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/94head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/95mode.txt b/crates/vim/test_data/test_delete_in_word/95mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/95mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/96text.txt b/crates/vim/test_data/test_delete_in_word/96text.txt
new file mode 100644
index 0000000000..e971227436
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/96text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/97head.txt b/crates/vim/test_data/test_delete_in_word/97head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/97head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/98mode.txt b/crates/vim/test_data/test_delete_in_word/98mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/98mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_delete_in_word/99text.txt b/crates/vim/test_data/test_delete_in_word/99text.txt
new file mode 100644
index 0000000000..d90b2c4e48
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/99text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_delete_in_word/9text.txt b/crates/vim/test_data/test_delete_in_word/9text.txt
new file mode 100644
index 0000000000..38c6ccbeac
--- /dev/null
+++ b/crates/vim/test_data/test_delete_in_word/9text.txt
@@ -0,0 +1,12 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  
+  
+  fox-jumps over
+the lazy dog 
+
diff --git a/crates/vim/test_data/test_neovim/0text.txt b/crates/vim/test_data/test_neovim/0text.txt
new file mode 100644
index 0000000000..30d74d2584
--- /dev/null
+++ b/crates/vim/test_data/test_neovim/0text.txt
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/crates/vim/test_data/test_neovim/1head.txt b/crates/vim/test_data/test_neovim/1head.txt
new file mode 100644
index 0000000000..7de346d2f5
--- /dev/null
+++ b/crates/vim/test_data/test_neovim/1head.txt
@@ -0,0 +1 @@
+0,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_neovim/2mode.txt b/crates/vim/test_data/test_neovim/2mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_neovim/2mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/0text.txt b/crates/vim/test_data/test_word_text_object/0text.txt
new file mode 100644
index 0000000000..456c2b1038
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/0text.txt
@@ -0,0 +1,9 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/100head.txt b/crates/vim/test_data/test_word_text_object/100head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/100head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/101mode.txt b/crates/vim/test_data/test_word_text_object/101mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/101mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/102text.txt b/crates/vim/test_data/test_word_text_object/102text.txt
new file mode 100644
index 0000000000..fb34ebac01
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/102text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick  
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/103head.txt b/crates/vim/test_data/test_word_text_object/103head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/103head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/104mode.txt b/crates/vim/test_data/test_word_text_object/104mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/104mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/105text.txt b/crates/vim/test_data/test_word_text_object/105text.txt
new file mode 100644
index 0000000000..de6c722fe0
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/105text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/106head.txt b/crates/vim/test_data/test_word_text_object/106head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/106head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/107mode.txt b/crates/vim/test_data/test_word_text_object/107mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/107mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/108text.txt b/crates/vim/test_data/test_word_text_object/108text.txt
new file mode 100644
index 0000000000..6d1c944902
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/108text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/109head.txt b/crates/vim/test_data/test_word_text_object/109head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/109head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/10head.txt b/crates/vim/test_data/test_word_text_object/10head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/10head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/110mode.txt b/crates/vim/test_data/test_word_text_object/110mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/110mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/111text.txt b/crates/vim/test_data/test_word_text_object/111text.txt
new file mode 100644
index 0000000000..a4effc421e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/111text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+   over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/112head.txt b/crates/vim/test_data/test_word_text_object/112head.txt
new file mode 100644
index 0000000000..60ada3d5d5
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/112head.txt
@@ -0,0 +1 @@
+7,2
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/113mode.txt b/crates/vim/test_data/test_word_text_object/113mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/113mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/114text.txt b/crates/vim/test_data/test_word_text_object/114text.txt
new file mode 100644
index 0000000000..41651c8e63
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/114text.txt
@@ -0,0 +1,9 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/115head.txt b/crates/vim/test_data/test_word_text_object/115head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/115head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/116mode.txt b/crates/vim/test_data/test_word_text_object/116mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/116mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/117text.txt b/crates/vim/test_data/test_word_text_object/117text.txt
new file mode 100644
index 0000000000..41651c8e63
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/117text.txt
@@ -0,0 +1,9 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/118head.txt b/crates/vim/test_data/test_word_text_object/118head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/118head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/119mode.txt b/crates/vim/test_data/test_word_text_object/119mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/119mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/11mode.txt b/crates/vim/test_data/test_word_text_object/11mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/11mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/120text.txt b/crates/vim/test_data/test_word_text_object/120text.txt
new file mode 100644
index 0000000000..f4e4cfe812
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/120text.txt
@@ -0,0 +1,8 @@
+The quick brown jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/121head.txt b/crates/vim/test_data/test_word_text_object/121head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/121head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/122mode.txt b/crates/vim/test_data/test_word_text_object/122mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/122mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/123text.txt b/crates/vim/test_data/test_word_text_object/123text.txt
new file mode 100644
index 0000000000..1a715d7a9d
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/123text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/124head.txt b/crates/vim/test_data/test_word_text_object/124head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/124head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/125mode.txt b/crates/vim/test_data/test_word_text_object/125mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/125mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/126text.txt b/crates/vim/test_data/test_word_text_object/126text.txt
new file mode 100644
index 0000000000..1a715d7a9d
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/126text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/127head.txt b/crates/vim/test_data/test_word_text_object/127head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/127head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/128mode.txt b/crates/vim/test_data/test_word_text_object/128mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/128mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/129text.txt b/crates/vim/test_data/test_word_text_object/129text.txt
new file mode 100644
index 0000000000..cfeeac1a14
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/129text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/12text.txt b/crates/vim/test_data/test_word_text_object/12text.txt
new file mode 100644
index 0000000000..bffcedd2db
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/12text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/130head.txt b/crates/vim/test_data/test_word_text_object/130head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/130head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/131mode.txt b/crates/vim/test_data/test_word_text_object/131mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/131mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/132text.txt b/crates/vim/test_data/test_word_text_object/132text.txt
new file mode 100644
index 0000000000..b57b97d090
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/132text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/133head.txt b/crates/vim/test_data/test_word_text_object/133head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/133head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/134mode.txt b/crates/vim/test_data/test_word_text_object/134mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/134mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/135text.txt b/crates/vim/test_data/test_word_text_object/135text.txt
new file mode 100644
index 0000000000..e2405acd79
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/135text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/136head.txt b/crates/vim/test_data/test_word_text_object/136head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/136head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/137mode.txt b/crates/vim/test_data/test_word_text_object/137mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/137mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/138text.txt b/crates/vim/test_data/test_word_text_object/138text.txt
new file mode 100644
index 0000000000..e2405acd79
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/138text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/139head.txt b/crates/vim/test_data/test_word_text_object/139head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/139head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/13head.txt b/crates/vim/test_data/test_word_text_object/13head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/13head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/140mode.txt b/crates/vim/test_data/test_word_text_object/140mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/140mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/141text.txt b/crates/vim/test_data/test_word_text_object/141text.txt
new file mode 100644
index 0000000000..e075f5e01a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/141text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/142head.txt b/crates/vim/test_data/test_word_text_object/142head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/142head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/143mode.txt b/crates/vim/test_data/test_word_text_object/143mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/143mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/144text.txt b/crates/vim/test_data/test_word_text_object/144text.txt
new file mode 100644
index 0000000000..6042949b9a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/144text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/145head.txt b/crates/vim/test_data/test_word_text_object/145head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/145head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/146mode.txt b/crates/vim/test_data/test_word_text_object/146mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/146mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/147text.txt b/crates/vim/test_data/test_word_text_object/147text.txt
new file mode 100644
index 0000000000..edc3de8e10
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/147text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+Thequick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/148head.txt b/crates/vim/test_data/test_word_text_object/148head.txt
new file mode 100644
index 0000000000..c20df71d5e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/148head.txt
@@ -0,0 +1 @@
+6,3
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/149mode.txt b/crates/vim/test_data/test_word_text_object/149mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/149mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/14mode.txt b/crates/vim/test_data/test_word_text_object/14mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/14mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/150text.txt b/crates/vim/test_data/test_word_text_object/150text.txt
new file mode 100644
index 0000000000..44972e7628
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/150text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/151head.txt b/crates/vim/test_data/test_word_text_object/151head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/151head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/152mode.txt b/crates/vim/test_data/test_word_text_object/152mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/152mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/153text.txt b/crates/vim/test_data/test_word_text_object/153text.txt
new file mode 100644
index 0000000000..44972e7628
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/153text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/154head.txt b/crates/vim/test_data/test_word_text_object/154head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/154head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/155mode.txt b/crates/vim/test_data/test_word_text_object/155mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/155mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/156text.txt b/crates/vim/test_data/test_word_text_object/156text.txt
new file mode 100644
index 0000000000..d7c8eebb49
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/156text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/157head.txt b/crates/vim/test_data/test_word_text_object/157head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/157head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/158mode.txt b/crates/vim/test_data/test_word_text_object/158mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/158mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/159text.txt b/crates/vim/test_data/test_word_text_object/159text.txt
new file mode 100644
index 0000000000..d7c8eebb49
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/159text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/15text.txt b/crates/vim/test_data/test_word_text_object/15text.txt
new file mode 100644
index 0000000000..3abea644f1
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/15text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumpsover
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/160head.txt b/crates/vim/test_data/test_word_text_object/160head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/160head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/161mode.txt b/crates/vim/test_data/test_word_text_object/161mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/161mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/162text.txt b/crates/vim/test_data/test_word_text_object/162text.txt
new file mode 100644
index 0000000000..f0f447c8fa
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/162text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/163head.txt b/crates/vim/test_data/test_word_text_object/163head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/163head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/164mode.txt b/crates/vim/test_data/test_word_text_object/164mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/164mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/165text.txt b/crates/vim/test_data/test_word_text_object/165text.txt
new file mode 100644
index 0000000000..3fcf6c5682
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/165text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/166head.txt b/crates/vim/test_data/test_word_text_object/166head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/166head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/167mode.txt b/crates/vim/test_data/test_word_text_object/167mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/167mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/168text.txt b/crates/vim/test_data/test_word_text_object/168text.txt
new file mode 100644
index 0000000000..88098b63df
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/168text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/169head.txt b/crates/vim/test_data/test_word_text_object/169head.txt
new file mode 100644
index 0000000000..6cf0fedea6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/169head.txt
@@ -0,0 +1 @@
+7,6
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/16head.txt b/crates/vim/test_data/test_word_text_object/16head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/16head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/170mode.txt b/crates/vim/test_data/test_word_text_object/170mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/170mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/171text.txt b/crates/vim/test_data/test_word_text_object/171text.txt
new file mode 100644
index 0000000000..41651c8e63
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/171text.txt
@@ -0,0 +1,9 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/172head.txt b/crates/vim/test_data/test_word_text_object/172head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/172head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/173mode.txt b/crates/vim/test_data/test_word_text_object/173mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/173mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/174text.txt b/crates/vim/test_data/test_word_text_object/174text.txt
new file mode 100644
index 0000000000..41651c8e63
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/174text.txt
@@ -0,0 +1,9 @@
+The quick 
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/175head.txt b/crates/vim/test_data/test_word_text_object/175head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/175head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/176mode.txt b/crates/vim/test_data/test_word_text_object/176mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/176mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/177text.txt b/crates/vim/test_data/test_word_text_object/177text.txt
new file mode 100644
index 0000000000..f4e4cfe812
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/177text.txt
@@ -0,0 +1,8 @@
+The quick brown jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/178head.txt b/crates/vim/test_data/test_word_text_object/178head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/178head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/179mode.txt b/crates/vim/test_data/test_word_text_object/179mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/179mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/17mode.txt b/crates/vim/test_data/test_word_text_object/17mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/17mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/180text.txt b/crates/vim/test_data/test_word_text_object/180text.txt
new file mode 100644
index 0000000000..1a715d7a9d
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/180text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/181head.txt b/crates/vim/test_data/test_word_text_object/181head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/181head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/182mode.txt b/crates/vim/test_data/test_word_text_object/182mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/182mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/183text.txt b/crates/vim/test_data/test_word_text_object/183text.txt
new file mode 100644
index 0000000000..1a715d7a9d
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/183text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/184head.txt b/crates/vim/test_data/test_word_text_object/184head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/184head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/185mode.txt b/crates/vim/test_data/test_word_text_object/185mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/185mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/186text.txt b/crates/vim/test_data/test_word_text_object/186text.txt
new file mode 100644
index 0000000000..cfeeac1a14
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/186text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/187head.txt b/crates/vim/test_data/test_word_text_object/187head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/187head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/188mode.txt b/crates/vim/test_data/test_word_text_object/188mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/188mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/189text.txt b/crates/vim/test_data/test_word_text_object/189text.txt
new file mode 100644
index 0000000000..b57b97d090
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/189text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/18text.txt b/crates/vim/test_data/test_word_text_object/18text.txt
new file mode 100644
index 0000000000..ebac2acd25
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/18text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/190head.txt b/crates/vim/test_data/test_word_text_object/190head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/190head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/191mode.txt b/crates/vim/test_data/test_word_text_object/191mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/191mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/192text.txt b/crates/vim/test_data/test_word_text_object/192text.txt
new file mode 100644
index 0000000000..e2405acd79
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/192text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/193head.txt b/crates/vim/test_data/test_word_text_object/193head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/193head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/194mode.txt b/crates/vim/test_data/test_word_text_object/194mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/194mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/195text.txt b/crates/vim/test_data/test_word_text_object/195text.txt
new file mode 100644
index 0000000000..e2405acd79
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/195text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/196head.txt b/crates/vim/test_data/test_word_text_object/196head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/196head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/197mode.txt b/crates/vim/test_data/test_word_text_object/197mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/197mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/198text.txt b/crates/vim/test_data/test_word_text_object/198text.txt
new file mode 100644
index 0000000000..4363975ac2
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/198text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+ brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/199head.txt b/crates/vim/test_data/test_word_text_object/199head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/199head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/19head.txt b/crates/vim/test_data/test_word_text_object/19head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/19head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/1head.txt b/crates/vim/test_data/test_word_text_object/1head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/1head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/200mode.txt b/crates/vim/test_data/test_word_text_object/200mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/200mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/201text.txt b/crates/vim/test_data/test_word_text_object/201text.txt
new file mode 100644
index 0000000000..7c0186083e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/201text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/202head.txt b/crates/vim/test_data/test_word_text_object/202head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/202head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/203mode.txt b/crates/vim/test_data/test_word_text_object/203mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/203mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/204text.txt b/crates/vim/test_data/test_word_text_object/204text.txt
new file mode 100644
index 0000000000..7c0186083e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/204text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/205head.txt b/crates/vim/test_data/test_word_text_object/205head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/205head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/206mode.txt b/crates/vim/test_data/test_word_text_object/206mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/206mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/207text.txt b/crates/vim/test_data/test_word_text_object/207text.txt
new file mode 100644
index 0000000000..7c0186083e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/207text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/208head.txt b/crates/vim/test_data/test_word_text_object/208head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/208head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/209mode.txt b/crates/vim/test_data/test_word_text_object/209mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/209mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/20mode.txt b/crates/vim/test_data/test_word_text_object/20mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/20mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/210text.txt b/crates/vim/test_data/test_word_text_object/210text.txt
new file mode 100644
index 0000000000..7c0186083e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/210text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/211head.txt b/crates/vim/test_data/test_word_text_object/211head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/211head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/212mode.txt b/crates/vim/test_data/test_word_text_object/212mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/212mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/213text.txt b/crates/vim/test_data/test_word_text_object/213text.txt
new file mode 100644
index 0000000000..d7c8eebb49
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/213text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/214head.txt b/crates/vim/test_data/test_word_text_object/214head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/214head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/215mode.txt b/crates/vim/test_data/test_word_text_object/215mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/215mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/216text.txt b/crates/vim/test_data/test_word_text_object/216text.txt
new file mode 100644
index 0000000000..d7c8eebb49
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/216text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/217head.txt b/crates/vim/test_data/test_word_text_object/217head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/217head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/218mode.txt b/crates/vim/test_data/test_word_text_object/218mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/218mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/219text.txt b/crates/vim/test_data/test_word_text_object/219text.txt
new file mode 100644
index 0000000000..1cbb0c4272
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/219text.txt
@@ -0,0 +1,8 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/21text.txt b/crates/vim/test_data/test_word_text_object/21text.txt
new file mode 100644
index 0000000000..3b33deb2ae
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/21text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/220head.txt b/crates/vim/test_data/test_word_text_object/220head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/220head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/221mode.txt b/crates/vim/test_data/test_word_text_object/221mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/221mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/222text.txt b/crates/vim/test_data/test_word_text_object/222text.txt
new file mode 100644
index 0000000000..bc43fca8a1
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/222text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+ over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/223head.txt b/crates/vim/test_data/test_word_text_object/223head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/223head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/224mode.txt b/crates/vim/test_data/test_word_text_object/224mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/224mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/225text.txt b/crates/vim/test_data/test_word_text_object/225text.txt
new file mode 100644
index 0000000000..3fa4fd5f45
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/225text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/226head.txt b/crates/vim/test_data/test_word_text_object/226head.txt
new file mode 100644
index 0000000000..60ada3d5d5
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/226head.txt
@@ -0,0 +1 @@
+7,2
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/227mode.txt b/crates/vim/test_data/test_word_text_object/227mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/227mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/228text.txt b/crates/vim/test_data/test_word_text_object/228text.txt
new file mode 100644
index 0000000000..456c2b1038
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/228text.txt
@@ -0,0 +1,9 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/229head.txt b/crates/vim/test_data/test_word_text_object/229head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/229head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/22head.txt b/crates/vim/test_data/test_word_text_object/22head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/22head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/230mode.txt b/crates/vim/test_data/test_word_text_object/230mode.txt
new file mode 100644
index 0000000000..ab75e91dc4
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/230mode.txt
@@ -0,0 +1 @@
+"Normal"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/231text.txt b/crates/vim/test_data/test_word_text_object/231text.txt
new file mode 100644
index 0000000000..286752a955
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/231text.txt
@@ -0,0 +1,9 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/23mode.txt b/crates/vim/test_data/test_word_text_object/23mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/23mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/24text.txt b/crates/vim/test_data/test_word_text_object/24text.txt
new file mode 100644
index 0000000000..3b33deb2ae
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/24text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/25head.txt b/crates/vim/test_data/test_word_text_object/25head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/25head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/26mode.txt b/crates/vim/test_data/test_word_text_object/26mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/26mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/27text.txt b/crates/vim/test_data/test_word_text_object/27text.txt
new file mode 100644
index 0000000000..3b33deb2ae
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/27text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/28head.txt b/crates/vim/test_data/test_word_text_object/28head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/28head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/29mode.txt b/crates/vim/test_data/test_word_text_object/29mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/29mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/2mode.txt b/crates/vim/test_data/test_word_text_object/2mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/2mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/30text.txt b/crates/vim/test_data/test_word_text_object/30text.txt
new file mode 100644
index 0000000000..6042949b9a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/30text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/31head.txt b/crates/vim/test_data/test_word_text_object/31head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/31head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/32mode.txt b/crates/vim/test_data/test_word_text_object/32mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/32mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/33text.txt b/crates/vim/test_data/test_word_text_object/33text.txt
new file mode 100644
index 0000000000..edc3de8e10
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/33text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+Thequick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/34head.txt b/crates/vim/test_data/test_word_text_object/34head.txt
new file mode 100644
index 0000000000..c20df71d5e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/34head.txt
@@ -0,0 +1 @@
+6,3
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/35mode.txt b/crates/vim/test_data/test_word_text_object/35mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/35mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/36text.txt b/crates/vim/test_data/test_word_text_object/36text.txt
new file mode 100644
index 0000000000..dedd4d92b7
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/36text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The- brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/37head.txt b/crates/vim/test_data/test_word_text_object/37head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/37head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/38mode.txt b/crates/vim/test_data/test_word_text_object/38mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/38mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/39text.txt b/crates/vim/test_data/test_word_text_object/39text.txt
new file mode 100644
index 0000000000..dedd4d92b7
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/39text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The- brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/3text.txt b/crates/vim/test_data/test_word_text_object/3text.txt
new file mode 100644
index 0000000000..456c2b1038
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/3text.txt
@@ -0,0 +1,9 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/40head.txt b/crates/vim/test_data/test_word_text_object/40head.txt
new file mode 100644
index 0000000000..95fb9c638e
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/40head.txt
@@ -0,0 +1 @@
+6,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/41mode.txt b/crates/vim/test_data/test_word_text_object/41mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/41mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/42text.txt b/crates/vim/test_data/test_word_text_object/42text.txt
new file mode 100644
index 0000000000..5bb4f4effb
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/42text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quickbrown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/43head.txt b/crates/vim/test_data/test_word_text_object/43head.txt
new file mode 100644
index 0000000000..da809253d8
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/43head.txt
@@ -0,0 +1 @@
+6,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/44mode.txt b/crates/vim/test_data/test_word_text_object/44mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/44mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/45text.txt b/crates/vim/test_data/test_word_text_object/45text.txt
new file mode 100644
index 0000000000..fb34ebac01
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/45text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick  
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/46head.txt b/crates/vim/test_data/test_word_text_object/46head.txt
new file mode 100644
index 0000000000..c5a50698dd
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/46head.txt
@@ -0,0 +1 @@
+6,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/47mode.txt b/crates/vim/test_data/test_word_text_object/47mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/47mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/48text.txt b/crates/vim/test_data/test_word_text_object/48text.txt
new file mode 100644
index 0000000000..de6c722fe0
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/48text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/49head.txt b/crates/vim/test_data/test_word_text_object/49head.txt
new file mode 100644
index 0000000000..d933eb81fa
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/49head.txt
@@ -0,0 +1 @@
+6,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/4head.txt b/crates/vim/test_data/test_word_text_object/4head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/4head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/50mode.txt b/crates/vim/test_data/test_word_text_object/50mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/50mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/51text.txt b/crates/vim/test_data/test_word_text_object/51text.txt
new file mode 100644
index 0000000000..6d1c944902
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/51text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/52head.txt b/crates/vim/test_data/test_word_text_object/52head.txt
new file mode 100644
index 0000000000..72c23ba506
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/52head.txt
@@ -0,0 +1 @@
+7,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/53mode.txt b/crates/vim/test_data/test_word_text_object/53mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/53mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/54text.txt b/crates/vim/test_data/test_word_text_object/54text.txt
new file mode 100644
index 0000000000..0f7af08f72
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/54text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox- over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/55head.txt b/crates/vim/test_data/test_word_text_object/55head.txt
new file mode 100644
index 0000000000..6cf0fedea6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/55head.txt
@@ -0,0 +1 @@
+7,6
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/56mode.txt b/crates/vim/test_data/test_word_text_object/56mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/56mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/57text.txt b/crates/vim/test_data/test_word_text_object/57text.txt
new file mode 100644
index 0000000000..456c2b1038
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/57text.txt
@@ -0,0 +1,9 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/58head.txt b/crates/vim/test_data/test_word_text_object/58head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/58head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/59mode.txt b/crates/vim/test_data/test_word_text_object/59mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/59mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/5mode.txt b/crates/vim/test_data/test_word_text_object/5mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/5mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/60text.txt b/crates/vim/test_data/test_word_text_object/60text.txt
new file mode 100644
index 0000000000..456c2b1038
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/60text.txt
@@ -0,0 +1,9 @@
+The quick    
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/61head.txt b/crates/vim/test_data/test_word_text_object/61head.txt
new file mode 100644
index 0000000000..352f6067e6
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/61head.txt
@@ -0,0 +1 @@
+0,10
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/62mode.txt b/crates/vim/test_data/test_word_text_object/62mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/62mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/63text.txt b/crates/vim/test_data/test_word_text_object/63text.txt
new file mode 100644
index 0000000000..286752a955
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/63text.txt
@@ -0,0 +1,9 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/64head.txt b/crates/vim/test_data/test_word_text_object/64head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/64head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/65mode.txt b/crates/vim/test_data/test_word_text_object/65mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/65mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/66text.txt b/crates/vim/test_data/test_word_text_object/66text.txt
new file mode 100644
index 0000000000..bffcedd2db
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/66text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/67head.txt b/crates/vim/test_data/test_word_text_object/67head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/67head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/68mode.txt b/crates/vim/test_data/test_word_text_object/68mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/68mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/69text.txt b/crates/vim/test_data/test_word_text_object/69text.txt
new file mode 100644
index 0000000000..bffcedd2db
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/69text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/6text.txt b/crates/vim/test_data/test_word_text_object/6text.txt
new file mode 100644
index 0000000000..286752a955
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/6text.txt
@@ -0,0 +1,9 @@
+The quick brown
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/70head.txt b/crates/vim/test_data/test_word_text_object/70head.txt
new file mode 100644
index 0000000000..28f7acb8c9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/70head.txt
@@ -0,0 +1 @@
+1,4
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/71mode.txt b/crates/vim/test_data/test_word_text_object/71mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/71mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/72text.txt b/crates/vim/test_data/test_word_text_object/72text.txt
new file mode 100644
index 0000000000..3abea644f1
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/72text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumpsover
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/73head.txt b/crates/vim/test_data/test_word_text_object/73head.txt
new file mode 100644
index 0000000000..bd712da63a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/73head.txt
@@ -0,0 +1 @@
+1,9
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/74mode.txt b/crates/vim/test_data/test_word_text_object/74mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/74mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/75text.txt b/crates/vim/test_data/test_word_text_object/75text.txt
new file mode 100644
index 0000000000..ebac2acd25
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/75text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/76head.txt b/crates/vim/test_data/test_word_text_object/76head.txt
new file mode 100644
index 0000000000..28ce8bcc5c
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/76head.txt
@@ -0,0 +1 @@
+2,12
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/77mode.txt b/crates/vim/test_data/test_word_text_object/77mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/77mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/78text.txt b/crates/vim/test_data/test_word_text_object/78text.txt
new file mode 100644
index 0000000000..3b33deb2ae
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/78text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/79head.txt b/crates/vim/test_data/test_word_text_object/79head.txt
new file mode 100644
index 0000000000..7cad756336
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/79head.txt
@@ -0,0 +1 @@
+3,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/7head.txt b/crates/vim/test_data/test_word_text_object/7head.txt
new file mode 100644
index 0000000000..5f7b20f0d9
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/7head.txt
@@ -0,0 +1 @@
+0,15
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/80mode.txt b/crates/vim/test_data/test_word_text_object/80mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/80mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/81text.txt b/crates/vim/test_data/test_word_text_object/81text.txt
new file mode 100644
index 0000000000..3b33deb2ae
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/81text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/82head.txt b/crates/vim/test_data/test_word_text_object/82head.txt
new file mode 100644
index 0000000000..b26cd1f1d3
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/82head.txt
@@ -0,0 +1 @@
+4,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/83mode.txt b/crates/vim/test_data/test_word_text_object/83mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/83mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/84text.txt b/crates/vim/test_data/test_word_text_object/84text.txt
new file mode 100644
index 0000000000..3b33deb2ae
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/84text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/85head.txt b/crates/vim/test_data/test_word_text_object/85head.txt
new file mode 100644
index 0000000000..880fda949a
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/85head.txt
@@ -0,0 +1 @@
+5,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/86mode.txt b/crates/vim/test_data/test_word_text_object/86mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/86mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/87text.txt b/crates/vim/test_data/test_word_text_object/87text.txt
new file mode 100644
index 0000000000..a647811a26
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/87text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/88head.txt b/crates/vim/test_data/test_word_text_object/88head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/88head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/89mode.txt b/crates/vim/test_data/test_word_text_object/89mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/89mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/8mode.txt b/crates/vim/test_data/test_word_text_object/8mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/8mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/90text.txt b/crates/vim/test_data/test_word_text_object/90text.txt
new file mode 100644
index 0000000000..a647811a26
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/90text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/91head.txt b/crates/vim/test_data/test_word_text_object/91head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/91head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/92mode.txt b/crates/vim/test_data/test_word_text_object/92mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/92mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/93text.txt b/crates/vim/test_data/test_word_text_object/93text.txt
new file mode 100644
index 0000000000..a647811a26
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/93text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/94head.txt b/crates/vim/test_data/test_word_text_object/94head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/94head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/95mode.txt b/crates/vim/test_data/test_word_text_object/95mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/95mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/96text.txt b/crates/vim/test_data/test_word_text_object/96text.txt
new file mode 100644
index 0000000000..a647811a26
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/96text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+ brown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/97head.txt b/crates/vim/test_data/test_word_text_object/97head.txt
new file mode 100644
index 0000000000..f7c508be16
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/97head.txt
@@ -0,0 +1 @@
+6,0
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/98mode.txt b/crates/vim/test_data/test_word_text_object/98mode.txt
new file mode 100644
index 0000000000..d0d2c59887
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/98mode.txt
@@ -0,0 +1 @@
+"Insert"
\ No newline at end of file
diff --git a/crates/vim/test_data/test_word_text_object/99text.txt b/crates/vim/test_data/test_word_text_object/99text.txt
new file mode 100644
index 0000000000..5bb4f4effb
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/99text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox jumps over
+the lazy dog  
+
+
+
+The-quickbrown 
+  fox-jumps over
+the lazy dog
diff --git a/crates/vim/test_data/test_word_text_object/9text.txt b/crates/vim/test_data/test_word_text_object/9text.txt
new file mode 100644
index 0000000000..bffcedd2db
--- /dev/null
+++ b/crates/vim/test_data/test_word_text_object/9text.txt
@@ -0,0 +1,9 @@
+The quick brown   
+fox  over
+the lazy dog  
+
+
+
+The-quick brown 
+  fox-jumps over
+the lazy dog