mirror of
https://github.com/helix-editor/helix
synced 2024-06-07 09:46:06 +02:00
Blaž Hrastnik
commit
b7a3e525ed
GPG Key ID:
4AEE18F83AFDEB23
|
|
@ -2,24 +2,30 @@
|
|||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.14"
|
||||
version = "0.7.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d"
|
||||
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.33"
|
||||
version = "1.0.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c"
|
||||
checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
|
||||
|
||||
[[package]]
|
||||
name = "arc-swap"
|
||||
version = "0.4.7"
|
||||
name = "arrayref"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
|
||||
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
|
||||
|
||||
[[package]]
|
||||
name = "async-channel"
|
||||
|
|
@ -34,9 +40,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-executor"
|
||||
version = "1.3.0"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801"
|
||||
checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
|
||||
dependencies = [
|
||||
"async-task",
|
||||
"concurrent-queue",
|
||||
|
|
@ -59,9 +65,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-io"
|
||||
version = "1.1.10"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e"
|
||||
checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"fastrand",
|
||||
|
|
@ -88,9 +94,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-net"
|
||||
version = "1.4.7"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee4c3668eb091d781e97f0026b5289b457c77d407a85749a9bb4c057456c428f"
|
||||
checksum = "06de475c85affe184648202401d7622afb32f0f74e02192857d0201a16defbe5"
|
||||
dependencies = [
|
||||
"async-io",
|
||||
"blocking",
|
||||
|
|
@ -106,7 +112,7 @@ checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda"
|
|||
dependencies = [
|
||||
"async-io",
|
||||
"blocking",
|
||||
"cfg-if",
|
||||
"cfg-if 0.1.10",
|
||||
"event-listener",
|
||||
"futures-lite",
|
||||
"once_cell",
|
||||
|
|
@ -116,9 +122,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-task"
|
||||
version = "4.0.2"
|
||||
version = "4.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518"
|
||||
checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
|
||||
|
||||
[[package]]
|
||||
name = "atomic-waker"
|
||||
|
|
@ -132,12 +138,35 @@ version = "1.0.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "blake2b_simd"
|
||||
version = "0.5.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec",
|
||||
"constant_time_eq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "blocking"
|
||||
version = "1.0.2"
|
||||
|
|
@ -166,9 +195,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.61"
|
||||
version = "1.0.65"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
|
||||
checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
]
|
||||
|
|
@ -179,6 +208,25 @@ version = "0.1.10"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"time",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "3.0.0-beta.2"
|
||||
|
|
@ -213,10 +261,27 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossterm"
|
||||
version = "0.18.0"
|
||||
name = "constant_time_eq"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2fcdc3c9cf8ee446222e8ee8691a6d21b563b8fe1a64b1873080db7b5b23cf0"
|
||||
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if 1.0.0",
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossterm"
|
||||
version = "0.18.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"crossterm_winapi",
|
||||
|
|
@ -231,13 +296,34 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossterm_winapi"
|
||||
version = "0.6.1"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c"
|
||||
checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "2.5.1"
|
||||
|
|
@ -253,6 +339,25 @@ dependencies = [
|
|||
"instant",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fern"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065"
|
||||
dependencies = [
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
|
||||
dependencies = [
|
||||
"matches",
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futf"
|
||||
version = "0.1.4"
|
||||
|
|
@ -264,22 +369,28 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.6"
|
||||
name = "futures"
|
||||
version = "0.1.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b"
|
||||
checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
|
||||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.6"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c"
|
||||
checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
|
||||
|
||||
[[package]]
|
||||
name = "futures-lite"
|
||||
version = "1.11.1"
|
||||
version = "1.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9"
|
||||
checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658"
|
||||
dependencies = [
|
||||
"fastrand",
|
||||
"futures-core",
|
||||
|
|
@ -290,6 +401,60 @@ dependencies = [
|
|||
"waker-fn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
|
||||
dependencies = [
|
||||
"proc-macro-hack",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-macro",
|
||||
"futures-task",
|
||||
"pin-project",
|
||||
"pin-utils",
|
||||
"proc-macro-hack",
|
||||
"proc-macro-nested",
|
||||
"slab",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"libc",
|
||||
"wasi 0.9.0+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.9.1"
|
||||
|
|
@ -312,6 +477,28 @@ dependencies = [
|
|||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "helix-lsp"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"futures-util",
|
||||
"glob",
|
||||
"helix-core",
|
||||
"helix-view",
|
||||
"jsonrpc-core",
|
||||
"log",
|
||||
"lsp-types",
|
||||
"once_cell",
|
||||
"pathdiff",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"shellexpand",
|
||||
"smol",
|
||||
"thiserror",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "helix-syntax"
|
||||
version = "0.1.0"
|
||||
|
|
@ -325,10 +512,15 @@ name = "helix-term"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
"clap",
|
||||
"crossterm",
|
||||
"fern",
|
||||
"futures-util",
|
||||
"helix-core",
|
||||
"helix-lsp",
|
||||
"helix-view",
|
||||
"log",
|
||||
"num_cpus",
|
||||
"smol",
|
||||
"tui",
|
||||
|
|
@ -342,7 +534,9 @@ dependencies = [
|
|||
"crossterm",
|
||||
"helix-core",
|
||||
"once_cell",
|
||||
"smol",
|
||||
"tui",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -354,6 +548,17 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
|
||||
dependencies = [
|
||||
"matches",
|
||||
"unicode-bidi",
|
||||
"unicode-normalization",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.6.0"
|
||||
|
|
@ -366,13 +571,19 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.7"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
|
||||
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cfg-if 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
|
||||
|
||||
[[package]]
|
||||
name = "jobserver"
|
||||
version = "0.1.21"
|
||||
|
|
@ -382,6 +593,19 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "jsonrpc-core"
|
||||
version = "15.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"log",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
|
|
@ -390,15 +614,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.79"
|
||||
version = "0.2.80"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
|
||||
checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.1"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
|
||||
checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
|
||||
dependencies = [
|
||||
"scopeguard",
|
||||
]
|
||||
|
|
@ -409,7 +633,21 @@ version = "0.4.11"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cfg-if 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lsp-types"
|
||||
version = "0.84.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b95be71fe205e44de754185bcf86447b65813ce1ceb298f8d3793ade5fff08d"
|
||||
dependencies = [
|
||||
"base64 0.12.3",
|
||||
"bitflags",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_repr",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -419,16 +657,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.3.3"
|
||||
name = "matches"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
|
||||
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "0.7.3"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e53a6ea5f38c0a48ca42159868c6d8e1bd56c0451238856cc08d58563643bdc3"
|
||||
checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
|
|
@ -439,9 +683,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "miow"
|
||||
version = "0.3.5"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
|
||||
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
|
||||
dependencies = [
|
||||
"socket2",
|
||||
"winapi",
|
||||
|
|
@ -465,13 +709,32 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
|
|||
|
||||
[[package]]
|
||||
name = "ntapi"
|
||||
version = "0.3.4"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
|
||||
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.13.0"
|
||||
|
|
@ -484,15 +747,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.4.1"
|
||||
version = "1.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
|
||||
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "2.3.2"
|
||||
version = "2.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ac6fe3538f701e339953a3ebbe4f39941aababa8a3f6964635b24ab526daeac"
|
||||
checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
|
||||
|
||||
[[package]]
|
||||
name = "parking"
|
||||
|
|
@ -502,9 +765,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
|
|||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
|
||||
checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
|
||||
dependencies = [
|
||||
"instant",
|
||||
"lock_api",
|
||||
|
|
@ -517,7 +780,7 @@ version = "0.8.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cfg-if 0.1.10",
|
||||
"cloudabi",
|
||||
"instant",
|
||||
"libc",
|
||||
|
|
@ -527,24 +790,92 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.1.10"
|
||||
name = "pathdiff"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95"
|
||||
checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34"
|
||||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
|
||||
dependencies = [
|
||||
"pin-project-internal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-internal"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "polling"
|
||||
version = "2.0.1"
|
||||
version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab773feb154f12c49ffcfd66ab8bdcf9a1843f950db48b0d8be9d4393783b058"
|
||||
checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cfg-if 0.1.10",
|
||||
"libc",
|
||||
"log",
|
||||
"wepoll-sys",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-hack"
|
||||
version = "0.5.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-nested"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.1.57"
|
||||
|
|
@ -552,10 +883,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.4.1"
|
||||
name = "redox_users"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b"
|
||||
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall",
|
||||
"rust-argon2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
|
@ -565,9 +907,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.20"
|
||||
version = "0.6.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c"
|
||||
checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
|
||||
|
||||
[[package]]
|
||||
name = "ropey"
|
||||
|
|
@ -578,12 +920,81 @@ dependencies = [
|
|||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rust-argon2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
|
||||
dependencies = [
|
||||
"base64 0.13.0",
|
||||
"blake2b_simd",
|
||||
"constant_time_eq",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_repr"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shellexpand"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a2b22262a9aaf9464d356f656fea420634f78c881c5eebd5ef5e66d8b9bc603"
|
||||
dependencies = [
|
||||
"dirs",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook"
|
||||
version = "0.1.16"
|
||||
|
|
@ -597,25 +1008,30 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.2.1"
|
||||
version = "1.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035"
|
||||
checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab"
|
||||
dependencies = [
|
||||
"arc-swap",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.4.2"
|
||||
name = "slab"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
|
||||
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85"
|
||||
|
||||
[[package]]
|
||||
name = "smol"
|
||||
version = "1.2.4"
|
||||
version = "1.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aaf8ded16994c0ae59596c6e4733c76faeb0533c26fd5ca1b1bc89271a049a66"
|
||||
checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-executor",
|
||||
|
|
@ -631,16 +1047,27 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.3.15"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44"
|
||||
checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.53"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8833e20724c24de12bbaba5ad230ea61c3eafb05b881c7c9d3cfe8638b187e68"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tendril"
|
||||
version = "0.4.1"
|
||||
|
|
@ -660,6 +1087,26 @@ dependencies = [
|
|||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread_local"
|
||||
version = "1.0.1"
|
||||
|
|
@ -670,10 +1117,36 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter"
|
||||
version = "0.17.0"
|
||||
name = "time"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ee7370fec3aecde3862a7d64c571048f70a7298daef1815e8fc68b9de54b5c"
|
||||
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
|
||||
dependencies = [
|
||||
"tinyvec_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec_macros"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter"
|
||||
version = "0.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d18dcb776d3affaba6db04d11d645946d34a69b3172e588af96ce9fecd20faac"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"regex",
|
||||
|
|
@ -681,8 +1154,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tui"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/fdehau/tui-rs#25ff2e5e61f8902101e485743992db2412f77aad"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/fdehau/tui-rs#efdd6bfb193dafcb5e3bdc75e7d2d314065da1d7"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cassowary",
|
||||
|
|
@ -692,10 +1165,28 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.6.0"
|
||||
name = "unicode-bidi"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
|
||||
checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
|
||||
dependencies = [
|
||||
"matches",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
|
||||
dependencies = [
|
||||
"tinyvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
|
|
@ -703,6 +1194,25 @@ version = "0.1.8"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
"idna",
|
||||
"matches",
|
||||
"percent-encoding",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utf-8"
|
||||
version = "0.7.5"
|
||||
|
|
@ -728,10 +1238,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
|
||||
|
||||
[[package]]
|
||||
name = "wepoll-sys"
|
||||
version = "3.0.0"
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "142bc2cba3fe88be1a8fcb55c727fa4cd5b0cf2d7438722792e22f26f04bc1e0"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
||||
|
||||
[[package]]
|
||||
name = "wepoll-sys"
|
||||
version = "3.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ members = [
|
|||
"helix-view",
|
||||
"helix-term",
|
||||
"helix-syntax",
|
||||
"helix-lsp",
|
||||
]
|
||||
|
||||
# Build helix-syntax in release mode to make the code path faster in development.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
use crate::Range;
|
||||
|
||||
pub struct Diagnostic {
|
||||
pub range: (usize, usize),
|
||||
pub line: usize,
|
||||
pub message: String,
|
||||
}
|
||||
|
|
@ -57,37 +57,31 @@ pub fn at_root(&self) -> bool {
|
|||
self.cursor == 0
|
||||
}
|
||||
|
||||
pub fn undo(&mut self, state: &mut State) {
|
||||
// TODO: I'd like to pass Transaction by reference but it fights with the borrowck
|
||||
|
||||
pub fn undo(&mut self) -> Option<Transaction> {
|
||||
if self.at_root() {
|
||||
// We're at the root of undo, nothing to do.
|
||||
return;
|
||||
return None;
|
||||
}
|
||||
|
||||
let current_revision = &self.revisions[self.cursor];
|
||||
|
||||
// TODO: pass the return value through? It should always succeed
|
||||
let success = current_revision.revert.apply(state);
|
||||
|
||||
if !success {
|
||||
panic!("Failed to apply undo!");
|
||||
}
|
||||
|
||||
self.cursor = current_revision.parent;
|
||||
|
||||
Some(current_revision.revert.clone())
|
||||
}
|
||||
|
||||
pub fn redo(&mut self, state: &mut State) {
|
||||
pub fn redo(&mut self) -> Option<Transaction> {
|
||||
let current_revision = &self.revisions[self.cursor];
|
||||
|
||||
// for now, simply pick the latest child (linear undo / redo)
|
||||
if let Some((index, transaction)) = current_revision.children.last() {
|
||||
let success = transaction.apply(state);
|
||||
|
||||
if !success {
|
||||
panic!("Failed to apply redo!");
|
||||
}
|
||||
|
||||
self.cursor = *index;
|
||||
|
||||
return Some(transaction.clone());
|
||||
}
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -120,17 +114,27 @@ fn test_undo_redo() {
|
|||
assert_eq!("hello 世界!", state.doc());
|
||||
|
||||
// ---
|
||||
fn undo(history: &mut History, state: &mut State) {
|
||||
if let Some(transaction) = history.undo() {
|
||||
transaction.apply(state);
|
||||
}
|
||||
}
|
||||
fn redo(history: &mut History, state: &mut State) {
|
||||
if let Some(transaction) = history.redo() {
|
||||
transaction.apply(state);
|
||||
}
|
||||
}
|
||||
|
||||
history.undo(&mut state);
|
||||
undo(&mut history, &mut state);
|
||||
assert_eq!("hello world!", state.doc());
|
||||
history.redo(&mut state);
|
||||
redo(&mut history, &mut state);
|
||||
assert_eq!("hello 世界!", state.doc());
|
||||
history.undo(&mut state);
|
||||
history.undo(&mut state);
|
||||
undo(&mut history, &mut state);
|
||||
undo(&mut history, &mut state);
|
||||
assert_eq!("hello", state.doc());
|
||||
|
||||
// undo at root is a no-op
|
||||
history.undo(&mut state);
|
||||
undo(&mut history, &mut state);
|
||||
assert_eq!("hello", state.doc());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,17 +111,17 @@ fn find_first_non_whitespace_char(state: &State, line_num: usize) -> usize {
|
|||
start
|
||||
}
|
||||
|
||||
fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
|
||||
fn suggested_indent_for_line(syntax: Option<&Syntax>, state: &State, line_num: usize) -> usize {
|
||||
let line = state.doc.line(line_num);
|
||||
let current = indent_level_for_line(line);
|
||||
|
||||
let start = find_first_non_whitespace_char(state, line_num);
|
||||
|
||||
suggested_indent_for_pos(state, start)
|
||||
suggested_indent_for_pos(syntax, state, start)
|
||||
}
|
||||
|
||||
pub fn suggested_indent_for_pos(state: &State, pos: usize) -> usize {
|
||||
if let Some(syntax) = &state.syntax {
|
||||
pub fn suggested_indent_for_pos(syntax: Option<&Syntax>, state: &State, pos: usize) -> usize {
|
||||
if let Some(syntax) = syntax {
|
||||
let byte_start = state.doc.char_to_byte(pos);
|
||||
let node = get_highest_syntax_node_at_bytepos(syntax, byte_start);
|
||||
|
||||
|
|
@ -163,13 +163,18 @@ fn hello_world() {
|
|||
",
|
||||
);
|
||||
|
||||
let mut state = State::new(doc);
|
||||
state.set_language("source.rust", &[]);
|
||||
let state = State::new(doc);
|
||||
// TODO: set_language
|
||||
let language_config = crate::syntax::LOADER
|
||||
.language_config_for_scope("source.rust")
|
||||
.unwrap();
|
||||
let highlight_config = language_config.highlight_config(&[]).unwrap().unwrap();
|
||||
let syntax = Syntax::new(&state.doc, highlight_config.clone());
|
||||
|
||||
assert_eq!(suggested_indent_for_line(&state, 0), 0); // mod
|
||||
assert_eq!(suggested_indent_for_line(&state, 1), 1); // fn
|
||||
assert_eq!(suggested_indent_for_line(&state, 2), 2); // 1 + 1
|
||||
assert_eq!(suggested_indent_for_line(&state, 4), 1); // }
|
||||
assert_eq!(suggested_indent_for_line(&state, 5), 0); // }
|
||||
assert_eq!(suggested_indent_for_line(Some(&syntax), &state, 0), 0); // mod
|
||||
assert_eq!(suggested_indent_for_line(Some(&syntax), &state, 1), 1); // fn
|
||||
assert_eq!(suggested_indent_for_line(Some(&syntax), &state, 2), 2); // 1 + 1
|
||||
assert_eq!(suggested_indent_for_line(Some(&syntax), &state, 4), 1); // }
|
||||
assert_eq!(suggested_indent_for_line(Some(&syntax), &state, 5), 0); // }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#![allow(unused)]
|
||||
mod diagnostic;
|
||||
pub mod graphemes;
|
||||
mod history;
|
||||
pub mod indent;
|
||||
|
|
@ -22,7 +23,8 @@
|
|||
pub use selection::Selection;
|
||||
pub use syntax::Syntax;
|
||||
|
||||
pub use diagnostic::Diagnostic;
|
||||
pub use history::History;
|
||||
pub use state::State;
|
||||
|
||||
pub use transaction::{Assoc, Change, ChangeSet, Transaction};
|
||||
pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};
|
||||
|
|
|
|||
|
|
@ -179,6 +179,11 @@ pub fn single(anchor: usize, head: usize) -> Self {
|
|||
}
|
||||
}
|
||||
|
||||
/// Constructs a selection holding a single cursor.
|
||||
pub fn point(pos: usize) -> Self {
|
||||
Self::single(pos, pos)
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn new(ranges: SmallVec<[Range; 1]>, primary_index: usize) -> Self {
|
||||
fn normalize(mut ranges: SmallVec<[Range; 1]>, mut primary_index: usize) -> Selection {
|
||||
|
|
|
|||
|
|
@ -1,33 +1,14 @@
|
|||
use crate::graphemes::{nth_next_grapheme_boundary, nth_prev_grapheme_boundary, RopeGraphemes};
|
||||
use crate::syntax::LOADER;
|
||||
use crate::{ChangeSet, Position, Range, Rope, RopeSlice, Selection, Syntax};
|
||||
use crate::{ChangeSet, Diagnostic, Position, Range, Rope, RopeSlice, Selection, Syntax};
|
||||
use anyhow::Error;
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
|
||||
pub enum Mode {
|
||||
Normal,
|
||||
Insert,
|
||||
Goto,
|
||||
}
|
||||
|
||||
/// A state represents the current editor state of a single buffer.
|
||||
#[derive(Clone)]
|
||||
pub struct State {
|
||||
// TODO: fields should be private but we need to refactor commands.rs first
|
||||
/// Path to file on disk.
|
||||
pub path: Option<PathBuf>,
|
||||
pub doc: Rope,
|
||||
pub selection: Selection,
|
||||
pub mode: Mode,
|
||||
|
||||
pub restore_cursor: bool,
|
||||
|
||||
//
|
||||
pub syntax: Option<Syntax>,
|
||||
/// Pending changes since last history commit.
|
||||
pub changes: ChangeSet,
|
||||
pub old_state: Option<(Rope, Selection)>,
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, Eq)]
|
||||
|
|
@ -46,57 +27,12 @@ pub enum Granularity {
|
|||
impl State {
|
||||
#[must_use]
|
||||
pub fn new(doc: Rope) -> Self {
|
||||
let changes = ChangeSet::new(&doc);
|
||||
let old_state = Some((doc.clone(), Selection::single(0, 0)));
|
||||
|
||||
Self {
|
||||
path: None,
|
||||
doc,
|
||||
selection: Selection::single(0, 0),
|
||||
mode: Mode::Normal,
|
||||
restore_cursor: false,
|
||||
syntax: None,
|
||||
changes,
|
||||
old_state,
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: passing scopes here is awkward
|
||||
pub fn load(path: PathBuf, scopes: &[String]) -> Result<Self, Error> {
|
||||
use std::{env, fs::File, io::BufReader, path::PathBuf};
|
||||
let _current_dir = env::current_dir()?;
|
||||
|
||||
let doc = Rope::from_reader(BufReader::new(File::open(path.clone())?))?;
|
||||
|
||||
// TODO: create if not found
|
||||
|
||||
let mut state = Self::new(doc);
|
||||
|
||||
if let Some(language_config) = LOADER.language_config_for_file_name(path.as_path()) {
|
||||
let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap();
|
||||
// TODO: config.configure(scopes) is now delayed, is that ok?
|
||||
|
||||
let syntax = Syntax::new(&state.doc, highlight_config.clone());
|
||||
|
||||
state.syntax = Some(syntax);
|
||||
};
|
||||
|
||||
state.path = Some(path);
|
||||
|
||||
Ok(state)
|
||||
}
|
||||
|
||||
pub fn set_language(&mut self, scope: &str, scopes: &[String]) {
|
||||
if let Some(language_config) = LOADER.language_config_for_scope(scope) {
|
||||
let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap();
|
||||
// TODO: config.configure(scopes) is now delayed, is that ok?
|
||||
|
||||
let syntax = Syntax::new(&self.doc, highlight_config.clone());
|
||||
|
||||
self.syntax = Some(syntax);
|
||||
};
|
||||
}
|
||||
|
||||
// TODO: doc/selection accessors
|
||||
|
||||
// TODO: be able to take either Rope or RopeSlice
|
||||
|
|
@ -110,16 +46,6 @@ pub fn selection(&self) -> &Selection {
|
|||
&self.selection
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn mode(&self) -> Mode {
|
||||
self.mode
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn path(&self) -> Option<&PathBuf> {
|
||||
self.path.as_ref()
|
||||
}
|
||||
|
||||
// pub fn doc<R>(&self, range: R) -> RopeSlice
|
||||
// where
|
||||
// R: std::ops::RangeBounds<usize>,
|
||||
|
|
|
|||
|
|
@ -62,11 +62,15 @@ pub fn highlight_config(
|
|||
})
|
||||
.map(Option::as_ref)
|
||||
}
|
||||
|
||||
pub fn scope(&self) -> &str {
|
||||
&self.scope
|
||||
}
|
||||
}
|
||||
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
pub(crate) static LOADER: Lazy<Loader> = Lazy::new(Loader::init);
|
||||
pub static LOADER: Lazy<Loader> = Lazy::new(Loader::init);
|
||||
|
||||
pub struct Loader {
|
||||
// highlight_names ?
|
||||
|
|
|
|||
|
|
@ -5,8 +5,9 @@
|
|||
/// (from, to, replacement)
|
||||
pub type Change = (usize, usize, Option<Tendril>);
|
||||
|
||||
// TODO: pub(crate)
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub(crate) enum Operation {
|
||||
pub enum Operation {
|
||||
/// Move cursor by n characters.
|
||||
Retain(usize),
|
||||
/// Delete n characters.
|
||||
|
|
@ -40,6 +41,12 @@ pub fn new(doc: &Rope) -> Self {
|
|||
}
|
||||
|
||||
// TODO: from iter
|
||||
//
|
||||
|
||||
#[doc(hidden)] // used by lsp to convert to LSP changes
|
||||
pub fn changes(&self) -> &[Operation] {
|
||||
&self.changes
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
fn len_after(&self) -> usize {
|
||||
|
|
@ -351,22 +358,6 @@ pub struct Transaction {
|
|||
// scroll_into_view
|
||||
}
|
||||
|
||||
/// Like std::mem::replace() except it allows the replacement value to be mapped from the
|
||||
/// original value.
|
||||
pub fn take_with<T, F>(mut_ref: &mut T, closure: F)
|
||||
where
|
||||
F: FnOnce(T) -> T,
|
||||
{
|
||||
use std::{panic, ptr};
|
||||
|
||||
unsafe {
|
||||
let old_t = ptr::read(mut_ref);
|
||||
let new_t = panic::catch_unwind(panic::AssertUnwindSafe(|| closure(old_t)))
|
||||
.unwrap_or_else(|_| ::std::process::abort());
|
||||
ptr::write(mut_ref, new_t);
|
||||
}
|
||||
}
|
||||
|
||||
impl Transaction {
|
||||
/// Create a new, empty transaction.
|
||||
pub fn new(state: &mut State) -> Self {
|
||||
|
|
@ -376,29 +367,21 @@ pub fn new(state: &mut State) -> Self {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn changes(&self) -> &ChangeSet {
|
||||
&self.changes
|
||||
}
|
||||
|
||||
/// Returns true if applied successfully.
|
||||
pub fn apply(&self, state: &mut State) -> bool {
|
||||
if !self.changes.is_empty() {
|
||||
// TODO: also avoid mapping the selection if not necessary
|
||||
|
||||
let old_doc = state.doc().clone();
|
||||
|
||||
// apply changes to the document
|
||||
if !self.changes.apply(&mut state.doc) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Compose this transaction with the previous one
|
||||
take_with(&mut state.changes, |changes| {
|
||||
changes.compose(self.changes.clone()).unwrap()
|
||||
});
|
||||
|
||||
if let Some(syntax) = &mut state.syntax {
|
||||
// TODO: no unwrap
|
||||
syntax.update(&old_doc, &state.doc, &self.changes).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: also avoid mapping the selection if not necessary
|
||||
|
||||
// update the selection: either take the selection specified in the transaction, or map the
|
||||
// current selection through changes.
|
||||
state.selection = self
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
[package]
|
||||
name = "helix-lsp"
|
||||
version = "0.1.0"
|
||||
authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
|
||||
edition = "2018"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
helix-core = { path = "../helix-core" }
|
||||
helix-view = { path = "../helix-view" }
|
||||
once_cell = "1.4"
|
||||
|
||||
lsp-types = { version = "0.84", features = ["proposed"] }
|
||||
smol = "1.2"
|
||||
url = "2"
|
||||
pathdiff = "0.2"
|
||||
shellexpand = "2.0"
|
||||
glob = "0.3"
|
||||
anyhow = "1"
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
jsonrpc-core = "15.1"
|
||||
futures-util = "0.3"
|
||||
thiserror = "1"
|
||||
log = "0.4"
|
||||
|
|
@ -0,0 +1,355 @@
|
|||
use crate::{
|
||||
transport::{Payload, Transport},
|
||||
Call, Error,
|
||||
};
|
||||
|
||||
type Result<T> = core::result::Result<T, Error>;
|
||||
|
||||
use helix_core::{ChangeSet, Transaction};
|
||||
use helix_view::Document;
|
||||
|
||||
// use std::collections::HashMap;
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
|
||||
use jsonrpc_core as jsonrpc;
|
||||
use lsp_types as lsp;
|
||||
use serde_json::Value;
|
||||
|
||||
use smol::{
|
||||
channel::{Receiver, Sender},
|
||||
io::{BufReader, BufWriter},
|
||||
// prelude::*,
|
||||
process::{Child, ChildStderr, Command, Stdio},
|
||||
Executor,
|
||||
};
|
||||
|
||||
pub struct Client {
|
||||
_process: Child,
|
||||
stderr: BufReader<ChildStderr>,
|
||||
|
||||
outgoing: Sender<Payload>,
|
||||
pub incoming: Receiver<Call>,
|
||||
|
||||
pub request_counter: AtomicU64,
|
||||
|
||||
capabilities: Option<lsp::ServerCapabilities>,
|
||||
// TODO: handle PublishDiagnostics Version
|
||||
// diagnostics: HashMap<lsp::Url, Vec<lsp::Diagnostic>>,
|
||||
}
|
||||
|
||||
impl Client {
|
||||
pub fn start(ex: &Executor, cmd: &str, args: &[String]) -> Self {
|
||||
let mut process = Command::new(cmd)
|
||||
.args(args)
|
||||
.stdin(Stdio::piped())
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("Failed to start language server");
|
||||
// smol makes sure the process is reaped on drop, but using kill_on_drop(true) maybe?
|
||||
|
||||
// TODO: do we need bufreader/writer here? or do we use async wrappers on unblock?
|
||||
let writer = BufWriter::new(process.stdin.take().expect("Failed to open stdin"));
|
||||
let reader = BufReader::new(process.stdout.take().expect("Failed to open stdout"));
|
||||
let stderr = BufReader::new(process.stderr.take().expect("Failed to open stderr"));
|
||||
|
||||
let (incoming, outgoing) = Transport::start(ex, reader, writer);
|
||||
|
||||
Client {
|
||||
_process: process,
|
||||
stderr,
|
||||
|
||||
outgoing,
|
||||
incoming,
|
||||
|
||||
request_counter: AtomicU64::new(0),
|
||||
|
||||
capabilities: None,
|
||||
// diagnostics: HashMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn next_request_id(&self) -> jsonrpc::Id {
|
||||
let id = self.request_counter.fetch_add(1, Ordering::Relaxed);
|
||||
jsonrpc::Id::Num(id)
|
||||
}
|
||||
|
||||
fn to_params(value: Value) -> Result<jsonrpc::Params> {
|
||||
use jsonrpc::Params;
|
||||
|
||||
let params = match value {
|
||||
Value::Null => Params::None,
|
||||
Value::Bool(_) | Value::Number(_) | Value::String(_) => Params::Array(vec![value]),
|
||||
Value::Array(vec) => Params::Array(vec),
|
||||
Value::Object(map) => Params::Map(map),
|
||||
};
|
||||
|
||||
Ok(params)
|
||||
}
|
||||
|
||||
/// Execute a RPC request on the language server.
|
||||
pub async fn request<R: lsp::request::Request>(&self, params: R::Params) -> Result<R::Result>
|
||||
where
|
||||
R::Params: serde::Serialize,
|
||||
R::Result: core::fmt::Debug, // TODO: temporary
|
||||
{
|
||||
let params = serde_json::to_value(params)?;
|
||||
|
||||
let request = jsonrpc::MethodCall {
|
||||
jsonrpc: Some(jsonrpc::Version::V2),
|
||||
id: self.next_request_id(),
|
||||
method: R::METHOD.to_string(),
|
||||
params: Self::to_params(params)?,
|
||||
};
|
||||
|
||||
let (tx, rx) = smol::channel::bounded::<Result<Value>>(1);
|
||||
|
||||
self.outgoing
|
||||
.send(Payload::Request {
|
||||
chan: tx,
|
||||
value: request,
|
||||
})
|
||||
.await
|
||||
.map_err(|e| Error::Other(e.into()))?;
|
||||
|
||||
let response = rx.recv().await.map_err(|e| Error::Other(e.into()))??;
|
||||
|
||||
let response = serde_json::from_value(response)?;
|
||||
|
||||
// TODO: we should pass request to a sender thread via a channel
|
||||
// so it can't be interleaved
|
||||
|
||||
// TODO: responses can be out of order, we need to register a single shot response channel
|
||||
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
/// Send a RPC notification to the language server.
|
||||
pub async fn notify<R: lsp::notification::Notification>(&self, params: R::Params) -> Result<()>
|
||||
where
|
||||
R::Params: serde::Serialize,
|
||||
{
|
||||
let params = serde_json::to_value(params)?;
|
||||
|
||||
let notification = jsonrpc::Notification {
|
||||
jsonrpc: Some(jsonrpc::Version::V2),
|
||||
method: R::METHOD.to_string(),
|
||||
params: Self::to_params(params)?,
|
||||
};
|
||||
|
||||
self.outgoing
|
||||
.send(Payload::Notification(notification))
|
||||
.await
|
||||
.map_err(|e| Error::Other(e.into()))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Reply to a language server RPC call.
|
||||
pub async fn reply(
|
||||
&self,
|
||||
id: jsonrpc::Id,
|
||||
result: core::result::Result<Value, jsonrpc::Error>,
|
||||
) -> Result<()> {
|
||||
use jsonrpc::{Failure, Output, Success, Version};
|
||||
|
||||
let output = match result {
|
||||
Ok(result) => Output::Success(Success {
|
||||
jsonrpc: Some(Version::V2),
|
||||
id,
|
||||
result,
|
||||
}),
|
||||
Err(error) => Output::Failure(Failure {
|
||||
jsonrpc: Some(Version::V2),
|
||||
id,
|
||||
error,
|
||||
}),
|
||||
};
|
||||
|
||||
self.outgoing
|
||||
.send(Payload::Response(output))
|
||||
.await
|
||||
.map_err(|e| Error::Other(e.into()))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// General messages
|
||||
// -------------------------------------------------------------------------------------------
|
||||
|
||||
pub async fn initialize(&mut self) -> Result<()> {
|
||||
// TODO: delay any requests that are triggered prior to initialize
|
||||
|
||||
#[allow(deprecated)]
|
||||
let params = lsp::InitializeParams {
|
||||
process_id: Some(std::process::id()),
|
||||
root_path: None,
|
||||
// root_uri: Some(lsp_types::Url::parse("file://localhost/")?),
|
||||
root_uri: None, // set to project root in the future
|
||||
initialization_options: None,
|
||||
capabilities: lsp::ClientCapabilities {
|
||||
..Default::default()
|
||||
},
|
||||
trace: None,
|
||||
workspace_folders: None,
|
||||
client_info: None,
|
||||
locale: None, // TODO
|
||||
};
|
||||
|
||||
let response = self.request::<lsp::request::Initialize>(params).await?;
|
||||
self.capabilities = Some(response.capabilities);
|
||||
|
||||
// next up, notify<initialized>
|
||||
self.notify::<lsp::notification::Initialized>(lsp::InitializedParams {})
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn shutdown(&self) -> Result<()> {
|
||||
self.request::<lsp::request::Shutdown>(()).await
|
||||
}
|
||||
|
||||
pub async fn exit(&self) -> Result<()> {
|
||||
self.notify::<lsp::notification::Exit>(()).await
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// Text document
|
||||
// -------------------------------------------------------------------------------------------
|
||||
|
||||
pub async fn text_document_did_open(&mut self, doc: &Document) -> Result<()> {
|
||||
self.notify::<lsp::notification::DidOpenTextDocument>(lsp::DidOpenTextDocumentParams {
|
||||
text_document: lsp::TextDocumentItem {
|
||||
uri: lsp::Url::from_file_path(doc.path().unwrap()).unwrap(),
|
||||
language_id: "rust".to_string(), // TODO: hardcoded for now
|
||||
version: doc.version,
|
||||
text: String::from(doc.text()),
|
||||
},
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
fn to_changes(changeset: &ChangeSet) -> Vec<lsp::TextDocumentContentChangeEvent> {
|
||||
let mut iter = changeset.changes().iter().peekable();
|
||||
let mut old_pos = 0;
|
||||
|
||||
let mut changes = Vec::new();
|
||||
|
||||
use crate::util::pos_to_lsp_pos;
|
||||
use helix_core::Operation::*;
|
||||
|
||||
// TEMP
|
||||
let rope = helix_core::Rope::from("");
|
||||
let old_text = rope.slice(..);
|
||||
|
||||
while let Some(change) = iter.next() {
|
||||
let len = match change {
|
||||
Delete(i) | Retain(i) => *i,
|
||||
Insert(_) => 0,
|
||||
};
|
||||
let old_end = old_pos + len;
|
||||
|
||||
match change {
|
||||
Retain(_) => {}
|
||||
Delete(_) => {
|
||||
let start = pos_to_lsp_pos(&old_text, old_pos);
|
||||
let end = pos_to_lsp_pos(&old_text, old_end);
|
||||
|
||||
// a subsequent ins means a replace, consume it
|
||||
if let Some(Insert(s)) = iter.peek() {
|
||||
iter.next();
|
||||
|
||||
// replacement
|
||||
changes.push(lsp::TextDocumentContentChangeEvent {
|
||||
range: Some(lsp::Range::new(start, end)),
|
||||
text: s.into(),
|
||||
range_length: None,
|
||||
});
|
||||
} else {
|
||||
// deletion
|
||||
changes.push(lsp::TextDocumentContentChangeEvent {
|
||||
range: Some(lsp::Range::new(start, end)),
|
||||
text: "".to_string(),
|
||||
range_length: None,
|
||||
});
|
||||
};
|
||||
}
|
||||
Insert(s) => {
|
||||
let start = pos_to_lsp_pos(&old_text, old_pos);
|
||||
|
||||
// insert
|
||||
changes.push(lsp::TextDocumentContentChangeEvent {
|
||||
range: Some(lsp::Range::new(start, start)),
|
||||
text: s.into(),
|
||||
range_length: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
old_pos = old_end;
|
||||
}
|
||||
|
||||
changes
|
||||
}
|
||||
|
||||
// TODO: trigger any time history.commit_revision happens
|
||||
pub async fn text_document_did_change(
|
||||
&mut self,
|
||||
doc: &Document,
|
||||
transaction: &Transaction,
|
||||
) -> Result<()> {
|
||||
// figure out what kind of sync the server supports
|
||||
|
||||
let capabilities = self.capabilities.as_ref().unwrap(); // TODO: needs post init
|
||||
|
||||
let sync_capabilities = match capabilities.text_document_sync {
|
||||
Some(lsp::TextDocumentSyncCapability::Kind(kind)) => kind,
|
||||
Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
|
||||
change: Some(kind),
|
||||
..
|
||||
})) => kind,
|
||||
// None | SyncOptions { changes: None }
|
||||
_ => return Ok(()),
|
||||
};
|
||||
|
||||
let changes = match sync_capabilities {
|
||||
lsp::TextDocumentSyncKind::Full => {
|
||||
vec![lsp::TextDocumentContentChangeEvent {
|
||||
// range = None -> whole document
|
||||
range: None, //Some(Range)
|
||||
range_length: None, // u64 apparently deprecated
|
||||
text: "".to_string(),
|
||||
}] // TODO: probably need old_state here too?
|
||||
}
|
||||
lsp::TextDocumentSyncKind::Incremental => Self::to_changes(transaction.changes()),
|
||||
lsp::TextDocumentSyncKind::None => return Ok(()),
|
||||
};
|
||||
|
||||
self.notify::<lsp::notification::DidChangeTextDocument>(lsp::DidChangeTextDocumentParams {
|
||||
text_document: lsp::VersionedTextDocumentIdentifier::new(
|
||||
lsp::Url::from_file_path(doc.path().unwrap()).unwrap(),
|
||||
doc.version,
|
||||
),
|
||||
content_changes: changes,
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
// TODO: impl into() TextDocumentIdentifier / VersionedTextDocumentIdentifier for Document.
|
||||
|
||||
pub async fn text_document_did_close(&mut self, doc: &Document) -> Result<()> {
|
||||
self.notify::<lsp::notification::DidCloseTextDocument>(lsp::DidCloseTextDocumentParams {
|
||||
text_document: lsp::TextDocumentIdentifier::new(
|
||||
lsp::Url::from_file_path(doc.path().unwrap()).unwrap(),
|
||||
),
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
// will_save / will_save_wait_until
|
||||
|
||||
pub async fn text_document_did_save(&mut self) -> anyhow::Result<()> {
|
||||
unimplemented!()
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
mod client;
|
||||
mod transport;
|
||||
|
||||
pub use jsonrpc_core as jsonrpc;
|
||||
pub use lsp_types as lsp;
|
||||
|
||||
pub use once_cell::sync::{Lazy, OnceCell};
|
||||
|
||||
pub use client::Client;
|
||||
pub use lsp::{Position, Url};
|
||||
|
||||
use thiserror::Error;
|
||||
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error("protocol error: {0}")]
|
||||
Rpc(#[from] jsonrpc::Error),
|
||||
#[error("failed to parse: {0}")]
|
||||
Parse(#[from] serde_json::Error),
|
||||
#[error("request timed out")]
|
||||
Timeout,
|
||||
#[error(transparent)]
|
||||
Other(#[from] anyhow::Error),
|
||||
}
|
||||
|
||||
pub mod util {
|
||||
use super::*;
|
||||
|
||||
pub fn lsp_pos_to_pos(doc: &helix_core::RopeSlice, pos: lsp::Position) -> usize {
|
||||
let line = doc.line_to_char(pos.line as usize);
|
||||
let line_start = doc.char_to_utf16_cu(line);
|
||||
doc.utf16_cu_to_char(pos.character as usize + line_start)
|
||||
}
|
||||
pub fn pos_to_lsp_pos(doc: &helix_core::RopeSlice, pos: usize) -> lsp::Position {
|
||||
let line = doc.char_to_line(pos);
|
||||
let line_start = doc.char_to_utf16_cu(line);
|
||||
let col = doc.char_to_utf16_cu(pos) - line_start;
|
||||
|
||||
lsp::Position::new(line as u32, col as u32)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
pub enum Notification {
|
||||
PublishDiagnostics(lsp::PublishDiagnosticsParams),
|
||||
}
|
||||
|
||||
impl Notification {
|
||||
pub fn parse(method: &str, params: jsonrpc::Params) -> Notification {
|
||||
use lsp::notification::Notification as _;
|
||||
|
||||
match method {
|
||||
lsp::notification::PublishDiagnostics::METHOD => {
|
||||
let params: lsp::PublishDiagnosticsParams = params
|
||||
.parse()
|
||||
.expect("Failed to parse PublishDiagnostics params");
|
||||
|
||||
// TODO: need to loop over diagnostics and distinguish them by URI
|
||||
Notification::PublishDiagnostics(params)
|
||||
}
|
||||
_ => unimplemented!("unhandled notification: {}", method),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub use jsonrpc::Call;
|
||||
|
||||
type LanguageId = String;
|
||||
|
||||
pub static REGISTRY: Lazy<Registry> = Lazy::new(Registry::init);
|
||||
|
||||
pub struct Registry {
|
||||
inner: HashMap<LanguageId, OnceCell<Arc<Client>>>,
|
||||
}
|
||||
|
||||
impl Registry {
|
||||
pub fn init() -> Self {
|
||||
Self {
|
||||
inner: HashMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get(&self, id: &str, ex: &smol::Executor) -> Option<Arc<Client>> {
|
||||
// TODO: use get_or_try_init and propagate the error
|
||||
self.inner
|
||||
.get(id)
|
||||
.map(|cell| {
|
||||
cell.get_or_init(|| {
|
||||
// TODO: lookup defaults for id (name, args)
|
||||
|
||||
// initialize a new client
|
||||
let client = Client::start(&ex, "rust-analyzer", &[]);
|
||||
// TODO: also call initialize().await()
|
||||
Arc::new(client)
|
||||
})
|
||||
})
|
||||
.cloned()
|
||||
}
|
||||
}
|
||||
|
||||
// REGISTRY = HashMap<LanguageId, Lazy/OnceCell<Arc<RwLock<Client>>>
|
||||
// spawn one server per language type, need to spawn one per workspace if server doesn't support
|
||||
// workspaces
|
||||
//
|
||||
// could also be a client per root dir
|
||||
//
|
||||
// storing a copy of Option<Arc<RwLock<Client>>> on Document would make the LSP client easily
|
||||
// accessible during edit/save callbacks
|
||||
//
|
||||
// the event loop needs to process all incoming streams, maybe we can just have that be a separate
|
||||
// task that's continually running and store the state on the client, then use read lock to
|
||||
// retrieve data during render
|
||||
// -> PROBLEM: how do you trigger an update on the editor side when data updates?
|
||||
//
|
||||
// -> The data updates should pull all events until we run out so we don't frequently re-render
|
||||
|
|
@ -0,0 +1,212 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use log::debug;
|
||||
|
||||
use crate::{Error, Notification};
|
||||
|
||||
type Result<T> = core::result::Result<T, Error>;
|
||||
|
||||
use jsonrpc_core as jsonrpc;
|
||||
use serde_json::Value;
|
||||
|
||||
use smol::prelude::*;
|
||||
|
||||
use smol::{
|
||||
channel::{Receiver, Sender},
|
||||
io::{BufReader, BufWriter},
|
||||
process::{ChildStderr, ChildStdin, ChildStdout},
|
||||
Executor,
|
||||
};
|
||||
|
||||
pub(crate) enum Payload {
|
||||
Request {
|
||||
chan: Sender<Result<Value>>,
|
||||
value: jsonrpc::MethodCall,
|
||||
},
|
||||
Notification(jsonrpc::Notification),
|
||||
Response(jsonrpc::Output),
|
||||
}
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
/// A type representing all possible values sent from the server to the client.
|
||||
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
#[serde(untagged)]
|
||||
enum Message {
|
||||
/// A regular JSON-RPC request output (single response).
|
||||
Output(jsonrpc::Output),
|
||||
/// A JSON-RPC request or notification.
|
||||
Call(jsonrpc::Call),
|
||||
}
|
||||
|
||||
pub(crate) struct Transport {
|
||||
incoming: Sender<jsonrpc::Call>,
|
||||
outgoing: Receiver<Payload>,
|
||||
|
||||
pending_requests: HashMap<jsonrpc::Id, Sender<Result<Value>>>,
|
||||
headers: HashMap<String, String>,
|
||||
|
||||
writer: BufWriter<ChildStdin>,
|
||||
reader: BufReader<ChildStdout>,
|
||||
}
|
||||
|
||||
impl Transport {
|
||||
pub fn start(
|
||||
ex: &Executor,
|
||||
reader: BufReader<ChildStdout>,
|
||||
writer: BufWriter<ChildStdin>,
|
||||
) -> (Receiver<jsonrpc::Call>, Sender<Payload>) {
|
||||
let (incoming, rx) = smol::channel::unbounded();
|
||||
let (tx, outgoing) = smol::channel::unbounded();
|
||||
|
||||
let transport = Self {
|
||||
reader,
|
||||
writer,
|
||||
incoming,
|
||||
outgoing,
|
||||
pending_requests: Default::default(),
|
||||
headers: Default::default(),
|
||||
};
|
||||
|
||||
ex.spawn(transport.duplex()).detach();
|
||||
|
||||
(rx, tx)
|
||||
}
|
||||
|
||||
async fn recv(
|
||||
reader: &mut (impl AsyncBufRead + Unpin),
|
||||
headers: &mut HashMap<String, String>,
|
||||
) -> core::result::Result<Message, std::io::Error> {
|
||||
// read headers
|
||||
loop {
|
||||
let mut header = String::new();
|
||||
// detect pipe closed if 0
|
||||
reader.read_line(&mut header).await?;
|
||||
let header = header.trim();
|
||||
|
||||
if header.is_empty() {
|
||||
break;
|
||||
}
|
||||
|
||||
let parts: Vec<&str> = header.split(": ").collect();
|
||||
if parts.len() != 2 {
|
||||
return Err(std::io::Error::new(
|
||||
std::io::ErrorKind::Other,
|
||||
"Failed to parse header",
|
||||
));
|
||||
}
|
||||
headers.insert(parts[0].to_string(), parts[1].to_string());
|
||||
}
|
||||
|
||||
// find content-length
|
||||
let content_length = headers.get("Content-Length").unwrap().parse().unwrap();
|
||||
|
||||
let mut content = vec![0; content_length];
|
||||
reader.read_exact(&mut content).await?;
|
||||
let msg = String::from_utf8(content).unwrap();
|
||||
|
||||
// read data
|
||||
|
||||
// try parsing as output (server response) or call (server request)
|
||||
let output: serde_json::Result<Message> = serde_json::from_str(&msg);
|
||||
|
||||
Ok(output?)
|
||||
}
|
||||
|
||||
pub async fn send_payload(&mut self, payload: Payload) -> anyhow::Result<()> {
|
||||
match payload {
|
||||
Payload::Request { chan, value } => {
|
||||
self.pending_requests.insert(value.id.clone(), chan);
|
||||
|
||||
let json = serde_json::to_string(&value)?;
|
||||
self.send(json).await
|
||||
}
|
||||
Payload::Notification(value) => {
|
||||
let json = serde_json::to_string(&value)?;
|
||||
self.send(json).await
|
||||
}
|
||||
Payload::Response(error) => {
|
||||
let json = serde_json::to_string(&error)?;
|
||||
self.send(json).await
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn send(&mut self, request: String) -> anyhow::Result<()> {
|
||||
debug!("-> {}", request);
|
||||
|
||||
// send the headers
|
||||
self.writer
|
||||
.write_all(format!("Content-Length: {}\r\n\r\n", request.len()).as_bytes())
|
||||
.await?;
|
||||
|
||||
// send the body
|
||||
self.writer.write_all(request.as_bytes()).await?;
|
||||
|
||||
self.writer.flush().await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn recv_msg(&mut self, msg: Message) -> anyhow::Result<()> {
|
||||
match msg {
|
||||
Message::Output(output) => self.recv_response(output).await?,
|
||||
Message::Call(call) => {
|
||||
self.incoming.send(call).await?;
|
||||
// let notification = Notification::parse(&method, params);
|
||||
}
|
||||
};
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn recv_response(&mut self, output: jsonrpc::Output) -> anyhow::Result<()> {
|
||||
match output {
|
||||
jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => {
|
||||
debug!("<- {}", result);
|
||||
|
||||
let tx = self
|
||||
.pending_requests
|
||||
.remove(&id)
|
||||
.expect("pending_request with id not found!");
|
||||
tx.send(Ok(result)).await?;
|
||||
}
|
||||
jsonrpc::Output::Failure(jsonrpc::Failure { id, error, .. }) => {
|
||||
let tx = self
|
||||
.pending_requests
|
||||
.remove(&id)
|
||||
.expect("pending_request with id not found!");
|
||||
tx.send(Err(error.into())).await?;
|
||||
}
|
||||
msg => unimplemented!("{:?}", msg),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn duplex(mut self) {
|
||||
use futures_util::{select, FutureExt};
|
||||
loop {
|
||||
select! {
|
||||
// client -> server
|
||||
msg = self.outgoing.next().fuse() => {
|
||||
if msg.is_none() {
|
||||
break;
|
||||
}
|
||||
let msg = msg.unwrap();
|
||||
|
||||
self.send_payload(msg).await.unwrap();
|
||||
}
|
||||
// server <- client
|
||||
msg = Self::recv(&mut self.reader, &mut self.headers).fuse() => {
|
||||
if msg.is_err() {
|
||||
break;
|
||||
}
|
||||
let msg = msg.unwrap();
|
||||
|
||||
debug!("<- {:?}", msg);
|
||||
|
||||
self.recv_msg(msg).await.unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14,12 +14,20 @@ path = "src/main.rs"
|
|||
[dependencies]
|
||||
helix-core = { path = "../helix-core" }
|
||||
helix-view = { path = "../helix-view", features = ["term"]}
|
||||
helix-lsp = { path = "../helix-lsp"}
|
||||
|
||||
anyhow = "1"
|
||||
|
||||
smol = "1"
|
||||
num_cpus = "1.13"
|
||||
num_cpus = "1"
|
||||
# tui = { version = "0.12", default-features = false, features = ["crossterm"] }
|
||||
tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"] }
|
||||
crossterm = { version = "0.18", features = ["event-stream"] }
|
||||
clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
|
||||
|
||||
futures-util = "0.3"
|
||||
|
||||
# Logging
|
||||
fern = "0.6"
|
||||
chrono = "0.4"
|
||||
log = "0.4"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
use clap::ArgMatches as Args;
|
||||
use helix_core::{indent::TAB_WIDTH, state::Mode, syntax::HighlightEvent, Position, Range, State};
|
||||
use helix_view::{commands, keymap, prompt::Prompt, Editor, View};
|
||||
use helix_core::{indent::TAB_WIDTH, syntax::HighlightEvent, Position, Range, State};
|
||||
use helix_view::{
|
||||
commands,
|
||||
document::Mode,
|
||||
keymap::{self, Keymaps},
|
||||
prompt::Prompt,
|
||||
Document, Editor, Theme, View,
|
||||
};
|
||||
|
||||
use log::{debug, info};
|
||||
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
|
|
@ -15,8 +23,7 @@
|
|||
|
||||
use crossterm::{
|
||||
cursor,
|
||||
cursor::position,
|
||||
event::{self, read, Event, EventStream, KeyCode, KeyEvent},
|
||||
event::{read, Event, EventStream, KeyCode, KeyEvent},
|
||||
execute, queue,
|
||||
terminal::{self, disable_raw_mode, enable_raw_mode},
|
||||
};
|
||||
|
|
@ -25,21 +32,23 @@
|
|||
backend::CrosstermBackend,
|
||||
buffer::Buffer as Surface,
|
||||
layout::Rect,
|
||||
style::{Color, Style},
|
||||
style::{Color, Modifier, Style},
|
||||
};
|
||||
|
||||
const OFFSET: u16 = 6; // 5 linenr + 1 gutter
|
||||
const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter
|
||||
|
||||
type Terminal = tui::Terminal<CrosstermBackend<std::io::Stdout>>;
|
||||
|
||||
static EX: smol::Executor = smol::Executor::new();
|
||||
|
||||
const BASE_WIDTH: u16 = 30;
|
||||
|
||||
pub struct Application {
|
||||
pub struct Application<'a> {
|
||||
editor: Editor,
|
||||
prompt: Option<Prompt>,
|
||||
terminal: Renderer,
|
||||
|
||||
keymap: Keymaps,
|
||||
executor: &'a smol::Executor<'a>,
|
||||
language_server: helix_lsp::Client,
|
||||
}
|
||||
|
||||
struct Renderer {
|
||||
|
|
@ -75,30 +84,29 @@ pub fn resize(&mut self, width: u16, height: u16) {
|
|||
self.cache = Surface::empty(area);
|
||||
}
|
||||
|
||||
pub fn render_view(&mut self, view: &mut View, viewport: Rect) {
|
||||
self.render_buffer(view, viewport);
|
||||
self.render_statusline(view);
|
||||
pub fn render_view(&mut self, view: &mut View, viewport: Rect, theme: &Theme) {
|
||||
self.render_buffer(view, viewport, theme);
|
||||
self.render_statusline(view, theme);
|
||||
}
|
||||
|
||||
// TODO: ideally not &mut View but highlights require it because of cursor cache
|
||||
pub fn render_buffer(&mut self, view: &mut View, viewport: Rect) {
|
||||
pub fn render_buffer(&mut self, view: &mut View, viewport: Rect, theme: &Theme) {
|
||||
let area = Rect::new(0, 0, self.size.0, self.size.1);
|
||||
self.surface.reset(); // reset is faster than allocating new empty surface
|
||||
|
||||
// clear with background color
|
||||
self.surface
|
||||
.set_style(area, view.theme.get("ui.background"));
|
||||
self.surface.set_style(area, theme.get("ui.background"));
|
||||
|
||||
// TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|)
|
||||
let source_code = view.state.doc().to_string();
|
||||
let source_code = view.doc.text().to_string();
|
||||
|
||||
let last_line = view.last_line();
|
||||
|
||||
let range = {
|
||||
// calculate viewport byte ranges
|
||||
let start = view.state.doc().line_to_byte(view.first_line);
|
||||
let end = view.state.doc().line_to_byte(last_line)
|
||||
+ view.state.doc().line(last_line).len_bytes();
|
||||
let start = view.doc.text().line_to_byte(view.first_line);
|
||||
let end = view.doc.text().line_to_byte(last_line)
|
||||
+ view.doc.text().line(last_line).len_bytes();
|
||||
|
||||
start..end
|
||||
};
|
||||
|
|
@ -106,7 +114,7 @@ pub fn render_buffer(&mut self, view: &mut View, viewport: Rect) {
|
|||
// TODO: range doesn't actually restrict source, just highlight range
|
||||
// TODO: cache highlight results
|
||||
// TODO: only recalculate when state.doc is actually modified
|
||||
let highlights: Vec<_> = match view.state.syntax.as_mut() {
|
||||
let highlights: Vec<_> = match view.doc.syntax.as_mut() {
|
||||
Some(syntax) => {
|
||||
syntax
|
||||
.highlight_iter(source_code.as_bytes(), Some(range), None, |_| None)
|
||||
|
|
@ -122,6 +130,7 @@ pub fn render_buffer(&mut self, view: &mut View, viewport: Rect) {
|
|||
let mut visual_x = 0;
|
||||
let mut line = 0u16;
|
||||
let visible_selections: Vec<Range> = view
|
||||
.doc
|
||||
.state
|
||||
.selection()
|
||||
.ranges()
|
||||
|
|
@ -142,15 +151,15 @@ pub fn render_buffer(&mut self, view: &mut View, viewport: Rect) {
|
|||
HighlightEvent::Source { start, end } => {
|
||||
// TODO: filter out spans out of viewport for now..
|
||||
|
||||
let start = view.state.doc().byte_to_char(start);
|
||||
let end = view.state.doc().byte_to_char(end); // <-- index 744, len 743
|
||||
let start = view.doc.text().byte_to_char(start);
|
||||
let end = view.doc.text().byte_to_char(end); // <-- index 744, len 743
|
||||
|
||||
let text = view.state.doc().slice(start..end);
|
||||
let text = view.doc.text().slice(start..end);
|
||||
|
||||
use helix_core::graphemes::{grapheme_width, RopeGraphemes};
|
||||
|
||||
let style = match spans.first() {
|
||||
Some(span) => view.theme.get(view.theme.scopes()[span.0].as_str()),
|
||||
Some(span) => theme.get(theme.scopes()[span.0].as_str()),
|
||||
None => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender
|
||||
};
|
||||
|
||||
|
|
@ -200,6 +209,16 @@ pub fn render_buffer(&mut self, view: &mut View, viewport: Rect) {
|
|||
style
|
||||
};
|
||||
|
||||
// ugh, improve with a traverse method
|
||||
// or interleave highlight spans with selection and diagnostic spans
|
||||
let style = if view.doc.diagnostics.iter().any(|diagnostic| {
|
||||
diagnostic.range.0 <= char_index && diagnostic.range.1 > char_index
|
||||
}) {
|
||||
style.clone().add_modifier(Modifier::UNDERLINED)
|
||||
} else {
|
||||
style
|
||||
};
|
||||
|
||||
// TODO: paint cursor heads except primary
|
||||
|
||||
self.surface
|
||||
|
|
@ -207,23 +226,28 @@ pub fn render_buffer(&mut self, view: &mut View, viewport: Rect) {
|
|||
|
||||
visual_x += width;
|
||||
}
|
||||
// if grapheme == "\t"
|
||||
|
||||
char_index += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
let style: Style = view.theme.get("ui.linenr");
|
||||
|
||||
let style: Style = theme.get("ui.linenr");
|
||||
let warning: Style = theme.get("warning");
|
||||
let last_line = view.last_line();
|
||||
for (i, line) in (view.first_line..last_line).enumerate() {
|
||||
if view.doc.diagnostics.iter().any(|d| d.line == line) {
|
||||
self.surface.set_stringn(0, i as u16, "●", 1, warning);
|
||||
}
|
||||
|
||||
self.surface
|
||||
.set_stringn(0, i as u16, format!("{:>5}", line + 1), 5, style);
|
||||
.set_stringn(1, i as u16, format!("{:>5}", line + 1), 5, style);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn render_statusline(&mut self, view: &View) {
|
||||
let mode = match view.state.mode() {
|
||||
pub fn render_statusline(&mut self, view: &View, theme: &Theme) {
|
||||
let mode = match view.doc.mode() {
|
||||
Mode::Insert => "INS",
|
||||
Mode::Normal => "NOR",
|
||||
Mode::Goto => "GOTO",
|
||||
|
|
@ -231,13 +255,20 @@ pub fn render_statusline(&mut self, view: &View) {
|
|||
// statusline
|
||||
self.surface.set_style(
|
||||
Rect::new(0, self.size.1 - 2, self.size.0, 1),
|
||||
view.theme.get("ui.statusline"),
|
||||
theme.get("ui.statusline"),
|
||||
);
|
||||
self.surface
|
||||
.set_string(1, self.size.1 - 2, mode, self.text_color);
|
||||
|
||||
self.surface.set_string(
|
||||
self.size.0 - 10,
|
||||
self.size.1 - 2,
|
||||
format!("{}", view.doc.diagnostics.len()),
|
||||
self.text_color,
|
||||
);
|
||||
}
|
||||
|
||||
pub fn render_prompt(&mut self, view: &View, prompt: &Prompt) {
|
||||
pub fn render_prompt(&mut self, view: &View, prompt: &Prompt, theme: &Theme) {
|
||||
// completion
|
||||
if !prompt.completion.is_empty() {
|
||||
// TODO: find out better way of clearing individual lines of the screen
|
||||
|
|
@ -256,7 +287,7 @@ pub fn render_prompt(&mut self, view: &View, prompt: &Prompt) {
|
|||
}
|
||||
self.surface.set_style(
|
||||
Rect::new(0, self.size.1 - col_height - 2, self.size.0, col_height),
|
||||
view.theme.get("ui.statusline"),
|
||||
theme.get("ui.statusline"),
|
||||
);
|
||||
for (i, command) in prompt.completion.iter().enumerate() {
|
||||
let color = if prompt.completion_selection_index.is_some()
|
||||
|
|
@ -302,14 +333,14 @@ pub fn draw(&mut self) {
|
|||
|
||||
pub fn render_cursor(&mut self, view: &View, prompt: Option<&Prompt>, viewport: Rect) {
|
||||
let mut stdout = stdout();
|
||||
match view.state.mode() {
|
||||
match view.doc.mode() {
|
||||
Mode::Insert => write!(stdout, "\x1B[6 q"),
|
||||
mode => write!(stdout, "\x1B[2 q"),
|
||||
};
|
||||
let pos = if let Some(prompt) = prompt {
|
||||
Position::new(self.size.0 as usize, 2 + prompt.cursor)
|
||||
} else {
|
||||
if let Some(path) = view.state.path() {
|
||||
if let Some(path) = view.doc.path() {
|
||||
self.surface.set_string(
|
||||
6,
|
||||
self.size.1 - 1,
|
||||
|
|
@ -318,10 +349,10 @@ pub fn render_cursor(&mut self, view: &View, prompt: Option<&Prompt>, viewport:
|
|||
);
|
||||
}
|
||||
|
||||
let cursor = view.state.selection().cursor();
|
||||
let cursor = view.doc.state.selection().cursor();
|
||||
|
||||
let mut pos = view
|
||||
.screen_coords_at_pos(&view.state.doc().slice(..), cursor)
|
||||
.screen_coords_at_pos(&view.doc.text().slice(..), cursor)
|
||||
.expect("Cursor is out of bounds.");
|
||||
pos.col += viewport.x as usize;
|
||||
pos.row += viewport.y as usize;
|
||||
|
|
@ -332,8 +363,8 @@ pub fn render_cursor(&mut self, view: &View, prompt: Option<&Prompt>, viewport:
|
|||
}
|
||||
}
|
||||
|
||||
impl Application {
|
||||
pub fn new(mut args: Args) -> Result<Self, Error> {
|
||||
impl<'a> Application<'a> {
|
||||
pub fn new(mut args: Args, executor: &'a smol::Executor<'a>) -> Result<Self, Error> {
|
||||
let terminal = Renderer::new()?;
|
||||
let mut editor = Editor::new();
|
||||
|
||||
|
|
@ -341,11 +372,18 @@ pub fn new(mut args: Args) -> Result<Self, Error> {
|
|||
editor.open(file, terminal.size)?;
|
||||
}
|
||||
|
||||
let language_server = helix_lsp::Client::start(&executor, "rust-analyzer", &[]);
|
||||
|
||||
let mut app = Self {
|
||||
editor,
|
||||
terminal,
|
||||
// TODO; move to state
|
||||
prompt: None,
|
||||
|
||||
//
|
||||
keymap: keymap::default(),
|
||||
executor,
|
||||
language_server,
|
||||
};
|
||||
|
||||
Ok(app)
|
||||
|
|
@ -354,13 +392,16 @@ pub fn new(mut args: Args) -> Result<Self, Error> {
|
|||
fn render(&mut self) {
|
||||
let viewport = Rect::new(OFFSET, 0, self.terminal.size.0, self.terminal.size.1 - 2); // - 2 for statusline and prompt
|
||||
|
||||
if let Some(view) = &mut self.editor.view {
|
||||
self.terminal.render_view(view, viewport);
|
||||
// SAFETY: we cheat around the view_mut() borrow because it doesn't allow us to also borrow
|
||||
// theme. Theme is immutable mutating view won't disrupt theme_ref.
|
||||
let theme_ref = unsafe { &*(&self.editor.theme as *const Theme) };
|
||||
if let Some(view) = self.editor.view_mut() {
|
||||
self.terminal.render_view(view, viewport, theme_ref);
|
||||
if let Some(prompt) = &self.prompt {
|
||||
if prompt.should_close {
|
||||
self.prompt = None;
|
||||
} else {
|
||||
self.terminal.render_prompt(view, prompt);
|
||||
self.terminal.render_prompt(view, prompt, theme_ref);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -368,16 +409,19 @@ fn render(&mut self) {
|
|||
self.terminal.draw();
|
||||
|
||||
// TODO: drop unwrap
|
||||
self.terminal.render_cursor(
|
||||
self.editor.view.as_ref().unwrap(),
|
||||
self.prompt.as_ref(),
|
||||
viewport,
|
||||
);
|
||||
self.terminal
|
||||
.render_cursor(self.editor.view().unwrap(), self.prompt.as_ref(), viewport);
|
||||
}
|
||||
|
||||
pub async fn event_loop(&mut self) {
|
||||
let mut reader = EventStream::new();
|
||||
let keymap = keymap::default();
|
||||
|
||||
// initialize lsp
|
||||
self.language_server.initialize().await.unwrap();
|
||||
self.language_server
|
||||
.text_document_did_open(&self.editor.view().unwrap().doc)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
self.render();
|
||||
|
||||
|
|
@ -386,125 +430,225 @@ pub async fn event_loop(&mut self) {
|
|||
break;
|
||||
}
|
||||
|
||||
// Handle key events
|
||||
match reader.next().await {
|
||||
Some(Ok(Event::Resize(width, height))) => {
|
||||
self.terminal.resize(width, height);
|
||||
use futures_util::{select, FutureExt};
|
||||
select! {
|
||||
event = reader.next().fuse() => {
|
||||
self.handle_terminal_events(event).await
|
||||
}
|
||||
call = self.language_server.incoming.next().fuse() => {
|
||||
self.handle_language_server_message(call).await
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: simplistic ensure cursor in view for now
|
||||
if let Some(view) = &mut self.editor.view {
|
||||
view.size = self.terminal.size;
|
||||
view.ensure_cursor_in_view()
|
||||
};
|
||||
pub async fn handle_terminal_events(
|
||||
&mut self,
|
||||
event: Option<Result<Event, crossterm::ErrorKind>>,
|
||||
) {
|
||||
// Handle key events
|
||||
match event {
|
||||
Some(Ok(Event::Resize(width, height))) => {
|
||||
self.terminal.resize(width, height);
|
||||
|
||||
// TODO: simplistic ensure cursor in view for now
|
||||
// TODO: loop over views
|
||||
if let Some(view) = self.editor.view_mut() {
|
||||
view.size = self.terminal.size;
|
||||
view.ensure_cursor_in_view()
|
||||
};
|
||||
|
||||
self.render();
|
||||
}
|
||||
Some(Ok(Event::Key(event))) => {
|
||||
// if there's a prompt, it takes priority
|
||||
if let Some(prompt) = &mut self.prompt {
|
||||
self.prompt
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.handle_input(event, &mut self.editor);
|
||||
|
||||
self.render();
|
||||
}
|
||||
Some(Ok(Event::Key(event))) => {
|
||||
// if there's a prompt, it takes priority
|
||||
if let Some(prompt) = &mut self.prompt {
|
||||
self.prompt
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.handle_input(event, &mut self.editor);
|
||||
} else if let Some(view) = self.editor.view_mut() {
|
||||
let keys = vec![event];
|
||||
// TODO: sequences (`gg`)
|
||||
// TODO: handle count other than 1
|
||||
match view.doc.mode() {
|
||||
Mode::Insert => {
|
||||
if let Some(command) = self.keymap[&Mode::Insert].get(&keys) {
|
||||
let mut cx = helix_view::commands::Context {
|
||||
view,
|
||||
executor: self.executor,
|
||||
count: 1,
|
||||
};
|
||||
|
||||
self.render();
|
||||
} else if let Some(view) = &mut self.editor.view {
|
||||
let keys = vec![event];
|
||||
// TODO: sequences (`gg`)
|
||||
// TODO: handle count other than 1
|
||||
match view.state.mode() {
|
||||
Mode::Insert => {
|
||||
if let Some(command) = keymap[&Mode::Insert].get(&keys) {
|
||||
command(view, 1);
|
||||
} else if let KeyEvent {
|
||||
code: KeyCode::Char(c),
|
||||
..
|
||||
} = event
|
||||
{
|
||||
commands::insert::insert_char(view, c);
|
||||
}
|
||||
command(&mut cx);
|
||||
} else if let KeyEvent {
|
||||
code: KeyCode::Char(c),
|
||||
..
|
||||
} = event
|
||||
{
|
||||
let mut cx = helix_view::commands::Context {
|
||||
view,
|
||||
executor: self.executor,
|
||||
count: 1,
|
||||
};
|
||||
commands::insert::insert_char(&mut cx, c);
|
||||
}
|
||||
view.ensure_cursor_in_view();
|
||||
}
|
||||
Mode::Normal => {
|
||||
if let &[KeyEvent {
|
||||
code: KeyCode::Char(':'),
|
||||
..
|
||||
}] = keys.as_slice()
|
||||
{
|
||||
let prompt = Prompt::new(
|
||||
":".to_owned(),
|
||||
|_input: &str| {
|
||||
// TODO: i need this duplicate list right now to avoid borrow checker issues
|
||||
let command_list = vec![
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("averylongcommandaverylongcommandaverylongcommandaverylongcommandaverylongcommand"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
];
|
||||
command_list
|
||||
.into_iter()
|
||||
.filter(|command| command.contains(_input))
|
||||
.collect()
|
||||
}, // completion
|
||||
|editor: &mut Editor, input: &str| match input {
|
||||
"q" => editor.should_close = true,
|
||||
_ => (),
|
||||
},
|
||||
);
|
||||
|
||||
self.prompt = Some(prompt);
|
||||
|
||||
// HAXX: special casing for command mode
|
||||
} else if let Some(command) = self.keymap[&Mode::Normal].get(&keys) {
|
||||
let mut cx = helix_view::commands::Context {
|
||||
view,
|
||||
executor: self.executor,
|
||||
count: 1,
|
||||
};
|
||||
command(&mut cx);
|
||||
|
||||
// TODO: simplistic ensure cursor in view for now
|
||||
view.ensure_cursor_in_view();
|
||||
}
|
||||
Mode::Normal => {
|
||||
if let &[KeyEvent {
|
||||
code: KeyCode::Char(':'),
|
||||
..
|
||||
}] = keys.as_slice()
|
||||
{
|
||||
let prompt = Prompt::new(
|
||||
":".to_owned(),
|
||||
|_input: &str| {
|
||||
// TODO: i need this duplicate list right now to avoid borrow checker issues
|
||||
let command_list = vec![
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("averylongcommandaverylongcommandaverylongcommandaverylongcommandaverylongcommand"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
String::from("q"),
|
||||
String::from("aaa"),
|
||||
String::from("bbb"),
|
||||
String::from("ccc"),
|
||||
String::from("ddd"),
|
||||
String::from("eee"),
|
||||
];
|
||||
command_list
|
||||
.into_iter()
|
||||
.filter(|command| command.contains(_input))
|
||||
.collect()
|
||||
}, // completion
|
||||
|editor: &mut Editor, input: &str| match input {
|
||||
"q" => editor.should_close = true,
|
||||
_ => (),
|
||||
},
|
||||
);
|
||||
}
|
||||
mode => {
|
||||
if let Some(command) = self.keymap[&mode].get(&keys) {
|
||||
let mut cx = helix_view::commands::Context {
|
||||
view,
|
||||
executor: self.executor,
|
||||
count: 1,
|
||||
};
|
||||
command(&mut cx);
|
||||
|
||||
self.prompt = Some(prompt);
|
||||
|
||||
// HAXX: special casing for command mode
|
||||
} else if let Some(command) = keymap[&Mode::Normal].get(&keys) {
|
||||
command(view, 1);
|
||||
|
||||
// TODO: simplistic ensure cursor in view for now
|
||||
view.ensure_cursor_in_view();
|
||||
}
|
||||
}
|
||||
mode => {
|
||||
if let Some(command) = keymap[&mode].get(&keys) {
|
||||
command(view, 1);
|
||||
|
||||
// TODO: simplistic ensure cursor in view for now
|
||||
view.ensure_cursor_in_view();
|
||||
}
|
||||
// TODO: simplistic ensure cursor in view for now
|
||||
view.ensure_cursor_in_view();
|
||||
}
|
||||
}
|
||||
self.render();
|
||||
}
|
||||
self.render();
|
||||
}
|
||||
Some(Ok(Event::Mouse(_))) => (), // unhandled
|
||||
Some(Err(x)) => panic!(x),
|
||||
None => break,
|
||||
}
|
||||
Some(Ok(Event::Mouse(_))) => (), // unhandled
|
||||
Some(Err(x)) => panic!(x),
|
||||
None => panic!(),
|
||||
};
|
||||
}
|
||||
|
||||
pub async fn handle_language_server_message(&mut self, call: Option<helix_lsp::Call>) {
|
||||
use helix_lsp::{Call, Notification};
|
||||
match call {
|
||||
Some(Call::Notification(helix_lsp::jsonrpc::Notification {
|
||||
method, params, ..
|
||||
})) => {
|
||||
let notification = Notification::parse(&method, params);
|
||||
match notification {
|
||||
Notification::PublishDiagnostics(params) => {
|
||||
let path = Some(params.uri.to_file_path().unwrap());
|
||||
let view = self
|
||||
.editor
|
||||
.views
|
||||
.iter_mut()
|
||||
.find(|view| view.doc.path == path);
|
||||
|
||||
if let Some(view) = view {
|
||||
let doc = view.doc.text().slice(..);
|
||||
let diagnostics = params
|
||||
.diagnostics
|
||||
.into_iter()
|
||||
.map(|diagnostic| {
|
||||
use helix_lsp::util::lsp_pos_to_pos;
|
||||
let start = lsp_pos_to_pos(&doc, diagnostic.range.start);
|
||||
let end = lsp_pos_to_pos(&doc, diagnostic.range.end);
|
||||
|
||||
helix_core::Diagnostic {
|
||||
range: (start, end),
|
||||
line: diagnostic.range.start.line as usize,
|
||||
message: diagnostic.message,
|
||||
// severity
|
||||
// code
|
||||
// source
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
view.doc.diagnostics = diagnostics;
|
||||
|
||||
// TODO: we want to process all the events in queue, then render. publishDiagnostic tends to send a whole bunch of events
|
||||
self.render();
|
||||
}
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
Some(Call::MethodCall(call)) => {
|
||||
debug!("Method not found {}", call.method);
|
||||
|
||||
self.language_server.reply(
|
||||
call.id,
|
||||
// TODO: make a Into trait that can cast to Err(jsonrpc::Error)
|
||||
Err(helix_lsp::jsonrpc::Error {
|
||||
code: helix_lsp::jsonrpc::ErrorCode::MethodNotFound,
|
||||
message: "Method not found".to_string(),
|
||||
data: None,
|
||||
}),
|
||||
);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,39 @@
|
|||
|
||||
static EX: smol::Executor = smol::Executor::new();
|
||||
|
||||
fn setup_logging(verbosity: u64) -> Result<(), fern::InitError> {
|
||||
let mut base_config = fern::Dispatch::new();
|
||||
|
||||
// Let's say we depend on something which whose "info" level messages are too
|
||||
// verbose to include in end-user output. If we don't need them,
|
||||
// let's not include them.
|
||||
// .level_for("overly-verbose-target", log::LevelFilter::Warn)
|
||||
|
||||
base_config = match verbosity {
|
||||
0 => base_config.level(log::LevelFilter::Warn),
|
||||
1 => base_config.level(log::LevelFilter::Info),
|
||||
2 => base_config.level(log::LevelFilter::Debug),
|
||||
_3_or_more => base_config.level(log::LevelFilter::Trace),
|
||||
};
|
||||
|
||||
// Separate file config so we can include year, month and day in file logs
|
||||
let file_config = fern::Dispatch::new()
|
||||
.format(|out, message, record| {
|
||||
out.finish(format_args!(
|
||||
"{} {} [{}] {}",
|
||||
chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%.3f"),
|
||||
record.target(),
|
||||
record.level(),
|
||||
message
|
||||
))
|
||||
})
|
||||
.chain(fern::log_file("helix.log")?);
|
||||
|
||||
base_config.chain(file_config).apply()?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn main() -> Result<(), Error> {
|
||||
let args = clap::app_from_crate!()
|
||||
.arg(
|
||||
|
|
@ -20,15 +53,27 @@ fn main() -> Result<(), Error> {
|
|||
.multiple(true)
|
||||
.index(1),
|
||||
)
|
||||
.arg(
|
||||
Arg::new("verbose")
|
||||
.about("Increases logging verbosity each use for up to 3 times")
|
||||
.short('v')
|
||||
.takes_value(false)
|
||||
.multiple_occurrences(true),
|
||||
)
|
||||
.get_matches();
|
||||
|
||||
let verbosity: u64 = args.occurrences_of("verbose");
|
||||
|
||||
setup_logging(verbosity).expect("failed to initialize logging.");
|
||||
|
||||
for _ in 0..num_cpus::get() {
|
||||
std::thread::spawn(move || smol::block_on(EX.run(smol::future::pending::<()>())));
|
||||
}
|
||||
|
||||
smol::block_on(EX.run(async {
|
||||
Application::new(args).unwrap().run().await;
|
||||
}));
|
||||
let mut app = Application::new(args, &EX).unwrap();
|
||||
|
||||
// we use the thread local executor to spawn the application task separately from the work pool
|
||||
smol::block_on(app.run());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,3 +19,6 @@ helix-core = { path = "../helix-core" }
|
|||
tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"], optional = true}
|
||||
crossterm = { version = "0.18", features = ["event-stream"], optional = true}
|
||||
once_cell = "1.4"
|
||||
url = "2"
|
||||
|
||||
smol = "1"
|
||||
|
|
|
|||
|
|
@ -3,52 +3,65 @@
|
|||
indent::TAB_WIDTH,
|
||||
regex::Regex,
|
||||
register, selection,
|
||||
state::{Direction, Granularity, Mode, State},
|
||||
state::{Direction, Granularity, State},
|
||||
ChangeSet, Range, Selection, Tendril, Transaction,
|
||||
};
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use crate::{
|
||||
document::Mode,
|
||||
prompt::Prompt,
|
||||
view::{View, PADDING},
|
||||
};
|
||||
|
||||
pub struct Context<'a, 'b> {
|
||||
pub count: usize,
|
||||
pub view: &'a mut View,
|
||||
pub executor: &'a smol::Executor<'b>,
|
||||
}
|
||||
|
||||
/// A command is a function that takes the current state and a count, and does a side-effect on the
|
||||
/// state (usually by creating and applying a transaction).
|
||||
pub type Command = fn(view: &mut View, count: usize);
|
||||
pub type Command = fn(cx: &mut Context);
|
||||
|
||||
pub fn move_char_left(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
let selection = view
|
||||
.state
|
||||
.move_selection(Direction::Backward, Granularity::Character, count);
|
||||
view.state.selection = selection;
|
||||
pub fn move_char_left(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.move_selection(Direction::Backward, Granularity::Character, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn move_char_right(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection =
|
||||
view.state
|
||||
.move_selection(Direction::Forward, Granularity::Character, count);
|
||||
pub fn move_char_right(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.move_selection(Direction::Forward, Granularity::Character, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn move_line_up(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection = view
|
||||
.state
|
||||
.move_selection(Direction::Backward, Granularity::Line, count);
|
||||
pub fn move_line_up(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.move_selection(Direction::Backward, Granularity::Line, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn move_line_down(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection = view
|
||||
.state
|
||||
.move_selection(Direction::Forward, Granularity::Line, count);
|
||||
pub fn move_line_down(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.move_selection(Direction::Forward, Granularity::Line, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn move_line_end(view: &mut View, _count: usize) {
|
||||
// TODO: use a transaction
|
||||
let lines = selection_lines(&view.state);
|
||||
pub fn move_line_end(cx: &mut Context) {
|
||||
let lines = selection_lines(&cx.view.doc.state);
|
||||
|
||||
let positions = lines
|
||||
.into_iter()
|
||||
|
|
@ -57,89 +70,80 @@ pub fn move_line_end(view: &mut View, _count: usize) {
|
|||
|
||||
// Line end is pos at the start of next line - 1
|
||||
// subtract another 1 because the line ends with \n
|
||||
view.state.doc.line_to_char(index + 1).saturating_sub(2)
|
||||
cx.view.doc.text().line_to_char(index + 1).saturating_sub(2)
|
||||
})
|
||||
.map(|pos| Range::new(pos, pos));
|
||||
|
||||
let selection = Selection::new(positions.collect(), 0);
|
||||
|
||||
let transaction = Transaction::new(&mut view.state).with_selection(selection);
|
||||
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn move_line_start(view: &mut View, _count: usize) {
|
||||
let lines = selection_lines(&view.state);
|
||||
pub fn move_line_start(cx: &mut Context) {
|
||||
let lines = selection_lines(&cx.view.doc.state);
|
||||
|
||||
let positions = lines
|
||||
.into_iter()
|
||||
.map(|index| {
|
||||
// adjust all positions to the start of the line.
|
||||
view.state.doc.line_to_char(index)
|
||||
cx.view.doc.text().line_to_char(index)
|
||||
})
|
||||
.map(|pos| Range::new(pos, pos));
|
||||
|
||||
let selection = Selection::new(positions.collect(), 0);
|
||||
|
||||
let transaction = Transaction::new(&mut view.state).with_selection(selection);
|
||||
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn move_next_word_start(view: &mut View, count: usize) {
|
||||
let pos = view.state.move_pos(
|
||||
view.state.selection.cursor(),
|
||||
pub fn move_next_word_start(cx: &mut Context) {
|
||||
let pos = cx.view.doc.state.move_pos(
|
||||
cx.view.doc.selection().cursor(),
|
||||
Direction::Forward,
|
||||
Granularity::Word,
|
||||
count,
|
||||
cx.count,
|
||||
);
|
||||
|
||||
// TODO: use a transaction
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
|
||||
pub fn move_prev_word_start(view: &mut View, count: usize) {
|
||||
let pos = view.state.move_pos(
|
||||
view.state.selection.cursor(),
|
||||
pub fn move_prev_word_start(cx: &mut Context) {
|
||||
let pos = cx.view.doc.state.move_pos(
|
||||
cx.view.doc.selection().cursor(),
|
||||
Direction::Backward,
|
||||
Granularity::Word,
|
||||
count,
|
||||
cx.count,
|
||||
);
|
||||
|
||||
// TODO: use a transaction
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
|
||||
pub fn move_next_word_end(view: &mut View, count: usize) {
|
||||
pub fn move_next_word_end(cx: &mut Context) {
|
||||
let pos = State::move_next_word_end(
|
||||
&view.state.doc().slice(..),
|
||||
view.state.selection.cursor(),
|
||||
count,
|
||||
&cx.view.doc.text().slice(..),
|
||||
cx.view.doc.selection().cursor(),
|
||||
cx.count,
|
||||
);
|
||||
|
||||
// TODO: use a transaction
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
|
||||
pub fn move_file_start(view: &mut View, _count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection = Selection::single(0, 0);
|
||||
pub fn move_file_start(cx: &mut Context) {
|
||||
cx.view.doc.set_selection(Selection::point(0));
|
||||
|
||||
view.state.mode = Mode::Normal;
|
||||
cx.view.doc.mode = Mode::Normal;
|
||||
}
|
||||
|
||||
pub fn move_file_end(view: &mut View, _count: usize) {
|
||||
// TODO: use a transaction
|
||||
let text = &view.state.doc;
|
||||
pub fn move_file_end(cx: &mut Context) {
|
||||
let text = &cx.view.doc.text();
|
||||
let last_line = text.line_to_char(text.len_lines().saturating_sub(2));
|
||||
view.state.selection = Selection::single(last_line, last_line);
|
||||
cx.view.doc.set_selection(Selection::point(last_line));
|
||||
|
||||
view.state.mode = Mode::Normal;
|
||||
cx.view.doc.mode = Mode::Normal;
|
||||
}
|
||||
|
||||
pub fn check_cursor_in_view(view: &mut View) -> bool {
|
||||
let cursor = view.state.selection().cursor();
|
||||
let line = view.state.doc().char_to_line(cursor);
|
||||
pub fn check_cursor_in_view(view: &View) -> bool {
|
||||
let cursor = view.doc.selection().cursor();
|
||||
let line = view.doc.text().char_to_line(cursor);
|
||||
let document_end = view.first_line + view.size.1.saturating_sub(1) as usize;
|
||||
|
||||
if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
|
||||
|
|
@ -148,168 +152,186 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {
|
|||
true
|
||||
}
|
||||
|
||||
pub fn page_up(view: &mut View, _count: usize) {
|
||||
if view.first_line < PADDING {
|
||||
pub fn page_up(cx: &mut Context) {
|
||||
if cx.view.first_line < PADDING {
|
||||
return;
|
||||
}
|
||||
|
||||
view.first_line = view.first_line.saturating_sub(view.size.1 as usize);
|
||||
cx.view.first_line = cx.view.first_line.saturating_sub(cx.view.size.1 as usize);
|
||||
|
||||
if !check_cursor_in_view(view) {
|
||||
let text = view.state.doc();
|
||||
let pos = text.line_to_char(view.last_line().saturating_sub(PADDING));
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
if !check_cursor_in_view(cx.view) {
|
||||
let text = cx.view.doc.text();
|
||||
let pos = text.line_to_char(cx.view.last_line().saturating_sub(PADDING));
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn page_down(view: &mut View, _count: usize) {
|
||||
view.first_line += view.size.1 as usize + PADDING;
|
||||
pub fn page_down(cx: &mut Context) {
|
||||
cx.view.first_line += cx.view.size.1 as usize + PADDING;
|
||||
|
||||
if view.first_line < view.state.doc().len_lines() {
|
||||
let text = view.state.doc();
|
||||
let pos = text.line_to_char(view.first_line as usize);
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
if cx.view.first_line < cx.view.doc.text().len_lines() {
|
||||
let text = cx.view.doc.text();
|
||||
let pos = text.line_to_char(cx.view.first_line as usize);
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn half_page_up(view: &mut View, _count: usize) {
|
||||
if view.first_line < PADDING {
|
||||
pub fn half_page_up(cx: &mut Context) {
|
||||
if cx.view.first_line < PADDING {
|
||||
return;
|
||||
}
|
||||
|
||||
view.first_line = view.first_line.saturating_sub(view.size.1 as usize / 2);
|
||||
cx.view.first_line = cx
|
||||
.view
|
||||
.first_line
|
||||
.saturating_sub(cx.view.size.1 as usize / 2);
|
||||
|
||||
if !check_cursor_in_view(view) {
|
||||
let text = &view.state.doc;
|
||||
let pos = text.line_to_char(view.last_line() - PADDING);
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
if !check_cursor_in_view(cx.view) {
|
||||
let text = &cx.view.doc.text();
|
||||
let pos = text.line_to_char(cx.view.last_line() - PADDING);
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn half_page_down(view: &mut View, _count: usize) {
|
||||
let lines = view.state.doc().len_lines();
|
||||
if view.first_line < lines.saturating_sub(view.size.1 as usize) {
|
||||
view.first_line += view.size.1 as usize / 2;
|
||||
pub fn half_page_down(cx: &mut Context) {
|
||||
let lines = cx.view.doc.text().len_lines();
|
||||
if cx.view.first_line < lines.saturating_sub(cx.view.size.1 as usize) {
|
||||
cx.view.first_line += cx.view.size.1 as usize / 2;
|
||||
}
|
||||
if !check_cursor_in_view(view) {
|
||||
let text = view.state.doc();
|
||||
let pos = text.line_to_char(view.first_line as usize);
|
||||
view.state.selection = Selection::single(pos, pos);
|
||||
if !check_cursor_in_view(cx.view) {
|
||||
let text = cx.view.doc.text();
|
||||
let pos = text.line_to_char(cx.view.first_line as usize);
|
||||
cx.view.doc.set_selection(Selection::point(pos));
|
||||
}
|
||||
}
|
||||
// avoid select by default by having a visual mode switch that makes movements into selects
|
||||
|
||||
pub fn extend_char_left(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
let selection = view
|
||||
.state
|
||||
.extend_selection(Direction::Backward, Granularity::Character, count);
|
||||
view.state.selection = selection;
|
||||
pub fn extend_char_left(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.extend_selection(Direction::Backward, Granularity::Character, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn extend_char_right(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection =
|
||||
view.state
|
||||
.extend_selection(Direction::Forward, Granularity::Character, count);
|
||||
pub fn extend_char_right(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.extend_selection(Direction::Forward, Granularity::Character, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn extend_line_up(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection =
|
||||
view.state
|
||||
.extend_selection(Direction::Backward, Granularity::Line, count);
|
||||
pub fn extend_line_up(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.extend_selection(Direction::Backward, Granularity::Line, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn extend_line_down(view: &mut View, count: usize) {
|
||||
// TODO: use a transaction
|
||||
view.state.selection =
|
||||
view.state
|
||||
.extend_selection(Direction::Forward, Granularity::Line, count);
|
||||
pub fn extend_line_down(cx: &mut Context) {
|
||||
let selection =
|
||||
cx.view
|
||||
.doc
|
||||
.state
|
||||
.extend_selection(Direction::Forward, Granularity::Line, cx.count);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn split_selection_on_newline(view: &mut View, _count: usize) {
|
||||
let text = &view.state.doc.slice(..);
|
||||
pub fn split_selection_on_newline(cx: &mut Context) {
|
||||
let text = &cx.view.doc.text().slice(..);
|
||||
// only compile the regex once
|
||||
#[allow(clippy::trivial_regex)]
|
||||
static REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\n").unwrap());
|
||||
// TODO: use a transaction
|
||||
view.state.selection = selection::split_on_matches(text, view.state.selection(), ®EX)
|
||||
let selection = selection::split_on_matches(text, cx.view.doc.selection(), ®EX);
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn select_line(view: &mut View, _count: usize) {
|
||||
pub fn select_line(cx: &mut Context) {
|
||||
// TODO: count
|
||||
let pos = view.state.selection().primary();
|
||||
let text = view.state.doc();
|
||||
let pos = cx.view.doc.selection().primary();
|
||||
let text = cx.view.doc.text();
|
||||
let line = text.char_to_line(pos.head);
|
||||
let start = text.line_to_char(line);
|
||||
let end = text.line_to_char(line + 1).saturating_sub(1);
|
||||
|
||||
// TODO: use a transaction
|
||||
view.state.selection = Selection::single(start, end);
|
||||
cx.view.doc.set_selection(Selection::single(start, end));
|
||||
}
|
||||
|
||||
pub fn delete_selection(view: &mut View, _count: usize) {
|
||||
let transaction =
|
||||
Transaction::change_by_selection(&view.state, |range| (range.from(), range.to() + 1, None));
|
||||
transaction.apply(&mut view.state);
|
||||
pub fn delete_selection(cx: &mut Context) {
|
||||
let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| {
|
||||
(range.from(), range.to() + 1, None)
|
||||
});
|
||||
cx.view.doc.apply(&transaction);
|
||||
|
||||
append_changes_to_history(view);
|
||||
append_changes_to_history(cx);
|
||||
}
|
||||
|
||||
pub fn change_selection(view: &mut View, count: usize) {
|
||||
delete_selection(view, count);
|
||||
insert_mode(view, count);
|
||||
pub fn change_selection(cx: &mut Context) {
|
||||
delete_selection(cx);
|
||||
insert_mode(cx);
|
||||
}
|
||||
|
||||
pub fn collapse_selection(view: &mut View, _count: usize) {
|
||||
view.state.selection = view
|
||||
.state
|
||||
.selection
|
||||
.transform(|range| Range::new(range.head, range.head))
|
||||
pub fn collapse_selection(cx: &mut Context) {
|
||||
let selection = cx
|
||||
.view
|
||||
.doc
|
||||
.selection()
|
||||
.transform(|range| Range::new(range.head, range.head));
|
||||
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
pub fn flip_selections(view: &mut View, _count: usize) {
|
||||
view.state.selection = view
|
||||
.state
|
||||
.selection
|
||||
.transform(|range| Range::new(range.head, range.anchor))
|
||||
pub fn flip_selections(cx: &mut Context) {
|
||||
let selection = cx
|
||||
.view
|
||||
.doc
|
||||
.selection()
|
||||
.transform(|range| Range::new(range.head, range.anchor));
|
||||
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
fn enter_insert_mode(view: &mut View) {
|
||||
view.state.mode = Mode::Insert;
|
||||
fn enter_insert_mode(cx: &mut Context) {
|
||||
cx.view.doc.mode = Mode::Insert;
|
||||
|
||||
append_changes_to_history(view);
|
||||
append_changes_to_history(cx);
|
||||
}
|
||||
// inserts at the start of each selection
|
||||
pub fn insert_mode(view: &mut View, _count: usize) {
|
||||
enter_insert_mode(view);
|
||||
pub fn insert_mode(cx: &mut Context) {
|
||||
enter_insert_mode(cx);
|
||||
|
||||
view.state.selection = view
|
||||
.state
|
||||
.selection
|
||||
.transform(|range| Range::new(range.to(), range.from()))
|
||||
let selection = cx
|
||||
.view
|
||||
.doc
|
||||
.selection()
|
||||
.transform(|range| Range::new(range.to(), range.from()));
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
// inserts at the end of each selection
|
||||
pub fn append_mode(view: &mut View, _count: usize) {
|
||||
enter_insert_mode(view);
|
||||
view.state.restore_cursor = true;
|
||||
pub fn append_mode(cx: &mut Context) {
|
||||
enter_insert_mode(cx);
|
||||
cx.view.doc.restore_cursor = true;
|
||||
|
||||
// TODO: as transaction
|
||||
let text = &view.state.doc.slice(..);
|
||||
view.state.selection = view.state.selection.transform(|range| {
|
||||
let text = &cx.view.doc.text().slice(..);
|
||||
let selection = cx.view.doc.selection().transform(|range| {
|
||||
// TODO: to() + next char
|
||||
Range::new(
|
||||
range.from(),
|
||||
graphemes::next_grapheme_boundary(text, range.to()),
|
||||
)
|
||||
})
|
||||
});
|
||||
cx.view.doc.set_selection(selection);
|
||||
}
|
||||
|
||||
// TODO: I, A, o and O can share a lot of the primitives.
|
||||
|
||||
pub fn command_mode(_view: &mut View, _count: usize) {
|
||||
pub fn command_mode(_cx: &mut Context) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
|
|
@ -329,30 +351,30 @@ fn selection_lines(state: &State) -> Vec<usize> {
|
|||
}
|
||||
|
||||
// I inserts at the start of each line with a selection
|
||||
pub fn prepend_to_line(view: &mut View, count: usize) {
|
||||
enter_insert_mode(view);
|
||||
pub fn prepend_to_line(cx: &mut Context) {
|
||||
enter_insert_mode(cx);
|
||||
|
||||
move_line_start(view, count);
|
||||
move_line_start(cx);
|
||||
}
|
||||
|
||||
// A inserts at the end of each line with a selection
|
||||
pub fn append_to_line(view: &mut View, count: usize) {
|
||||
enter_insert_mode(view);
|
||||
pub fn append_to_line(cx: &mut Context) {
|
||||
enter_insert_mode(cx);
|
||||
|
||||
move_line_end(view, count);
|
||||
move_line_end(cx);
|
||||
}
|
||||
|
||||
// o inserts a new line after each line with a selection
|
||||
pub fn open_below(view: &mut View, _count: usize) {
|
||||
enter_insert_mode(view);
|
||||
pub fn open_below(cx: &mut Context) {
|
||||
enter_insert_mode(cx);
|
||||
|
||||
let lines = selection_lines(&view.state);
|
||||
let lines = selection_lines(&cx.view.doc.state);
|
||||
|
||||
let positions: Vec<_> = lines
|
||||
.into_iter()
|
||||
.map(|index| {
|
||||
// adjust all positions to the end of the line/start of the next one.
|
||||
view.state.doc.line_to_char(index + 1)
|
||||
cx.view.doc.text().line_to_char(index + 1)
|
||||
})
|
||||
.collect();
|
||||
|
||||
|
|
@ -373,111 +395,119 @@ pub fn open_below(view: &mut View, _count: usize) {
|
|||
0,
|
||||
);
|
||||
|
||||
let transaction = Transaction::change(&view.state, changes).with_selection(selection);
|
||||
let transaction = Transaction::change(&cx.view.doc.state, changes).with_selection(selection);
|
||||
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.apply(&transaction);
|
||||
}
|
||||
|
||||
// O inserts a new line before each line with a selection
|
||||
|
||||
fn append_changes_to_history(view: &mut View) {
|
||||
if view.state.changes.is_empty() {
|
||||
fn append_changes_to_history(cx: &mut Context) {
|
||||
if cx.view.doc.changes.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
let new_changeset = ChangeSet::new(view.state.doc());
|
||||
let changes = std::mem::replace(&mut view.state.changes, new_changeset);
|
||||
let new_changeset = ChangeSet::new(cx.view.doc.text());
|
||||
let changes = std::mem::replace(&mut cx.view.doc.changes, new_changeset);
|
||||
// Instead of doing this messy merge we could always commit, and based on transaction
|
||||
// annotations either add a new layer or compose into the previous one.
|
||||
let transaction = Transaction::from(changes).with_selection(view.state.selection().clone());
|
||||
let transaction = Transaction::from(changes).with_selection(cx.view.doc.selection().clone());
|
||||
|
||||
// increment document version
|
||||
// TODO: needs to happen on undo/redo too
|
||||
cx.view.doc.version += 1;
|
||||
|
||||
// TODO: trigger lsp/documentDidChange with changes
|
||||
|
||||
// HAXX: we need to reconstruct the state as it was before the changes..
|
||||
let (doc, selection) = view.state.old_state.take().unwrap();
|
||||
let mut old_state = State::new(doc);
|
||||
old_state.selection = selection;
|
||||
|
||||
let old_state = std::mem::replace(&mut cx.view.doc.old_state, cx.view.doc.state.clone());
|
||||
// TODO: take transaction by value?
|
||||
view.history.commit_revision(&transaction, &old_state);
|
||||
cx.view
|
||||
.doc
|
||||
.history
|
||||
.commit_revision(&transaction, &old_state);
|
||||
|
||||
// TODO: need to start the state with these vals
|
||||
// HAXX
|
||||
view.state.old_state = Some((view.state.doc().clone(), view.state.selection.clone()));
|
||||
// TODO: notify LSP of changes
|
||||
}
|
||||
|
||||
pub fn normal_mode(view: &mut View, _count: usize) {
|
||||
view.state.mode = Mode::Normal;
|
||||
pub fn normal_mode(cx: &mut Context) {
|
||||
cx.view.doc.mode = Mode::Normal;
|
||||
|
||||
append_changes_to_history(view);
|
||||
append_changes_to_history(cx);
|
||||
|
||||
// if leaving append mode, move cursor back by 1
|
||||
if view.state.restore_cursor {
|
||||
let text = &view.state.doc.slice(..);
|
||||
view.state.selection = view.state.selection.transform(|range| {
|
||||
if cx.view.doc.restore_cursor {
|
||||
let text = &cx.view.doc.text().slice(..);
|
||||
let selection = cx.view.doc.selection().transform(|range| {
|
||||
Range::new(
|
||||
range.from(),
|
||||
graphemes::prev_grapheme_boundary(text, range.to()),
|
||||
)
|
||||
});
|
||||
cx.view.doc.set_selection(selection);
|
||||
|
||||
view.state.restore_cursor = false;
|
||||
cx.view.doc.restore_cursor = false;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn goto_mode(view: &mut View, _count: usize) {
|
||||
view.state.mode = Mode::Goto;
|
||||
pub fn goto_mode(cx: &mut Context) {
|
||||
cx.view.doc.mode = Mode::Goto;
|
||||
}
|
||||
|
||||
// NOTE: Transactions in this module get appended to history when we switch back to normal mode.
|
||||
pub mod insert {
|
||||
use super::*;
|
||||
// TODO: insert means add text just before cursor, on exit we should be on the last letter.
|
||||
pub fn insert_char(view: &mut View, c: char) {
|
||||
pub fn insert_char(cx: &mut Context, c: char) {
|
||||
let c = Tendril::from_char(c);
|
||||
let transaction = Transaction::insert(&view.state, c);
|
||||
let transaction = Transaction::insert(&cx.view.doc.state, c);
|
||||
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.apply(&transaction);
|
||||
}
|
||||
|
||||
pub fn insert_tab(view: &mut View, _count: usize) {
|
||||
insert_char(view, '\t');
|
||||
pub fn insert_tab(cx: &mut Context) {
|
||||
insert_char(cx, '\t');
|
||||
}
|
||||
|
||||
pub fn insert_newline(view: &mut View, _count: usize) {
|
||||
let transaction = Transaction::change_by_selection(&view.state, |range| {
|
||||
let indent_level =
|
||||
helix_core::indent::suggested_indent_for_pos(&view.state, range.head);
|
||||
pub fn insert_newline(cx: &mut Context) {
|
||||
let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| {
|
||||
let indent_level = helix_core::indent::suggested_indent_for_pos(
|
||||
cx.view.doc.syntax.as_ref(),
|
||||
&cx.view.doc.state,
|
||||
range.head,
|
||||
);
|
||||
let indent = " ".repeat(TAB_WIDTH).repeat(indent_level);
|
||||
let mut text = String::with_capacity(1 + indent.len());
|
||||
text.push('\n');
|
||||
text.push_str(&indent);
|
||||
(range.head, range.head, Some(text.into()))
|
||||
});
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.apply(&transaction);
|
||||
}
|
||||
|
||||
// TODO: handle indent-aware delete
|
||||
pub fn delete_char_backward(view: &mut View, count: usize) {
|
||||
let text = &view.state.doc.slice(..);
|
||||
let transaction = Transaction::change_by_selection(&view.state, |range| {
|
||||
pub fn delete_char_backward(cx: &mut Context) {
|
||||
let text = &cx.view.doc.text().slice(..);
|
||||
let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| {
|
||||
(
|
||||
graphemes::nth_prev_grapheme_boundary(text, range.head, count),
|
||||
graphemes::nth_prev_grapheme_boundary(text, range.head, cx.count),
|
||||
range.head,
|
||||
None,
|
||||
)
|
||||
});
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.apply(&transaction);
|
||||
}
|
||||
|
||||
pub fn delete_char_forward(view: &mut View, count: usize) {
|
||||
let text = &view.state.doc.slice(..);
|
||||
let transaction = Transaction::change_by_selection(&view.state, |range| {
|
||||
pub fn delete_char_forward(cx: &mut Context) {
|
||||
let text = &cx.view.doc.text().slice(..);
|
||||
let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| {
|
||||
(
|
||||
range.head,
|
||||
graphemes::nth_next_grapheme_boundary(text, range.head, count),
|
||||
graphemes::nth_next_grapheme_boundary(text, range.head, cx.count),
|
||||
None,
|
||||
)
|
||||
});
|
||||
transaction.apply(&mut view.state);
|
||||
cx.view.doc.apply(&transaction);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -487,24 +517,32 @@ pub fn insert_char_prompt(prompt: &mut Prompt, c: char) {
|
|||
|
||||
// Undo / Redo
|
||||
|
||||
pub fn undo(view: &mut View, _count: usize) {
|
||||
view.history.undo(&mut view.state);
|
||||
pub fn undo(cx: &mut Context) {
|
||||
if let Some(revert) = cx.view.doc.history.undo() {
|
||||
cx.view.doc.version += 1;
|
||||
cx.view.doc.apply(&revert);
|
||||
}
|
||||
|
||||
// TODO: each command could simply return a Option<transaction>, then the higher level handles storing it?
|
||||
}
|
||||
|
||||
pub fn redo(view: &mut View, _count: usize) {
|
||||
view.history.redo(&mut view.state);
|
||||
pub fn redo(cx: &mut Context) {
|
||||
if let Some(transaction) = cx.view.doc.history.redo() {
|
||||
cx.view.doc.version += 1;
|
||||
cx.view.doc.apply(&transaction);
|
||||
}
|
||||
}
|
||||
|
||||
// Yank / Paste
|
||||
|
||||
pub fn yank(view: &mut View, _count: usize) {
|
||||
pub fn yank(cx: &mut Context) {
|
||||
// TODO: should selections be made end inclusive?
|
||||
let values = view
|
||||
let values = cx
|
||||
.view
|
||||
.doc
|
||||
.state
|
||||
.selection()
|
||||
.fragments(&view.state.doc().slice(..))
|
||||
.fragments(&cx.view.doc.text().slice(..))
|
||||
.map(|cow| cow.into_owned())
|
||||
.collect();
|
||||
|
||||
|
|
@ -513,7 +551,7 @@ pub fn yank(view: &mut View, _count: usize) {
|
|||
register::set(reg, values);
|
||||
}
|
||||
|
||||
pub fn paste(view: &mut View, _count: usize) {
|
||||
pub fn paste(cx: &mut Context) {
|
||||
// TODO: allow specifying reg
|
||||
let reg = '"';
|
||||
if let Some(values) = register::get(reg) {
|
||||
|
|
@ -545,19 +583,19 @@ pub fn paste(view: &mut View, _count: usize) {
|
|||
let transaction = if linewise {
|
||||
// paste on the next line
|
||||
// TODO: can simply take a range + modifier and compute the right pos without ifs
|
||||
let text = view.state.doc();
|
||||
Transaction::change_by_selection(&view.state, |range| {
|
||||
let text = cx.view.doc.text();
|
||||
Transaction::change_by_selection(&cx.view.doc.state, |range| {
|
||||
let line_end = text.line_to_char(text.char_to_line(range.head) + 1);
|
||||
(line_end, line_end, Some(values.next().unwrap()))
|
||||
})
|
||||
} else {
|
||||
Transaction::change_by_selection(&view.state, |range| {
|
||||
Transaction::change_by_selection(&cx.view.doc.state, |range| {
|
||||
(range.head + 1, range.head + 1, Some(values.next().unwrap()))
|
||||
})
|
||||
};
|
||||
|
||||
transaction.apply(&mut view.state);
|
||||
append_changes_to_history(view);
|
||||
cx.view.doc.apply(&transaction);
|
||||
append_changes_to_history(cx);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -565,9 +603,9 @@ fn get_lines(view: &View) -> Vec<usize> {
|
|||
let mut lines = Vec::new();
|
||||
|
||||
// Get all line numbers
|
||||
for range in view.state.selection.ranges() {
|
||||
let start = view.state.doc.char_to_line(range.from());
|
||||
let end = view.state.doc.char_to_line(range.to());
|
||||
for range in view.doc.selection().ranges() {
|
||||
let start = view.doc.text().char_to_line(range.from());
|
||||
let end = view.doc.text().char_to_line(range.to());
|
||||
|
||||
for line in start..=end {
|
||||
lines.push(line)
|
||||
|
|
@ -578,29 +616,29 @@ fn get_lines(view: &View) -> Vec<usize> {
|
|||
lines
|
||||
}
|
||||
|
||||
pub fn indent(view: &mut View, _count: usize) {
|
||||
let lines = get_lines(view);
|
||||
pub fn indent(cx: &mut Context) {
|
||||
let lines = get_lines(cx.view);
|
||||
|
||||
// Indent by one level
|
||||
let indent = Tendril::from(" ".repeat(TAB_WIDTH));
|
||||
|
||||
let transaction = Transaction::change(
|
||||
&view.state,
|
||||
&cx.view.doc.state,
|
||||
lines.into_iter().map(|line| {
|
||||
let pos = view.state.doc.line_to_char(line);
|
||||
let pos = cx.view.doc.text().line_to_char(line);
|
||||
(pos, pos, Some(indent.clone()))
|
||||
}),
|
||||
);
|
||||
transaction.apply(&mut view.state);
|
||||
append_changes_to_history(view);
|
||||
cx.view.doc.apply(&transaction);
|
||||
append_changes_to_history(cx);
|
||||
}
|
||||
|
||||
pub fn unindent(view: &mut View, _count: usize) {
|
||||
let lines = get_lines(view);
|
||||
pub fn unindent(cx: &mut Context) {
|
||||
let lines = get_lines(cx.view);
|
||||
let mut changes = Vec::with_capacity(lines.len());
|
||||
|
||||
for line_idx in lines {
|
||||
let line = view.state.doc.line(line_idx);
|
||||
let line = cx.view.doc.text().line(line_idx);
|
||||
let mut width = 0;
|
||||
|
||||
for ch in line.chars() {
|
||||
|
|
@ -616,18 +654,27 @@ pub fn unindent(view: &mut View, _count: usize) {
|
|||
}
|
||||
|
||||
if width > 0 {
|
||||
let start = view.state.doc.line_to_char(line_idx);
|
||||
let start = cx.view.doc.text().line_to_char(line_idx);
|
||||
changes.push((start, start + width, None))
|
||||
}
|
||||
}
|
||||
|
||||
let transaction = Transaction::change(&view.state, changes.into_iter());
|
||||
let transaction = Transaction::change(&cx.view.doc.state, changes.into_iter());
|
||||
|
||||
transaction.apply(&mut view.state);
|
||||
append_changes_to_history(view);
|
||||
cx.view.doc.apply(&transaction);
|
||||
append_changes_to_history(cx);
|
||||
}
|
||||
|
||||
pub fn indent_selection(_view: &mut View, _count: usize) {
|
||||
pub fn indent_selection(_cx: &mut Context) {
|
||||
// loop over each line and recompute proper indentation
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
pub fn save(cx: &mut Context) {
|
||||
// Spawns an async task to actually do the saving. This way we prevent blocking.
|
||||
|
||||
// TODO: handle save errors somehow?
|
||||
cx.executor.spawn(cx.view.doc.save()).detach();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,209 @@
|
|||
use anyhow::Error;
|
||||
use std::future::Future;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use helix_core::{
|
||||
syntax::LOADER, ChangeSet, Diagnostic, History, Position, Range, Rope, RopeSlice, Selection,
|
||||
State, Syntax, Transaction,
|
||||
};
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
|
||||
pub enum Mode {
|
||||
Normal,
|
||||
Insert,
|
||||
Goto,
|
||||
}
|
||||
|
||||
pub struct Document {
|
||||
pub state: State, // rope + selection
|
||||
/// File path on disk.
|
||||
pub path: Option<PathBuf>,
|
||||
|
||||
/// Current editing mode.
|
||||
pub mode: Mode,
|
||||
pub restore_cursor: bool,
|
||||
|
||||
/// Tree-sitter AST tree
|
||||
pub syntax: Option<Syntax>,
|
||||
/// Corresponding language scope name. Usually `source.<lang>`.
|
||||
pub language: Option<String>,
|
||||
|
||||
/// Pending changes since last history commit.
|
||||
pub changes: ChangeSet,
|
||||
pub old_state: State,
|
||||
pub history: History,
|
||||
pub version: i32, // should be usize?
|
||||
|
||||
pub diagnostics: Vec<Diagnostic>,
|
||||
}
|
||||
|
||||
/// Like std::mem::replace() except it allows the replacement value to be mapped from the
|
||||
/// original value.
|
||||
fn take_with<T, F>(mut_ref: &mut T, closure: F)
|
||||
where
|
||||
F: FnOnce(T) -> T,
|
||||
{
|
||||
use std::{panic, ptr};
|
||||
|
||||
unsafe {
|
||||
let old_t = ptr::read(mut_ref);
|
||||
let new_t = panic::catch_unwind(panic::AssertUnwindSafe(|| closure(old_t)))
|
||||
.unwrap_or_else(|_| ::std::process::abort());
|
||||
ptr::write(mut_ref, new_t);
|
||||
}
|
||||
}
|
||||
|
||||
use url::Url;
|
||||
|
||||
impl Document {
|
||||
fn new(state: State) -> Self {
|
||||
let changes = ChangeSet::new(&state.doc);
|
||||
let old_state = state.clone();
|
||||
|
||||
Self {
|
||||
path: None,
|
||||
state,
|
||||
mode: Mode::Normal,
|
||||
restore_cursor: false,
|
||||
syntax: None,
|
||||
language: None,
|
||||
changes,
|
||||
old_state,
|
||||
diagnostics: Vec::new(),
|
||||
version: 0,
|
||||
history: History::default(),
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: passing scopes here is awkward
|
||||
// TODO: async fn?
|
||||
pub fn load(path: PathBuf, scopes: &[String]) -> Result<Self, Error> {
|
||||
use std::{env, fs::File, io::BufReader};
|
||||
let _current_dir = env::current_dir()?;
|
||||
|
||||
let doc = Rope::from_reader(BufReader::new(File::open(path.clone())?))?;
|
||||
|
||||
// TODO: create if not found
|
||||
|
||||
let mut doc = Self::new(State::new(doc));
|
||||
|
||||
if let Some(language_config) = LOADER.language_config_for_file_name(path.as_path()) {
|
||||
let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap();
|
||||
// TODO: config.configure(scopes) is now delayed, is that ok?
|
||||
|
||||
let syntax = Syntax::new(&doc.state.doc, highlight_config.clone());
|
||||
|
||||
doc.syntax = Some(syntax);
|
||||
// TODO: maybe just keep an Arc<> pointer to the language_config?
|
||||
doc.language = Some(language_config.scope().to_string());
|
||||
|
||||
// TODO: this ties lsp support to tree-sitter enabled languages for now. Language
|
||||
// config should use Option<HighlightConfig> to let us have non-tree-sitter configs.
|
||||
|
||||
// TODO: circular dep: view <-> lsp
|
||||
// helix_lsp::REGISTRY;
|
||||
// view should probably depend on lsp
|
||||
};
|
||||
|
||||
// canonicalize path to absolute value
|
||||
doc.path = Some(std::fs::canonicalize(path)?);
|
||||
|
||||
Ok(doc)
|
||||
}
|
||||
|
||||
// TODO: do we need some way of ensuring two save operations on the same doc can't run at once?
|
||||
// or is that handled by the OS/async layer
|
||||
pub fn save(&self) -> impl Future<Output = Result<(), anyhow::Error>> {
|
||||
// we clone and move text + path into the future so that we asynchronously save the current
|
||||
// state without blocking any further edits.
|
||||
|
||||
let text = self.text().clone();
|
||||
let path = self.path.clone().expect("Can't save with no path set!"); // TODO: handle no path
|
||||
|
||||
// TODO: mark changes up to now as saved
|
||||
// TODO: mark dirty false
|
||||
|
||||
async move {
|
||||
use smol::{fs::File, prelude::*};
|
||||
let mut file = File::create(path).await?;
|
||||
|
||||
// write all the rope chunks to file
|
||||
for chunk in text.chunks() {
|
||||
file.write_all(chunk.as_bytes()).await?;
|
||||
}
|
||||
// TODO: flush?
|
||||
|
||||
Ok(())
|
||||
} // and_then(// lsp.send_text_saved_notification())
|
||||
}
|
||||
|
||||
pub fn set_language(&mut self, scope: &str, scopes: &[String]) {
|
||||
if let Some(language_config) = LOADER.language_config_for_scope(scope) {
|
||||
let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap();
|
||||
// TODO: config.configure(scopes) is now delayed, is that ok?
|
||||
|
||||
let syntax = Syntax::new(&self.state.doc, highlight_config.clone());
|
||||
|
||||
self.syntax = Some(syntax);
|
||||
};
|
||||
}
|
||||
|
||||
pub fn set_selection(&mut self, selection: Selection) {
|
||||
// TODO: use a transaction?
|
||||
self.state.selection = selection;
|
||||
}
|
||||
|
||||
pub fn apply(&mut self, transaction: &Transaction) -> bool {
|
||||
let old_doc = self.text().clone();
|
||||
|
||||
let success = transaction.apply(&mut self.state);
|
||||
|
||||
if !transaction.changes().is_empty() {
|
||||
// Compose this transaction with the previous one
|
||||
take_with(&mut self.changes, |changes| {
|
||||
changes.compose(transaction.changes().clone()).unwrap()
|
||||
});
|
||||
|
||||
// TODO: when composing, replace transaction.selection too
|
||||
|
||||
// update tree-sitter syntax tree
|
||||
if let Some(syntax) = &mut self.syntax {
|
||||
// TODO: no unwrap
|
||||
syntax
|
||||
.update(&old_doc, &self.state.doc, transaction.changes())
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
// TODO: map state.diagnostics over changes::map_pos too
|
||||
}
|
||||
success
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn mode(&self) -> Mode {
|
||||
self.mode
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn path(&self) -> Option<&PathBuf> {
|
||||
self.path.as_ref()
|
||||
}
|
||||
|
||||
pub fn url(&self) -> Option<Url> {
|
||||
self.path().map(|path| Url::from_file_path(path).unwrap())
|
||||
}
|
||||
|
||||
pub fn text(&self) -> &Rope {
|
||||
&self.state.doc
|
||||
}
|
||||
|
||||
pub fn selection(&self) -> &Selection {
|
||||
&self.state.selection
|
||||
}
|
||||
|
||||
// pub fn slice<R>(&self, range: R) -> RopeSlice where R: RangeBounds {
|
||||
// self.state.doc.slice
|
||||
// }
|
||||
|
||||
// TODO: transact(Fn) ?
|
||||
}
|
||||
|
|
@ -1,24 +1,48 @@
|
|||
use crate::View;
|
||||
use crate::theme::Theme;
|
||||
use crate::{Document, View};
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
use anyhow::Error;
|
||||
|
||||
pub struct Editor {
|
||||
pub view: Option<View>,
|
||||
pub views: Vec<View>,
|
||||
pub focus: usize,
|
||||
pub should_close: bool,
|
||||
pub theme: Theme, // TODO: share one instance
|
||||
}
|
||||
|
||||
impl Default for Editor {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl Editor {
|
||||
pub fn new() -> Self {
|
||||
let theme = Theme::default();
|
||||
|
||||
Self {
|
||||
view: None,
|
||||
views: Vec::new(),
|
||||
focus: 0,
|
||||
should_close: false,
|
||||
theme,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn open(&mut self, path: PathBuf, size: (u16, u16)) -> Result<(), Error> {
|
||||
self.view = Some(View::open(path, size)?);
|
||||
let pos = self.views.len();
|
||||
let doc = Document::load(path, self.theme.scopes())?;
|
||||
self.views.push(View::new(doc, size)?);
|
||||
self.focus = pos;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn view(&self) -> Option<&View> {
|
||||
self.views.get(self.focus)
|
||||
}
|
||||
|
||||
pub fn view_mut(&mut self) -> Option<&mut View> {
|
||||
self.views.get_mut(self.focus)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use crate::commands::{self, Command};
|
||||
use helix_core::{hashmap, state};
|
||||
use crate::document::Mode;
|
||||
use helix_core::hashmap;
|
||||
use std::collections::HashMap;
|
||||
|
||||
// Kakoune-inspired:
|
||||
|
|
@ -81,14 +82,17 @@
|
|||
// = = align?
|
||||
// + =
|
||||
// }
|
||||
//
|
||||
// gd = goto definition
|
||||
// gr = goto reference
|
||||
// }
|
||||
|
||||
#[cfg(feature = "term")]
|
||||
pub use crossterm::event::{KeyCode, KeyEvent as Key, KeyModifiers as Modifiers};
|
||||
|
||||
// TODO: could be trie based
|
||||
type Keymap = HashMap<Vec<Key>, Command>;
|
||||
type Keymaps = HashMap<state::Mode, Keymap>;
|
||||
pub type Keymap = HashMap<Vec<Key>, Command>;
|
||||
pub type Keymaps = HashMap<Mode, Keymap>;
|
||||
|
||||
macro_rules! key {
|
||||
($ch:expr) => {
|
||||
|
|
@ -128,7 +132,7 @@ macro_rules! ctrl {
|
|||
|
||||
pub fn default() -> Keymaps {
|
||||
hashmap!(
|
||||
state::Mode::Normal =>
|
||||
Mode::Normal =>
|
||||
// as long as you cast the first item, rust is able to infer the other cases
|
||||
hashmap!(
|
||||
vec![key!('h')] => commands::move_char_left as Command,
|
||||
|
|
@ -179,7 +183,7 @@ pub fn default() -> Keymaps {
|
|||
vec![ctrl!('u')] => commands::half_page_up,
|
||||
vec![ctrl!('d')] => commands::half_page_down,
|
||||
),
|
||||
state::Mode::Insert => hashmap!(
|
||||
Mode::Insert => hashmap!(
|
||||
vec![Key {
|
||||
code: KeyCode::Esc,
|
||||
modifiers: Modifiers::NONE
|
||||
|
|
@ -201,7 +205,7 @@ pub fn default() -> Keymaps {
|
|||
modifiers: Modifiers::NONE
|
||||
}] => commands::insert::insert_tab,
|
||||
),
|
||||
state::Mode::Goto => hashmap!(
|
||||
Mode::Goto => hashmap!(
|
||||
vec![Key {
|
||||
code: KeyCode::Esc,
|
||||
modifiers: Modifiers::NONE
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
pub mod commands;
|
||||
pub mod document;
|
||||
pub mod editor;
|
||||
pub mod keymap;
|
||||
pub mod prompt;
|
||||
pub mod theme;
|
||||
pub mod view;
|
||||
|
||||
pub use document::Document;
|
||||
pub use editor::Editor;
|
||||
pub use theme::Theme;
|
||||
pub use view::View;
|
||||
|
|
|
|||
|
|
@ -157,6 +157,8 @@ fn default() -> Self {
|
|||
"ui.background" => Style::default().bg(Color::Rgb(59, 34, 76)), // midnight
|
||||
"ui.linenr" => Style::default().fg(Color::Rgb(90, 89, 119)), // comet
|
||||
"ui.statusline" => Style::default().bg(Color::Rgb(40, 23, 51)), // revolver
|
||||
|
||||
"warning" => Style::default().fg(Color::Rgb(255, 205, 28)),
|
||||
};
|
||||
|
||||
let scopes = mapping.keys().map(ToString::to_string).collect();
|
||||
|
|
|
|||
|
|
@ -1,44 +1,39 @@
|
|||
use anyhow::Error;
|
||||
|
||||
use std::{borrow::Cow, path::PathBuf};
|
||||
use std::borrow::Cow;
|
||||
|
||||
use crate::theme::Theme;
|
||||
use crate::Document;
|
||||
use helix_core::{
|
||||
graphemes::{grapheme_width, RopeGraphemes},
|
||||
indent::TAB_WIDTH,
|
||||
History, Position, RopeSlice, State,
|
||||
Position, RopeSlice,
|
||||
};
|
||||
use tui::layout::Rect;
|
||||
|
||||
pub const PADDING: usize = 5;
|
||||
|
||||
// TODO: view should be View { doc: Document(state, history,..) }
|
||||
// since we can have multiple views into the same file
|
||||
pub struct View {
|
||||
pub state: State,
|
||||
pub history: History,
|
||||
pub doc: Document,
|
||||
pub first_line: usize,
|
||||
pub size: (u16, u16),
|
||||
pub theme: Theme, // TODO: share one instance
|
||||
}
|
||||
|
||||
impl View {
|
||||
pub fn open(path: PathBuf, size: (u16, u16)) -> Result<Self, Error> {
|
||||
let theme = Theme::default();
|
||||
let state = State::load(path, theme.scopes())?;
|
||||
|
||||
pub fn new(doc: Document, size: (u16, u16)) -> Result<Self, Error> {
|
||||
let view = Self {
|
||||
state,
|
||||
doc,
|
||||
first_line: 0,
|
||||
size,
|
||||
theme,
|
||||
history: History::default(),
|
||||
};
|
||||
|
||||
Ok(view)
|
||||
}
|
||||
|
||||
pub fn ensure_cursor_in_view(&mut self) {
|
||||
let cursor = self.state.selection().cursor();
|
||||
let line = self.state.doc().char_to_line(cursor);
|
||||
let cursor = self.doc.state.selection().cursor();
|
||||
let line = self.doc.text().char_to_line(cursor);
|
||||
let document_end = self.first_line + (self.size.1 as usize).saturating_sub(2);
|
||||
|
||||
// TODO: side scroll
|
||||
|
|
@ -58,7 +53,7 @@ pub fn last_line(&self) -> usize {
|
|||
let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 2); // - 2 for statusline and prompt
|
||||
std::cmp::min(
|
||||
self.first_line + (viewport.height as usize),
|
||||
self.state.doc().len_lines() - 1,
|
||||
self.doc.text().len_lines() - 1,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -90,4 +85,25 @@ pub fn screen_coords_at_pos(&self, text: &RopeSlice, pos: usize) -> Option<Posit
|
|||
|
||||
Some(Position::new(row, col))
|
||||
}
|
||||
|
||||
// pub fn traverse<F>(&self, text: &RopeSlice, start: usize, end: usize, fun: F)
|
||||
// where
|
||||
// F: Fn(usize, usize),
|
||||
// {
|
||||
// let start = self.screen_coords_at_pos(text, start);
|
||||
// let end = self.screen_coords_at_pos(text, end);
|
||||
|
||||
// match (start, end) {
|
||||
// // fully on screen
|
||||
// (Some(start), Some(end)) => {
|
||||
// // we want to calculate ends of lines for each char..
|
||||
// }
|
||||
// // from start to end of screen
|
||||
// (Some(start), None) => {}
|
||||
// // from start of screen to end
|
||||
// (None, Some(end)) => {}
|
||||
// // not on screen
|
||||
// (None, None) => return,
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue