aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-12-01 13:36:02 +0000
committerGitHub <[email protected]>2020-12-01 13:36:02 +0000
commitbb697727a2e43d734a1bf3aae7644a9249aee11e (patch)
tree6e46f0bad9a4f36a6301049dfcc5c1ca400e94ff /crates
parenta18392bd903dd764c6c5f5efee0b3d789ee12e52 (diff)
parente4ffd70c915046e8286a25d66a530fae7e351912 (diff)
Merge #6690
6690: lsp-types 0.85: Fixes OptionalVersionedTextDocumentIdentifier specification r=kjeremy a=kjeremy Fixes #6654 Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/semantic_tokens.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 08559b53a..0a055b039 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -21,7 +21,7 @@ env_logger = { version = "0.8.1", default-features = false }
21itertools = "0.9.0" 21itertools = "0.9.0"
22jod-thread = "0.1.0" 22jod-thread = "0.1.0"
23log = "0.4.8" 23log = "0.4.8"
24lsp-types = { version = "0.84.0", features = ["proposed"] } 24lsp-types = { version = "0.85.0", features = ["proposed"] }
25parking_lot = "0.11.0" 25parking_lot = "0.11.0"
26pico-args = "0.3.1" 26pico-args = "0.3.1"
27oorandom = "11.1.2" 27oorandom = "11.1.2"
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
index e7991fd28..1daad1c98 100644
--- a/crates/rust-analyzer/src/semantic_tokens.rs
+++ b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -27,7 +27,7 @@ macro_rules! define_semantic_token_types {
27 SemanticTokenType::ENUM_MEMBER, 27 SemanticTokenType::ENUM_MEMBER,
28 SemanticTokenType::TYPE_PARAMETER, 28 SemanticTokenType::TYPE_PARAMETER,
29 SemanticTokenType::FUNCTION, 29 SemanticTokenType::FUNCTION,
30 SemanticTokenType::MEMBER, 30 SemanticTokenType::METHOD,
31 SemanticTokenType::PROPERTY, 31 SemanticTokenType::PROPERTY,
32 SemanticTokenType::MACRO, 32 SemanticTokenType::MACRO,
33 SemanticTokenType::VARIABLE, 33 SemanticTokenType::VARIABLE,