aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-03-02 17:05:38 +0000
committerGitHub <[email protected]>2020-03-02 17:05:38 +0000
commit71b53b2cae74d6f84c79d21b24754792a8435149 (patch)
tree020411fd1fa0395963ca04c9a97bbaf91ae6245c /crates
parent96eca8a1abd79840b9040250db9d1e65ec663b0e (diff)
parentc6f4e8de5eb194723612ca5db83321f35f8d281e (diff)
Merge #3404
3404: lsp-types 0.72 r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_cargo_watch/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/req.rs18
-rw-r--r--crates/rust-analyzer/src/semantic_tokens.rs3
4 files changed, 11 insertions, 14 deletions
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]
8crossbeam-channel = "0.4.0" 8crossbeam-channel = "0.4.0"
9lsp-types = { version = "0.71.0", features = ["proposed"] } 9lsp-types = { version = "0.72.0", features = ["proposed"] }
10log = "0.4.8" 10log = "0.4.8"
11cargo_metadata = "0.9.1" 11cargo_metadata = "0.9.1"
12serde_json = "1.0.48" 12serde_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"
20itertools = "0.8.2" 20itertools = "0.8.2"
21jod-thread = "0.1.0" 21jod-thread = "0.1.0"
22log = "0.4.8" 22log = "0.4.8"
23lsp-types = { version = "0.71.0", features = ["proposed"] } 23lsp-types = { version = "0.72.0", features = ["proposed"] }
24parking_lot = "0.10.0" 24parking_lot = "0.10.0"
25pico-args = "0.3.1" 25pico-args = "0.3.1"
26rand = { version = "0.7.3", features = ["small_rng"] } 26rand = { 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")]
47pub struct SyntaxTreeParams { 47pub 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")]
54pub struct ExpandedMacro { 54pub 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")]
69pub struct ExpandMacroParams { 69pub 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")]
84pub struct FindMatchingBraceParams { 84pub 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")]
106pub struct PublishDecorationsParams { 106pub 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")]
113pub struct Decoration { 113pub 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")]
137pub struct JoinLinesParams { 137pub 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")]
167pub struct Runnable { 167pub 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")]
178pub struct SourceChange { 178pub 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,