diff options
-rw-r--r-- | Cargo.lock | 4 | ||||
-rw-r--r-- | crates/ra_cargo_watch/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/req.rs | 18 | ||||
-rw-r--r-- | crates/rust-analyzer/src/semantic_tokens.rs | 3 |
5 files changed, 13 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock index 49fddef4b..6aa7e1ce1 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -662,9 +662,9 @@ dependencies = [ | |||
662 | 662 | ||
663 | [[package]] | 663 | [[package]] |
664 | name = "lsp-types" | 664 | name = "lsp-types" |
665 | version = "0.71.0" | 665 | version = "0.72.0" |
666 | source = "registry+https://github.com/rust-lang/crates.io-index" | 666 | source = "registry+https://github.com/rust-lang/crates.io-index" |
667 | checksum = "efa6b75633b0c3412ee36fc416e6d9c1e4ff576b536217f4ac3f34ac83d9e564" | 667 | checksum = "face91691e558746745dc9dc6c67a4e2a24e044926e274d8378e6f19659329f0" |
668 | dependencies = [ | 668 | dependencies = [ |
669 | "base64", | 669 | "base64", |
670 | "bitflags", | 670 | "bitflags", |
diff --git a/crates/ra_cargo_watch/Cargo.toml b/crates/ra_cargo_watch/Cargo.toml index 1fdbffea1..731d50371 100644 --- a/crates/ra_cargo_watch/Cargo.toml +++ b/crates/ra_cargo_watch/Cargo.toml | |||
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"] | |||
6 | 6 | ||
7 | [dependencies] | 7 | [dependencies] |
8 | crossbeam-channel = "0.4.0" | 8 | crossbeam-channel = "0.4.0" |
9 | lsp-types = { version = "0.71.0", features = ["proposed"] } | 9 | lsp-types = { version = "0.72.0", features = ["proposed"] } |
10 | log = "0.4.8" | 10 | log = "0.4.8" |
11 | cargo_metadata = "0.9.1" | 11 | cargo_metadata = "0.9.1" |
12 | serde_json = "1.0.48" | 12 | serde_json = "1.0.48" |
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index d00545121..b14ebb268 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml | |||
@@ -20,7 +20,7 @@ globset = "0.4.4" | |||
20 | itertools = "0.8.2" | 20 | itertools = "0.8.2" |
21 | jod-thread = "0.1.0" | 21 | jod-thread = "0.1.0" |
22 | log = "0.4.8" | 22 | log = "0.4.8" |
23 | lsp-types = { version = "0.71.0", features = ["proposed"] } | 23 | lsp-types = { version = "0.72.0", features = ["proposed"] } |
24 | parking_lot = "0.10.0" | 24 | parking_lot = "0.10.0" |
25 | pico-args = "0.3.1" | 25 | pico-args = "0.3.1" |
26 | rand = { version = "0.7.3", features = ["small_rng"] } | 26 | rand = { version = "0.7.3", features = ["small_rng"] } |
diff --git a/crates/rust-analyzer/src/req.rs b/crates/rust-analyzer/src/req.rs index fd6aef597..a3efe3b9f 100644 --- a/crates/rust-analyzer/src/req.rs +++ b/crates/rust-analyzer/src/req.rs | |||
@@ -42,14 +42,14 @@ impl Request for SyntaxTree { | |||
42 | const METHOD: &'static str = "rust-analyzer/syntaxTree"; | 42 | const METHOD: &'static str = "rust-analyzer/syntaxTree"; |
43 | } | 43 | } |
44 | 44 | ||
45 | #[derive(Deserialize, Debug)] | 45 | #[derive(Deserialize, Serialize, Debug)] |
46 | #[serde(rename_all = "camelCase")] | 46 | #[serde(rename_all = "camelCase")] |
47 | pub struct SyntaxTreeParams { | 47 | pub struct SyntaxTreeParams { |
48 | pub text_document: TextDocumentIdentifier, | 48 | pub text_document: TextDocumentIdentifier, |
49 | pub range: Option<Range>, | 49 | pub range: Option<Range>, |
50 | } | 50 | } |
51 | 51 | ||
52 | #[derive(Serialize, Debug)] | 52 | #[derive(Deserialize, Serialize, Debug)] |
53 | #[serde(rename_all = "camelCase")] | 53 | #[serde(rename_all = "camelCase")] |
54 | pub struct ExpandedMacro { | 54 | pub struct ExpandedMacro { |
55 | pub name: String, | 55 | pub name: String, |
@@ -64,7 +64,7 @@ impl Request for ExpandMacro { | |||
64 | const METHOD: &'static str = "rust-analyzer/expandMacro"; | 64 | const METHOD: &'static str = "rust-analyzer/expandMacro"; |
65 | } | 65 | } |
66 | 66 | ||
67 | #[derive(Deserialize, Debug)] | 67 | #[derive(Deserialize, Serialize, Debug)] |
68 | #[serde(rename_all = "camelCase")] | 68 | #[serde(rename_all = "camelCase")] |
69 | pub struct ExpandMacroParams { | 69 | pub struct ExpandMacroParams { |
70 | pub text_document: TextDocumentIdentifier, | 70 | pub text_document: TextDocumentIdentifier, |
@@ -79,7 +79,7 @@ impl Request for FindMatchingBrace { | |||
79 | const METHOD: &'static str = "rust-analyzer/findMatchingBrace"; | 79 | const METHOD: &'static str = "rust-analyzer/findMatchingBrace"; |
80 | } | 80 | } |
81 | 81 | ||
82 | #[derive(Deserialize, Debug)] | 82 | #[derive(Deserialize, Serialize, Debug)] |
83 | #[serde(rename_all = "camelCase")] | 83 | #[serde(rename_all = "camelCase")] |
84 | pub struct FindMatchingBraceParams { | 84 | pub struct FindMatchingBraceParams { |
85 | pub text_document: TextDocumentIdentifier, | 85 | pub text_document: TextDocumentIdentifier, |
@@ -101,14 +101,14 @@ impl Notification for PublishDecorations { | |||
101 | const METHOD: &'static str = "rust-analyzer/publishDecorations"; | 101 | const METHOD: &'static str = "rust-analyzer/publishDecorations"; |
102 | } | 102 | } |
103 | 103 | ||
104 | #[derive(Serialize, Debug)] | 104 | #[derive(Deserialize, Serialize, Debug)] |
105 | #[serde(rename_all = "camelCase")] | 105 | #[serde(rename_all = "camelCase")] |
106 | pub struct PublishDecorationsParams { | 106 | pub struct PublishDecorationsParams { |
107 | pub uri: Url, | 107 | pub uri: Url, |
108 | pub decorations: Vec<Decoration>, | 108 | pub decorations: Vec<Decoration>, |
109 | } | 109 | } |
110 | 110 | ||
111 | #[derive(Serialize, Debug)] | 111 | #[derive(Deserialize, Serialize, Debug)] |
112 | #[serde(rename_all = "camelCase")] | 112 | #[serde(rename_all = "camelCase")] |
113 | pub struct Decoration { | 113 | pub struct Decoration { |
114 | pub range: Range, | 114 | pub range: Range, |
@@ -132,7 +132,7 @@ impl Request for JoinLines { | |||
132 | const METHOD: &'static str = "rust-analyzer/joinLines"; | 132 | const METHOD: &'static str = "rust-analyzer/joinLines"; |
133 | } | 133 | } |
134 | 134 | ||
135 | #[derive(Deserialize, Debug)] | 135 | #[derive(Deserialize, Serialize, Debug)] |
136 | #[serde(rename_all = "camelCase")] | 136 | #[serde(rename_all = "camelCase")] |
137 | pub struct JoinLinesParams { | 137 | pub struct JoinLinesParams { |
138 | pub text_document: TextDocumentIdentifier, | 138 | pub text_document: TextDocumentIdentifier, |
@@ -162,7 +162,7 @@ pub struct RunnablesParams { | |||
162 | pub position: Option<Position>, | 162 | pub position: Option<Position>, |
163 | } | 163 | } |
164 | 164 | ||
165 | #[derive(Serialize, Debug)] | 165 | #[derive(Deserialize, Serialize, Debug)] |
166 | #[serde(rename_all = "camelCase")] | 166 | #[serde(rename_all = "camelCase")] |
167 | pub struct Runnable { | 167 | pub struct Runnable { |
168 | pub range: Range, | 168 | pub range: Range, |
@@ -173,7 +173,7 @@ pub struct Runnable { | |||
173 | pub cwd: Option<String>, | 173 | pub cwd: Option<String>, |
174 | } | 174 | } |
175 | 175 | ||
176 | #[derive(Serialize, Debug)] | 176 | #[derive(Deserialize, Serialize, Debug)] |
177 | #[serde(rename_all = "camelCase")] | 177 | #[serde(rename_all = "camelCase")] |
178 | pub struct SourceChange { | 178 | pub struct SourceChange { |
179 | pub label: String, | 179 | pub label: String, |
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs index 1b146e4d8..d9ba77050 100644 --- a/crates/rust-analyzer/src/semantic_tokens.rs +++ b/crates/rust-analyzer/src/semantic_tokens.rs | |||
@@ -49,12 +49,9 @@ pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[ | |||
49 | SemanticTokenModifier::DOCUMENTATION, | 49 | SemanticTokenModifier::DOCUMENTATION, |
50 | SemanticTokenModifier::DECLARATION, | 50 | SemanticTokenModifier::DECLARATION, |
51 | SemanticTokenModifier::DEFINITION, | 51 | SemanticTokenModifier::DEFINITION, |
52 | SemanticTokenModifier::REFERENCE, | ||
53 | SemanticTokenModifier::STATIC, | 52 | SemanticTokenModifier::STATIC, |
54 | SemanticTokenModifier::ABSTRACT, | 53 | SemanticTokenModifier::ABSTRACT, |
55 | SemanticTokenModifier::DEPRECATED, | 54 | SemanticTokenModifier::DEPRECATED, |
56 | SemanticTokenModifier::ASYNC, | ||
57 | SemanticTokenModifier::VOLATILE, | ||
58 | SemanticTokenModifier::READONLY, | 55 | SemanticTokenModifier::READONLY, |
59 | CONSTANT, | 56 | CONSTANT, |
60 | MUTABLE, | 57 | MUTABLE, |