diff options
-rw-r--r-- | crates/ra_assists/src/handlers/reorder_fields.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 6 | ||||
-rw-r--r-- | crates/rust-analyzer/src/main_loop/handlers.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs index 30229edc2..897da2832 100644 --- a/crates/ra_assists/src/handlers/reorder_fields.rs +++ b/crates/ra_assists/src/handlers/reorder_fields.rs | |||
@@ -23,7 +23,7 @@ use crate::{AssistContext, AssistId, Assists}; | |||
23 | // ``` | 23 | // ``` |
24 | // | 24 | // |
25 | pub(crate) fn reorder_fields(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { | 25 | pub(crate) fn reorder_fields(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { |
26 | reorder::<ast::RecordLit>(acc, ctx.clone()).or_else(|| reorder::<ast::RecordPat>(acc, ctx)) | 26 | reorder::<ast::RecordLit>(acc, ctx).or_else(|| reorder::<ast::RecordPat>(acc, ctx)) |
27 | } | 27 | } |
28 | 28 | ||
29 | fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { | 29 | fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { |
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 0e4412ade..c0f7c2c0c 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -269,10 +269,8 @@ impl Config { | |||
269 | { | 269 | { |
270 | self.client_caps.hierarchical_symbols = value | 270 | self.client_caps.hierarchical_symbols = value |
271 | } | 271 | } |
272 | if let Some(value) = doc_caps | 272 | if let Some(value) = |
273 | .code_action | 273 | doc_caps.code_action.as_ref().map(|it| it.code_action_literal_support.is_some()) |
274 | .as_ref() | ||
275 | .and_then(|it| Some(it.code_action_literal_support.is_some())) | ||
276 | { | 274 | { |
277 | self.client_caps.code_action_literals = value; | 275 | self.client_caps.code_action_literals = value; |
278 | } | 276 | } |
diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs index a9703e1d6..ba6857556 100644 --- a/crates/rust-analyzer/src/main_loop/handlers.rs +++ b/crates/rust-analyzer/src/main_loop/handlers.rs | |||
@@ -281,7 +281,7 @@ pub fn handle_document_symbol( | |||
281 | kind: symbol.kind, | 281 | kind: symbol.kind, |
282 | deprecated: symbol.deprecated, | 282 | deprecated: symbol.deprecated, |
283 | location: Location::new(url.clone(), symbol.range), | 283 | location: Location::new(url.clone(), symbol.range), |
284 | container_name: container_name, | 284 | container_name, |
285 | }); | 285 | }); |
286 | 286 | ||
287 | for child in symbol.children.iter().flatten() { | 287 | for child in symbol.children.iter().flatten() { |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 461944ada..7dd7d9416 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -455,7 +455,7 @@ pub(crate) fn snippet_text_document_edit( | |||
455 | let edits = source_file_edit | 455 | let edits = source_file_edit |
456 | .edit | 456 | .edit |
457 | .into_iter() | 457 | .into_iter() |
458 | .map(|it| snippet_text_edit(&line_index, line_endings, is_snippet, it.clone())) | 458 | .map(|it| snippet_text_edit(&line_index, line_endings, is_snippet, it)) |
459 | .collect(); | 459 | .collect(); |
460 | Ok(lsp_ext::SnippetTextDocumentEdit { text_document, edits }) | 460 | Ok(lsp_ext::SnippetTextDocumentEdit { text_document, edits }) |
461 | } | 461 | } |