Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated new vim tests with new rope crate

Browse source
This commit is contained in:
Mikayla Maki 2022-10-11 20:25:39 -07:00
parent 41590ef64b
commit b1f64d9550
5 changed files with 190 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

251
Cargo.lock generated
View file

@ -8,7 +8,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"auto_update", "auto_update",
"editor", "editor",
"futures", "futures 0.3.24",
"gpui", "gpui",
"language", "language",
"project", "project",
@ -183,6 +183,19 @@ dependencies = [
"futures-core", "futures-core",
] ]
[[package]]
name = "async-compat"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b48b4ff0c2026db683dea961cd8ea874737f56cffca86fa84415eaddc51c00d"
dependencies = [
"futures-core",
"futures-io",
"once_cell",
"pin-project-lite 0.2.9",
"tokio",
]
[[package]] [[package]]
name = "async-compression" name = "async-compression"
version = "0.3.14" version = "0.3.14"
@ -265,7 +278,7 @@ name = "async-pipe"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/zed-industries/async-pipe-rs?rev=82d00a04211cf4e1236029aa03e6b6ce2a74c553#82d00a04211cf4e1236029aa03e6b6ce2a74c553" source = "git+https://github.com/zed-industries/async-pipe-rs?rev=82d00a04211cf4e1236029aa03e6b6ce2a74c553#82d00a04211cf4e1236029aa03e6b6ce2a74c553"
dependencies = [ dependencies = [
"futures", "futures 0.3.24",
"log", "log",
] ]
@ -338,9 +351,9 @@ dependencies = [
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.56" version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -443,7 +456,7 @@ dependencies = [
"axum-core", "axum-core",
"base64", "base64",
"bitflags", "bitflags",
"bytes", "bytes 1.2.1",
"futures-util", "futures-util",
"headers", "headers",
"http", "http",
@ -475,7 +488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4d047478b986f14a13edad31a009e2e05cb241f9805d0d75e4cba4e129ad4d" checksum = "cf4d047478b986f14a13edad31a009e2e05cb241f9805d0d75e4cba4e129ad4d"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes 1.2.1",
"futures-util", "futures-util",
"http", "http",
"http-body", "http-body",
@ -489,7 +502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "277c75e6c814b061ae4947d02335d9659db9771b9950cca670002ae986372f44" checksum = "277c75e6c814b061ae4947d02335d9659db9771b9950cca670002ae986372f44"
dependencies = [ dependencies = [
"axum", "axum",
"bytes", "bytes 1.2.1",
"futures-util", "futures-util",
"http", "http",
"mime", "mime",
@ -661,6 +674,16 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" 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]] [[package]]
name = "bytes" name = "bytes"
version = "1.2.1" version = "1.2.1"
@ -691,7 +714,7 @@ dependencies = [
"anyhow", "anyhow",
"client", "client",
"collections", "collections",
"futures", "futures 0.3.24",
"gpui", "gpui",
"postage", "postage",
"project", "project",
@ -772,12 +795,12 @@ dependencies = [
"bindgen", "bindgen",
"block", "block",
"byteorder", "byteorder",
"bytes", "bytes 1.2.1",
"cocoa", "cocoa",
"core-foundation", "core-foundation",
"core-graphics", "core-graphics",
"foreign-types", "foreign-types",
"futures", "futures 0.3.24",
"gpui", "gpui",
"hmac 0.12.1", "hmac 0.12.1",
"jwt", "jwt",
@ -960,7 +983,7 @@ dependencies = [
"async-tungstenite", "async-tungstenite",
"collections", "collections",
"db", "db",
"futures", "futures 0.3.24",
"gpui", "gpui",
"image", "image",
"isahc", "isahc",
@ -1046,7 +1069,7 @@ dependencies = [
"env_logger", "env_logger",
"envy", "envy",
"fs", "fs",
"futures", "futures 0.3.24",
"git", "git",
"gpui", "gpui",
"hyper", "hyper",
@ -1094,7 +1117,7 @@ dependencies = [
"clock", "clock",
"collections", "collections",
"editor", "editor",
"futures", "futures 0.3.24",
"fuzzy", "fuzzy",
"gpui", "gpui",
"log", "log",
@ -1692,7 +1715,7 @@ dependencies = [
"context_menu", "context_menu",
"ctor", "ctor",
"env_logger", "env_logger",
"futures", "futures 0.3.24",
"fuzzy", "fuzzy",
"git", "git",
"gpui", "gpui",
@ -1996,7 +2019,7 @@ dependencies = [
"async-trait", "async-trait",
"collections", "collections",
"fsevent", "fsevent",
"futures", "futures 0.3.24",
"git2", "git2",
"gpui", "gpui",
"lazy_static", "lazy_static",
@ -2067,9 +2090,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]] [[package]]
name = "futures" name = "futures"
version = "0.3.21" version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index" 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 = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -2082,9 +2111,9 @@ dependencies = [
[[package]] [[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-sink", "futures-sink",
@ -2092,15 +2121,15 @@ dependencies = [
[[package]] [[package]]
name = "futures-core" name = "futures-core"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
[[package]] [[package]]
name = "futures-executor" name = "futures-executor"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-task", "futures-task",
@ -2120,9 +2149,9 @@ dependencies = [
[[package]] [[package]]
name = "futures-io" name = "futures-io"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
[[package]] [[package]]
name = "futures-lite" name = "futures-lite"
@ -2141,9 +2170,9 @@ dependencies = [
[[package]] [[package]]
name = "futures-macro" name = "futures-macro"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2152,22 +2181,23 @@ dependencies = [
[[package]] [[package]]
name = "futures-sink" name = "futures-sink"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
[[package]] [[package]]
name = "futures-task" name = "futures-task"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
[[package]] [[package]]
name = "futures-util" name = "futures-util"
version = "0.3.21" version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
dependencies = [ dependencies = [
"futures 0.1.31",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-io", "futures-io",
@ -2178,6 +2208,7 @@ dependencies = [
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"pin-utils", "pin-utils",
"slab", "slab",
"tokio-io",
] ]
[[package]] [[package]]
@ -2258,7 +2289,7 @@ dependencies = [
"async-trait", "async-trait",
"clock", "clock",
"collections", "collections",
"futures", "futures 0.3.24",
"git2", "git2",
"lazy_static", "lazy_static",
"log", "log",
@ -2338,9 +2369,10 @@ dependencies = [
"etagere", "etagere",
"font-kit", "font-kit",
"foreign-types", "foreign-types",
"futures", "futures 0.3.24",
"gpui_macros", "gpui_macros",
"image", "image",
"itertools",
"lazy_static", "lazy_static",
"log", "log",
"media", "media",
@ -2386,7 +2418,7 @@ version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"fnv", "fnv",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
@ -2395,7 +2427,7 @@ dependencies = [
"indexmap", "indexmap",
"slab", "slab",
"tokio", "tokio",
"tokio-util 0.7.3", "tokio-util 0.7.4",
"tracing", "tracing",
] ]
@ -2434,7 +2466,7 @@ checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
dependencies = [ dependencies = [
"base64", "base64",
"bitflags", "bitflags",
"bytes", "bytes 1.2.1",
"headers-core", "headers-core",
"http", "http",
"httpdate", "httpdate",
@ -2527,7 +2559,7 @@ version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"fnv", "fnv",
"itoa", "itoa",
] ]
@ -2538,7 +2570,7 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"http", "http",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
] ]
@ -2573,7 +2605,7 @@ version = "0.14.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-util", "futures-util",
@ -2609,7 +2641,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"hyper", "hyper",
"native-tls", "native-tls",
"tokio", "tokio",
@ -2900,7 +2932,7 @@ dependencies = [
"ctor", "ctor",
"env_logger", "env_logger",
"fs", "fs",
"futures", "futures 0.3.24",
"fuzzy", "fuzzy",
"git", "git",
"gpui", "gpui",
@ -3062,7 +3094,7 @@ dependencies = [
"anyhow", "anyhow",
"core-foundation", "core-foundation",
"core-graphics", "core-graphics",
"futures", "futures 0.3.24",
"media", "media",
"parking_lot 0.11.2", "parking_lot 0.11.2",
"serde", "serde",
@ -3099,7 +3131,7 @@ dependencies = [
"collections", "collections",
"ctor", "ctor",
"env_logger", "env_logger",
"futures", "futures 0.3.24",
"gpui", "gpui",
"log", "log",
"lsp-types", "lsp-types",
@ -3192,7 +3224,7 @@ dependencies = [
"anyhow", "anyhow",
"bindgen", "bindgen",
"block", "block",
"bytes", "bytes 1.2.1",
"core-foundation", "core-foundation",
"foreign-types", "foreign-types",
"metal", "metal",
@ -3552,6 +3584,21 @@ dependencies = [
"libc", "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]] [[package]]
name = "objc" name = "objc"
version = "0.2.7" version = "0.2.7"
@ -3672,6 +3719,20 @@ dependencies = [
"workspace", "workspace",
] ]
[[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]] [[package]]
name = "parking" name = "parking"
version = "2.0.0" version = "2.0.0"
@ -3976,7 +4037,7 @@ checksum = "a63d25391d04a097954b76aba742b6b5b74f213dfe3dbaeeb36e8ddc1c657f0b"
dependencies = [ dependencies = [
"atomic", "atomic",
"crossbeam-queue", "crossbeam-queue",
"futures", "futures 0.3.24",
"log", "log",
"pin-project", "pin-project",
"pollster", "pollster",
@ -4047,7 +4108,7 @@ dependencies = [
"db", "db",
"fs", "fs",
"fsevent", "fsevent",
"futures", "futures 0.3.24",
"fuzzy", "fuzzy",
"git", "git",
"gpui", "gpui",
@ -4085,7 +4146,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"context_menu", "context_menu",
"editor", "editor",
"futures", "futures 0.3.24",
"gpui", "gpui",
"menu", "menu",
"postage", "postage",
@ -4104,7 +4165,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"editor", "editor",
"futures", "futures 0.3.24",
"fuzzy", "fuzzy",
"gpui", "gpui",
"language", "language",
@ -4141,7 +4202,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"prost-derive 0.8.0", "prost-derive 0.8.0",
] ]
@ -4151,7 +4212,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"prost-derive 0.9.0", "prost-derive 0.9.0",
] ]
@ -4161,7 +4222,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"heck 0.3.3", "heck 0.3.3",
"itertools", "itertools",
"lazy_static", "lazy_static",
@ -4207,7 +4268,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"prost 0.9.0", "prost 0.9.0",
] ]
@ -4470,7 +4531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
dependencies = [ dependencies = [
"base64", "base64",
"bytes", "bytes 1.2.1",
"encoding_rs", "encoding_rs",
"futures-core", "futures-core",
"futures-util", "futures-util",
@ -4540,6 +4601,27 @@ dependencies = [
"winapi 0.3.9", "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]] [[package]]
name = "rocksdb" name = "rocksdb"
version = "0.18.0" version = "0.18.0"
@ -4584,7 +4666,7 @@ dependencies = [
"collections", "collections",
"ctor", "ctor",
"env_logger", "env_logger",
"futures", "futures 0.3.24",
"gpui", "gpui",
"parking_lot 0.11.2", "parking_lot 0.11.2",
"prost 0.8.0", "prost 0.8.0",
@ -5062,7 +5144,7 @@ dependencies = [
"assets", "assets",
"collections", "collections",
"fs", "fs",
"futures", "futures 0.3.24",
"gpui", "gpui",
"json_comments", "json_comments",
"postage", "postage",
@ -5345,7 +5427,7 @@ dependencies = [
"base64", "base64",
"bitflags", "bitflags",
"byteorder", "byteorder",
"bytes", "bytes 1.2.1",
"crc", "crc",
"crossbeam-queue", "crossbeam-queue",
"dirs 4.0.0", "dirs 4.0.0",
@ -5598,7 +5680,7 @@ dependencies = [
"context_menu", "context_menu",
"dirs 4.0.0", "dirs 4.0.0",
"editor", "editor",
"futures", "futures 0.3.24",
"gpui", "gpui",
"itertools", "itertools",
"lazy_static", "lazy_static",
@ -5809,16 +5891,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.19.2" version = "1.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
dependencies = [ dependencies = [
"bytes", "autocfg 1.1.0",
"bytes 1.2.1",
"libc", "libc",
"memchr", "memchr",
"mio 0.8.4", "mio 0.8.4",
"num_cpus", "num_cpus",
"once_cell",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"signal-hook-registry", "signal-hook-registry",
@ -5827,6 +5909,17 @@ dependencies = [
"winapi 0.3.9", "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]] [[package]]
name = "tokio-io-timeout" name = "tokio-io-timeout"
version = "1.2.0" version = "1.2.0"
@ -5898,7 +5991,7 @@ version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"log", "log",
@ -5908,12 +6001,13 @@ dependencies = [
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.7.3" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
dependencies = [ dependencies = [
"bytes", "bytes 1.2.1",
"futures-core", "futures-core",
"futures-io",
"futures-sink", "futures-sink",
"pin-project-lite 0.2.9", "pin-project-lite 0.2.9",
"tokio", "tokio",
@ -5938,7 +6032,7 @@ dependencies = [
"async-stream", "async-stream",
"async-trait", "async-trait",
"base64", "base64",
"bytes", "bytes 1.2.1",
"futures-core", "futures-core",
"futures-util", "futures-util",
"h2", "h2",
@ -5974,7 +6068,7 @@ dependencies = [
"rand 0.8.5", "rand 0.8.5",
"slab", "slab",
"tokio", "tokio",
"tokio-util 0.7.3", "tokio-util 0.7.4",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing", "tracing",
@ -5987,7 +6081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bytes", "bytes 1.2.1",
"futures-core", "futures-core",
"futures-util", "futures-util",
"http", "http",
@ -6266,7 +6360,7 @@ checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1"
dependencies = [ dependencies = [
"base64", "base64",
"byteorder", "byteorder",
"bytes", "bytes 1.2.1",
"http", "http",
"httparse", "httparse",
"log", "log",
@ -6285,7 +6379,7 @@ checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
dependencies = [ dependencies = [
"base64", "base64",
"byteorder", "byteorder",
"bytes", "bytes 1.2.1",
"http", "http",
"httparse", "httparse",
"log", "log",
@ -6461,7 +6555,7 @@ name = "util"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"futures", "futures 0.3.24",
"git2", "git2",
"lazy_static", "lazy_static",
"log", "log",
@ -6531,6 +6625,8 @@ name = "vim"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"assets", "assets",
"async-compat",
"async-trait",
"collections", "collections",
"command_palette", "command_palette",
"editor", "editor",
@ -6538,12 +6634,17 @@ dependencies = [
"indoc", "indoc",
"itertools", "itertools",
"language", "language",
"lazy_static",
"log", "log",
"nvim-rs",
"parking_lot 0.11.2",
"project", "project",
"rope", "rope",
"search", "search",
"serde", "serde",
"serde_json",
"settings", "settings",
"tokio",
"util", "util",
"workspace", "workspace",
] ]
@ -7230,7 +7331,7 @@ dependencies = [
"context_menu", "context_menu",
"drag_and_drop", "drag_and_drop",
"fs", "fs",
"futures", "futures 0.3.24",
"gpui", "gpui",
"language", "language",
"log", "log",
@ -7315,7 +7416,7 @@ dependencies = [
"file_finder", "file_finder",
"fs", "fs",
"fsevent", "fsevent",
"futures", "futures 0.3.24",
"fuzzy", "fuzzy",
"go_to_line", "go_to_line",
"gpui", "gpui",

2
crates/vim/src/test/neovim_backed_test_context.rs
View file

@ -51,7 +51,7 @@ impl<'a> NeovimBackedTestContext<'a> {
pub async fn set_shared_state(&mut self, marked_text: &str) -> ContextHandle { pub async fn set_shared_state(&mut self, marked_text: &str) -> ContextHandle {
let context_handle = self.set_state(marked_text, Mode::Normal); let context_handle = self.set_state(marked_text, Mode::Normal);
let selection = self.editor(|editor, cx| editor.selections.newest::<language::Point>(cx)); let selection = self.editor(|editor, cx| editor.selections.newest::<rope::point::Point>(cx));
let text = self.buffer_text(); let text = self.buffer_text();
self.neovim.set_state(selection, &text).await; self.neovim.set_state(selection, &text).await;

5
crates/vim/src/test/neovim_connection.rs
View file

@ -8,7 +8,10 @@ use async_compat::Compat;
use async_trait::async_trait; use async_trait::async_trait;
#[cfg(feature = "neovim")] #[cfg(feature = "neovim")]
use gpui::keymap::Keystroke; use gpui::keymap::Keystroke;
use language::{Point, Selection};
use language::Selection;
use rope::point::Point;
#[cfg(feature = "neovim")] #[cfg(feature = "neovim")]
use lazy_static::lazy_static; use lazy_static::lazy_static;
#[cfg(feature = "neovim")] #[cfg(feature = "neovim")]

7
crates/workspace/Cargo.toml
View file

@ -12,7 +12,9 @@ test-support = [
"call/test-support", "call/test-support",
"client/test-support", "client/test-support",
"project/test-support", "project/test-support",
"settings/test-support" "settings/test-support",
"gpui/test-support",
"fs/test-support"
] ]
[dependencies] [dependencies]
@ -43,4 +45,5 @@ call = { path = "../call", features = ["test-support"] }
client = { path = "../client", features = ["test-support"] } client = { path = "../client", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
project = { path = "../project", features = ["test-support"] } project = { path = "../project", features = ["test-support"] }
settings = { path = "../settings", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] }
fs = { path = "../fs", features = ["test-support"] }

7
crates/workspace/src/workspace.rs
View file

@ -17,6 +17,7 @@ use client::{proto, Client, PeerId, TypedEnvelope, UserStore};
use collections::{hash_map, HashMap, HashSet}; use collections::{hash_map, HashMap, HashSet};
use dock::{DefaultItemFactory, Dock, ToggleDockButton}; use dock::{DefaultItemFactory, Dock, ToggleDockButton};
use drag_and_drop::DragAndDrop; use drag_and_drop::DragAndDrop;
use fs::{self, Fs};
use futures::{channel::oneshot, FutureExt, StreamExt}; use futures::{channel::oneshot, FutureExt, StreamExt};
use gpui::{ use gpui::{
actions, actions,
@ -32,7 +33,6 @@ use log::{error, warn};
pub use pane::*; pub use pane::*;
pub use pane_group::*; pub use pane_group::*;
use postage::prelude::Stream; use postage::prelude::Stream;
use fs::{self, Fs};
use project::{Project, ProjectEntryId, ProjectPath, ProjectStore, Worktree, WorktreeId}; use project::{Project, ProjectEntryId, ProjectPath, ProjectStore, Worktree, WorktreeId};
use searchable::SearchableItemHandle; use searchable::SearchableItemHandle;
use serde::Deserialize; use serde::Deserialize;
@ -931,7 +931,7 @@ impl AppState {
let settings = Settings::test(cx); let settings = Settings::test(cx);
cx.set_global(settings); cx.set_global(settings);
let fs = project::FakeFs::new(cx.background().clone()); let fs = fs::FakeFs::new(cx.background().clone());
let languages = Arc::new(LanguageRegistry::test()); let languages = Arc::new(LanguageRegistry::test());
let http_client = client::test::FakeHttpClient::with_404_response(); let http_client = client::test::FakeHttpClient::with_404_response();
let client = Client::new(http_client.clone(), cx); let client = Client::new(http_client.clone(), cx);
@ -2806,8 +2806,9 @@ mod tests {
use crate::sidebar::SidebarItem; use crate::sidebar::SidebarItem;
use super::*; use super::*;
use fs::FakeFs;
use gpui::{executor::Deterministic, ModelHandle, TestAppContext, ViewContext}; use gpui::{executor::Deterministic, ModelHandle, TestAppContext, ViewContext};
use project::{FakeFs, Project, ProjectEntryId}; use project::{Project, ProjectEntryId};
use serde_json::json; use serde_json::json;
pub fn default_item_factory( pub fn default_item_factory(