diff options
-rw-r--r-- | Cargo.lock | 101 | ||||
-rw-r--r-- | cli/Cargo.toml | 2 | ||||
-rw-r--r-- | cli/lsp/capabilities.rs | 1 |
3 files changed, 24 insertions, 80 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4daffcf80..30e6b8b55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,12 +196,6 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[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" @@ -228,18 +222,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] -name = "bitvec" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1044,12 +1026,6 @@ dependencies = [ ] [[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] name = "futures" version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1702,19 +1678,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 0.1.10", - "ryu", - "static_assertions", -] - -[[package]] name = "libc" version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1766,11 +1729,10 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.86.0" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a5c40d566f2704dac30859bca152217583fc94fd5b178d8baba915e1abd382" +checksum = "d8e8e042772e4e10b3785822f63c82399d0dd233825de44d2596f7fa86e023e0" dependencies = [ - "base64 0.12.3", "bitflags", "serde", "serde_json", @@ -1780,9 +1742,9 @@ dependencies = [ [[package]] name = "lspower" -version = "0.6.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947e7faf8ee4db7459cc57414a2223aa0efbc90b07161c899ffa637c10f3448" +checksum = "afaeb01db018cafb557d24bb0bf630fd0c4af1693371a91b5307e17ce3486516" dependencies = [ "anyhow", "async-trait", @@ -1790,16 +1752,17 @@ dependencies = [ "bytes", "dashmap", "futures", + "httparse", "log", "lsp-types", "lspower-macros", - "nom", "serde", "serde_json", "thiserror", "tokio", "tokio-util", "tower-service", + "twoway", ] [[package]] @@ -1939,18 +1902,6 @@ dependencies = [ ] [[package]] -name = "nom" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1" -dependencies = [ - "bitvec", - "lexical-core", - "memchr", - "version_check", -] - -[[package]] name = "notify" version = "5.0.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2338,12 +2289,6 @@ dependencies = [ ] [[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - -[[package]] name = "radix_fmt" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2886,12 +2831,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "storage-map" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3327,12 +3266,6 @@ dependencies = [ ] [[package]] -name = "tap" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" - -[[package]] name = "tempfile" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3744,6 +3677,16 @@ dependencies = [ ] [[package]] +name = "twoway" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b40075910de3a912adbd80b5d8bad6ad10a23eeb1f5bf9d4006839e899ba5bc" +dependencies = [ + "memchr", + "unchecked-index", +] + +[[package]] name = "typenum" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3756,6 +3699,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] +name = "unchecked-index" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" + +[[package]] name = "unicase" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4122,9 +4071,3 @@ checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" dependencies = [ "winapi 0.3.9", ] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 824891cce..751979263 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -56,7 +56,7 @@ jsonc-parser = "0.15.1" lazy_static = "1.4.0" libc = "0.2.86" log = { version = "0.4.14", features = ["serde"] } -lspower = "=0.6.1" +lspower = "0.8.4" notify = "5.0.0-pre.4" percent-encoding = "2.1.0" pin-project = "1.0.5" diff --git a/cli/lsp/capabilities.rs b/cli/lsp/capabilities.rs index fb16db88b..be318e7f3 100644 --- a/cli/lsp/capabilities.rs +++ b/cli/lsp/capabilities.rs @@ -55,6 +55,7 @@ pub fn server_capabilities( )), hover_provider: Some(HoverProviderCapability::Simple(true)), completion_provider: Some(CompletionOptions { + all_commit_characters: None, trigger_characters: Some(vec![ ".".to_string(), "\"".to_string(), |