diff options
Diffstat (limited to 'crates')
48 files changed, 305 insertions, 295 deletions
diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs index e1c0d26c7..fb8b2fc88 100644 --- a/crates/ra_ide_api/src/completion/complete_dot.rs +++ b/crates/ra_ide_api/src/completion/complete_dot.rs | |||
@@ -31,7 +31,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) | |||
31 | for field in s.fields(ctx.db) { | 31 | for field in s.fields(ctx.db) { |
32 | CompletionItem::new( | 32 | CompletionItem::new( |
33 | CompletionKind::Reference, | 33 | CompletionKind::Reference, |
34 | ctx.leaf_range(), | 34 | ctx.source_range(), |
35 | field.name().to_string(), | 35 | field.name().to_string(), |
36 | ) | 36 | ) |
37 | .kind(CompletionItemKind::Field) | 37 | .kind(CompletionItemKind::Field) |
@@ -45,9 +45,13 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) | |||
45 | } | 45 | } |
46 | Ty::Tuple(fields) => { | 46 | Ty::Tuple(fields) => { |
47 | for (i, _ty) in fields.iter().enumerate() { | 47 | for (i, _ty) in fields.iter().enumerate() { |
48 | CompletionItem::new(CompletionKind::Reference, ctx.leaf_range(), i.to_string()) | 48 | CompletionItem::new( |
49 | .kind(CompletionItemKind::Field) | 49 | CompletionKind::Reference, |
50 | .add_to(acc); | 50 | ctx.source_range(), |
51 | i.to_string(), | ||
52 | ) | ||
53 | .kind(CompletionItemKind::Field) | ||
54 | .add_to(acc); | ||
51 | } | 55 | } |
52 | } | 56 | } |
53 | _ => {} | 57 | _ => {} |
@@ -61,7 +65,7 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty | |||
61 | if sig.has_self_param() { | 65 | if sig.has_self_param() { |
62 | CompletionItem::new( | 66 | CompletionItem::new( |
63 | CompletionKind::Reference, | 67 | CompletionKind::Reference, |
64 | ctx.leaf_range(), | 68 | ctx.source_range(), |
65 | sig.name().to_string(), | 69 | sig.name().to_string(), |
66 | ) | 70 | ) |
67 | .from_function(ctx, func) | 71 | .from_function(ctx, func) |
diff --git a/crates/ra_ide_api/src/completion/complete_fn_param.rs b/crates/ra_ide_api/src/completion/complete_fn_param.rs index c3e3ea931..8d4df4ea1 100644 --- a/crates/ra_ide_api/src/completion/complete_fn_param.rs +++ b/crates/ra_ide_api/src/completion/complete_fn_param.rs | |||
@@ -34,7 +34,7 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext) | |||
34 | } | 34 | } |
35 | }) | 35 | }) |
36 | .for_each(|(label, lookup)| { | 36 | .for_each(|(label, lookup)| { |
37 | CompletionItem::new(CompletionKind::Magic, ctx.leaf_range(), label) | 37 | CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label) |
38 | .lookup_by(lookup) | 38 | .lookup_by(lookup) |
39 | .add_to(acc) | 39 | .add_to(acc) |
40 | }); | 40 | }); |
diff --git a/crates/ra_ide_api/src/completion/complete_keyword.rs b/crates/ra_ide_api/src/completion/complete_keyword.rs index 006b20076..10ae01bc5 100644 --- a/crates/ra_ide_api/src/completion/complete_keyword.rs +++ b/crates/ra_ide_api/src/completion/complete_keyword.rs | |||
@@ -9,26 +9,26 @@ use crate::completion::{CompletionContext, CompletionItem, Completions, Completi | |||
9 | 9 | ||
10 | pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) { | 10 | pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) { |
11 | // complete keyword "crate" in use stmt | 11 | // complete keyword "crate" in use stmt |
12 | let leaf_range = ctx.leaf_range(); | 12 | let source_range = ctx.source_range(); |
13 | match (ctx.use_item_syntax.as_ref(), ctx.path_prefix.as_ref()) { | 13 | match (ctx.use_item_syntax.as_ref(), ctx.path_prefix.as_ref()) { |
14 | (Some(_), None) => { | 14 | (Some(_), None) => { |
15 | CompletionItem::new(CompletionKind::Keyword, leaf_range, "crate") | 15 | CompletionItem::new(CompletionKind::Keyword, source_range, "crate") |
16 | .kind(CompletionItemKind::Keyword) | 16 | .kind(CompletionItemKind::Keyword) |
17 | .insert_text("crate::") | 17 | .insert_text("crate::") |
18 | .add_to(acc); | 18 | .add_to(acc); |
19 | CompletionItem::new(CompletionKind::Keyword, leaf_range, "self") | 19 | CompletionItem::new(CompletionKind::Keyword, source_range, "self") |
20 | .kind(CompletionItemKind::Keyword) | 20 | .kind(CompletionItemKind::Keyword) |
21 | .add_to(acc); | 21 | .add_to(acc); |
22 | CompletionItem::new(CompletionKind::Keyword, leaf_range, "super") | 22 | CompletionItem::new(CompletionKind::Keyword, source_range, "super") |
23 | .kind(CompletionItemKind::Keyword) | 23 | .kind(CompletionItemKind::Keyword) |
24 | .insert_text("super::") | 24 | .insert_text("super::") |
25 | .add_to(acc); | 25 | .add_to(acc); |
26 | } | 26 | } |
27 | (Some(_), Some(_)) => { | 27 | (Some(_), Some(_)) => { |
28 | CompletionItem::new(CompletionKind::Keyword, leaf_range, "self") | 28 | CompletionItem::new(CompletionKind::Keyword, source_range, "self") |
29 | .kind(CompletionItemKind::Keyword) | 29 | .kind(CompletionItemKind::Keyword) |
30 | .add_to(acc); | 30 | .add_to(acc); |
31 | CompletionItem::new(CompletionKind::Keyword, leaf_range, "super") | 31 | CompletionItem::new(CompletionKind::Keyword, source_range, "super") |
32 | .kind(CompletionItemKind::Keyword) | 32 | .kind(CompletionItemKind::Keyword) |
33 | .insert_text("super::") | 33 | .insert_text("super::") |
34 | .add_to(acc); | 34 | .add_to(acc); |
@@ -38,7 +38,7 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC | |||
38 | } | 38 | } |
39 | 39 | ||
40 | fn keyword(ctx: &CompletionContext, kw: &str, snippet: &str) -> CompletionItem { | 40 | fn keyword(ctx: &CompletionContext, kw: &str, snippet: &str) -> CompletionItem { |
41 | CompletionItem::new(CompletionKind::Keyword, ctx.leaf_range(), kw) | 41 | CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), kw) |
42 | .kind(CompletionItemKind::Keyword) | 42 | .kind(CompletionItemKind::Keyword) |
43 | .snippet(snippet) | 43 | .snippet(snippet) |
44 | .build() | 44 | .build() |
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs index 513a2ee89..804954ee1 100644 --- a/crates/ra_ide_api/src/completion/complete_path.rs +++ b/crates/ra_ide_api/src/completion/complete_path.rs | |||
@@ -17,7 +17,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) { | |||
17 | for (name, res) in module_scope.entries() { | 17 | for (name, res) in module_scope.entries() { |
18 | CompletionItem::new( | 18 | CompletionItem::new( |
19 | CompletionKind::Reference, | 19 | CompletionKind::Reference, |
20 | ctx.leaf_range(), | 20 | ctx.source_range(), |
21 | name.to_string(), | 21 | name.to_string(), |
22 | ) | 22 | ) |
23 | .from_resolution(ctx, res) | 23 | .from_resolution(ctx, res) |
@@ -30,7 +30,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) { | |||
30 | .for_each(|(variant_name, _variant)| { | 30 | .for_each(|(variant_name, _variant)| { |
31 | CompletionItem::new( | 31 | CompletionItem::new( |
32 | CompletionKind::Reference, | 32 | CompletionKind::Reference, |
33 | ctx.leaf_range(), | 33 | ctx.source_range(), |
34 | variant_name.to_string(), | 34 | variant_name.to_string(), |
35 | ) | 35 | ) |
36 | .kind(CompletionItemKind::EnumVariant) | 36 | .kind(CompletionItemKind::EnumVariant) |
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 958a12f22..20fc77f06 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs | |||
@@ -31,7 +31,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) { | |||
31 | .for_each(|(name, res)| { | 31 | .for_each(|(name, res)| { |
32 | CompletionItem::new( | 32 | CompletionItem::new( |
33 | CompletionKind::Reference, | 33 | CompletionKind::Reference, |
34 | ctx.leaf_range(), | 34 | ctx.source_range(), |
35 | name.to_string(), | 35 | name.to_string(), |
36 | ) | 36 | ) |
37 | .from_resolution(ctx, res) | 37 | .from_resolution(ctx, res) |
@@ -52,7 +52,7 @@ fn complete_fn( | |||
52 | .for_each(|entry| { | 52 | .for_each(|entry| { |
53 | CompletionItem::new( | 53 | CompletionItem::new( |
54 | CompletionKind::Reference, | 54 | CompletionKind::Reference, |
55 | ctx.leaf_range(), | 55 | ctx.source_range(), |
56 | entry.name().to_string(), | 56 | entry.name().to_string(), |
57 | ) | 57 | ) |
58 | .kind(CompletionItemKind::Binding) | 58 | .kind(CompletionItemKind::Binding) |
diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs index 4fa23bbf6..d3344b865 100644 --- a/crates/ra_ide_api/src/completion/complete_snippet.rs +++ b/crates/ra_ide_api/src/completion/complete_snippet.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use crate::completion::{CompletionItem, Completions, CompletionKind, CompletionItemKind, CompletionContext, completion_item::Builder}; | 1 | use crate::completion::{CompletionItem, Completions, CompletionKind, CompletionItemKind, CompletionContext, completion_item::Builder}; |
2 | 2 | ||
3 | fn snippet(ctx: &CompletionContext, label: &str, snippet: &str) -> Builder { | 3 | fn snippet(ctx: &CompletionContext, label: &str, snippet: &str) -> Builder { |
4 | CompletionItem::new(CompletionKind::Snippet, ctx.leaf_range(), label) | 4 | CompletionItem::new(CompletionKind::Snippet, ctx.source_range(), label) |
5 | .snippet(snippet) | 5 | .snippet(snippet) |
6 | .kind(CompletionItemKind::Snippet) | 6 | .kind(CompletionItemKind::Snippet) |
7 | } | 7 | } |
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs index de9b95c81..fd4cfc944 100644 --- a/crates/ra_ide_api/src/completion/completion_context.rs +++ b/crates/ra_ide_api/src/completion/completion_context.rs | |||
@@ -65,7 +65,10 @@ impl<'a> CompletionContext<'a> { | |||
65 | Some(ctx) | 65 | Some(ctx) |
66 | } | 66 | } |
67 | 67 | ||
68 | pub(crate) fn leaf_range(&self) -> TextRange { | 68 | // The range of the identifier that is being completed. |
69 | // This is purely advisory and can be used, for example, to highlight this range in the editor. | ||
70 | // Clients are expected to ignore this field. | ||
71 | pub(crate) fn source_range(&self) -> TextRange { | ||
69 | self.leaf.range() | 72 | self.leaf.range() |
70 | } | 73 | } |
71 | 74 | ||
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs index da8da94d1..f46d9e581 100644 --- a/crates/ra_ide_api/src/completion/completion_item.rs +++ b/crates/ra_ide_api/src/completion/completion_item.rs | |||
@@ -2,6 +2,7 @@ use hir::PerNs; | |||
2 | 2 | ||
3 | use crate::completion::completion_context::CompletionContext; | 3 | use crate::completion::completion_context::CompletionContext; |
4 | use ra_syntax::TextRange; | 4 | use ra_syntax::TextRange; |
5 | use ra_text_edit::TextEdit; | ||
5 | 6 | ||
6 | /// `CompletionItem` describes a single completion variant in the editor pop-up. | 7 | /// `CompletionItem` describes a single completion variant in the editor pop-up. |
7 | /// It is basically a POD with various properties. To construct a | 8 | /// It is basically a POD with various properties. To construct a |
@@ -17,8 +18,8 @@ pub struct CompletionItem { | |||
17 | lookup: Option<String>, | 18 | lookup: Option<String>, |
18 | insert_text: Option<String>, | 19 | insert_text: Option<String>, |
19 | insert_text_format: InsertTextFormat, | 20 | insert_text_format: InsertTextFormat, |
20 | replace_range: TextRange, | 21 | source_range: TextRange, |
21 | delete_range: Option<TextRange>, | 22 | text_edit: Option<TextEdit>, |
22 | } | 23 | } |
23 | 24 | ||
24 | #[derive(Debug, Clone, Copy, PartialEq, Eq)] | 25 | #[derive(Debug, Clone, Copy, PartialEq, Eq)] |
@@ -64,7 +65,7 @@ impl CompletionItem { | |||
64 | ) -> Builder { | 65 | ) -> Builder { |
65 | let label = label.into(); | 66 | let label = label.into(); |
66 | Builder { | 67 | Builder { |
67 | replace_range, | 68 | source_range: replace_range, |
68 | completion_kind, | 69 | completion_kind, |
69 | label, | 70 | label, |
70 | insert_text: None, | 71 | insert_text: None, |
@@ -72,7 +73,7 @@ impl CompletionItem { | |||
72 | detail: None, | 73 | detail: None, |
73 | lookup: None, | 74 | lookup: None, |
74 | kind: None, | 75 | kind: None, |
75 | delete_range: None, | 76 | text_edit: None, |
76 | } | 77 | } |
77 | } | 78 | } |
78 | /// What user sees in pop-up in the UI. | 79 | /// What user sees in pop-up in the UI. |
@@ -103,18 +104,18 @@ impl CompletionItem { | |||
103 | pub fn kind(&self) -> Option<CompletionItemKind> { | 104 | pub fn kind(&self) -> Option<CompletionItemKind> { |
104 | self.kind | 105 | self.kind |
105 | } | 106 | } |
106 | pub fn delete_range(&self) -> Option<TextRange> { | 107 | pub fn take_text_edit(&mut self) -> Option<TextEdit> { |
107 | self.delete_range | 108 | self.text_edit.take() |
108 | } | 109 | } |
109 | pub fn replace_range(&self) -> TextRange { | 110 | pub fn source_range(&self) -> TextRange { |
110 | self.replace_range | 111 | self.source_range |
111 | } | 112 | } |
112 | } | 113 | } |
113 | 114 | ||
114 | /// A helper to make `CompletionItem`s. | 115 | /// A helper to make `CompletionItem`s. |
115 | #[must_use] | 116 | #[must_use] |
116 | pub(crate) struct Builder { | 117 | pub(crate) struct Builder { |
117 | replace_range: TextRange, | 118 | source_range: TextRange, |
118 | completion_kind: CompletionKind, | 119 | completion_kind: CompletionKind, |
119 | label: String, | 120 | label: String, |
120 | insert_text: Option<String>, | 121 | insert_text: Option<String>, |
@@ -122,7 +123,7 @@ pub(crate) struct Builder { | |||
122 | detail: Option<String>, | 123 | detail: Option<String>, |
123 | lookup: Option<String>, | 124 | lookup: Option<String>, |
124 | kind: Option<CompletionItemKind>, | 125 | kind: Option<CompletionItemKind>, |
125 | delete_range: Option<TextRange>, | 126 | text_edit: Option<TextEdit>, |
126 | } | 127 | } |
127 | 128 | ||
128 | impl Builder { | 129 | impl Builder { |
@@ -132,14 +133,14 @@ impl Builder { | |||
132 | 133 | ||
133 | pub(crate) fn build(self) -> CompletionItem { | 134 | pub(crate) fn build(self) -> CompletionItem { |
134 | CompletionItem { | 135 | CompletionItem { |
135 | replace_range: self.replace_range, | 136 | source_range: self.source_range, |
136 | label: self.label, | 137 | label: self.label, |
137 | detail: self.detail, | 138 | detail: self.detail, |
138 | insert_text_format: self.insert_text_format, | 139 | insert_text_format: self.insert_text_format, |
139 | lookup: self.lookup, | 140 | lookup: self.lookup, |
140 | kind: self.kind, | 141 | kind: self.kind, |
141 | completion_kind: self.completion_kind, | 142 | completion_kind: self.completion_kind, |
142 | delete_range: self.delete_range, | 143 | text_edit: self.text_edit, |
143 | insert_text: self.insert_text, | 144 | insert_text: self.insert_text, |
144 | } | 145 | } |
145 | } | 146 | } |
@@ -165,6 +166,11 @@ impl Builder { | |||
165 | self | 166 | self |
166 | } | 167 | } |
167 | #[allow(unused)] | 168 | #[allow(unused)] |
169 | pub(crate) fn text_edit(mut self, edit: TextEdit) -> Builder { | ||
170 | self.text_edit = Some(edit); | ||
171 | self | ||
172 | } | ||
173 | #[allow(unused)] | ||
168 | pub(crate) fn detail(self, detail: impl Into<String>) -> Builder { | 174 | pub(crate) fn detail(self, detail: impl Into<String>) -> Builder { |
169 | self.set_detail(Some(detail)) | 175 | self.set_detail(Some(detail)) |
170 | } | 176 | } |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap index ff8646ab2..132048d9c 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.674785+00:00 | 1 | Created: 2019-01-20T04:00:48.241096+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [62; 100), | 16 | source_range: [62; 100), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -28,7 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | "quux()$0" | 28 | "quux()$0" |
29 | ), | 29 | ), |
30 | insert_text_format: Snippet, | 30 | insert_text_format: Snippet, |
31 | replace_range: [62; 100), | 31 | source_range: [62; 100), |
32 | delete_range: None | 32 | text_edit: None |
33 | } | 33 | } |
34 | ] | 34 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap index 2176af32d..e7b628f19 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.676585+00:00 | 1 | Created: 2019-01-20T04:00:48.242456+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [213; 231), | 16 | source_range: [213; 231), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -26,8 +26,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
26 | lookup: None, | 26 | lookup: None, |
27 | insert_text: None, | 27 | insert_text: None, |
28 | insert_text_format: PlainText, | 28 | insert_text_format: PlainText, |
29 | replace_range: [213; 231), | 29 | source_range: [213; 231), |
30 | delete_range: None | 30 | text_edit: None |
31 | }, | 31 | }, |
32 | CompletionItem { | 32 | CompletionItem { |
33 | completion_kind: Reference, | 33 | completion_kind: Reference, |
@@ -41,7 +41,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
41 | "quux()$0" | 41 | "quux()$0" |
42 | ), | 42 | ), |
43 | insert_text_format: Snippet, | 43 | insert_text_format: Snippet, |
44 | replace_range: [213; 231), | 44 | source_range: [213; 231), |
45 | delete_range: None | 45 | text_edit: None |
46 | } | 46 | } |
47 | ] | 47 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap index 49745745d..403fe0c4c 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.676674+00:00 | 1 | Created: 2019-01-20T04:00:48.243016+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [78; 79), | 16 | source_range: [78; 79), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -26,8 +26,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
26 | lookup: None, | 26 | lookup: None, |
27 | insert_text: None, | 27 | insert_text: None, |
28 | insert_text_format: PlainText, | 28 | insert_text_format: PlainText, |
29 | replace_range: [78; 79), | 29 | source_range: [78; 79), |
30 | delete_range: None | 30 | text_edit: None |
31 | }, | 31 | }, |
32 | CompletionItem { | 32 | CompletionItem { |
33 | completion_kind: Reference, | 33 | completion_kind: Reference, |
@@ -41,7 +41,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
41 | "quux($0)" | 41 | "quux($0)" |
42 | ), | 42 | ), |
43 | insert_text_format: Snippet, | 43 | insert_text_format: Snippet, |
44 | replace_range: [78; 79), | 44 | source_range: [78; 79), |
45 | delete_range: None | 45 | text_edit: None |
46 | } | 46 | } |
47 | ] | 47 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap index c8a0a78aa..413960191 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.630898+00:00 | 1 | Created: 2019-01-20T04:00:48.206357+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [54; 56), | 18 | source_range: [54; 56), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [54; 56), | 33 | source_range: [54; 56), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [54; 56), | 48 | source_range: [54; 56), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [54; 56), | 63 | source_range: [54; 56), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,8 +75,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "continue;" | 75 | "continue;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [54; 56), | 78 | source_range: [54; 56), |
79 | delete_range: None | 79 | text_edit: None |
80 | }, | 80 | }, |
81 | CompletionItem { | 81 | CompletionItem { |
82 | completion_kind: Keyword, | 82 | completion_kind: Keyword, |
@@ -90,8 +90,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
90 | "break;" | 90 | "break;" |
91 | ), | 91 | ), |
92 | insert_text_format: Snippet, | 92 | insert_text_format: Snippet, |
93 | replace_range: [54; 56), | 93 | source_range: [54; 56), |
94 | delete_range: None | 94 | text_edit: None |
95 | }, | 95 | }, |
96 | CompletionItem { | 96 | CompletionItem { |
97 | completion_kind: Keyword, | 97 | completion_kind: Keyword, |
@@ -105,7 +105,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
105 | "return $0;" | 105 | "return $0;" |
106 | ), | 106 | ), |
107 | insert_text_format: Snippet, | 107 | insert_text_format: Snippet, |
108 | replace_range: [54; 56), | 108 | source_range: [54; 56), |
109 | delete_range: None | 109 | text_edit: None |
110 | } | 110 | } |
111 | ] | 111 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap index 707021e21..dc2fc95e3 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.647435+00:00 | 1 | Created: 2019-01-20T04:00:48.217822+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [59; 61), | 18 | source_range: [59; 61), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [59; 61), | 33 | source_range: [59; 61), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [59; 61), | 48 | source_range: [59; 61), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [59; 61), | 63 | source_range: [59; 61), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return $0;" | 75 | "return $0;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [59; 61), | 78 | source_range: [59; 61), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap index a65ab3cc0..26ca18933 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.649286+00:00 | 1 | Created: 2019-01-20T04:00:48.217724+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [23; 25), | 16 | source_range: [23; 25), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap index a935b06f4..f5ae8c29f 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.640573+00:00 | 1 | Created: 2019-01-20T04:00:48.208392+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [84; 102), | 18 | source_range: [84; 102), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [84; 102), | 33 | source_range: [84; 102), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [84; 102), | 48 | source_range: [84; 102), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [84; 102), | 63 | source_range: [84; 102), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return $0" | 75 | "return $0" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [84; 102), | 78 | source_range: [84; 102), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap index abc01d4d6..88c9287fd 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.670539+00:00 | 1 | Created: 2019-01-20T04:00:48.239872+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [35; 39), | 16 | source_range: [35; 39), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -26,7 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
26 | lookup: None, | 26 | lookup: None, |
27 | insert_text: None, | 27 | insert_text: None, |
28 | insert_text_format: PlainText, | 28 | insert_text_format: PlainText, |
29 | replace_range: [35; 39), | 29 | source_range: [35; 39), |
30 | delete_range: None | 30 | text_edit: None |
31 | } | 31 | } |
32 | ] | 32 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap index 2d3234b2c..33286e68b 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.671764+00:00 | 1 | Created: 2019-01-20T04:00:48.239894+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [40; 41), | 16 | source_range: [40; 41), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap index 6e4817d1a..2db0eb755 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.680378+00:00 | 1 | Created: 2019-01-20T04:00:48.248606+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [108; 146), | 16 | source_range: [108; 146), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -28,7 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | "foo()$0" | 28 | "foo()$0" |
29 | ), | 29 | ), |
30 | insert_text_format: Snippet, | 30 | insert_text_format: Snippet, |
31 | replace_range: [108; 146), | 31 | source_range: [108; 146), |
32 | delete_range: None | 32 | text_edit: None |
33 | } | 33 | } |
34 | ] | 34 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap index 4ec75e2ca..7ae216cd2 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.681170+00:00 | 1 | Created: 2019-01-20T04:00:48.249349+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "no_args()$0" | 15 | "no_args()$0" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [53; 56), | 18 | source_range: [53; 56), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Reference, | 22 | completion_kind: Reference, |
@@ -30,7 +30,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "main()$0" | 30 | "main()$0" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [53; 56), | 33 | source_range: [53; 56), |
34 | delete_range: None | 34 | text_edit: None |
35 | } | 35 | } |
36 | ] | 36 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap index 11a8f1757..231d75d7a 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.686781+00:00 | 1 | Created: 2019-01-20T04:00:48.255317+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "main()$0" | 15 | "main()$0" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [72; 77), | 18 | source_range: [72; 77), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Reference, | 22 | completion_kind: Reference, |
@@ -30,7 +30,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "with_args($0)" | 30 | "with_args($0)" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [72; 77), | 33 | source_range: [72; 77), |
34 | delete_range: None | 34 | text_edit: None |
35 | } | 35 | } |
36 | ] | 36 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap index 02e88a96e..4d309b20e 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.640068+00:00 | 1 | Created: 2019-01-20T04:00:48.207728+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [24; 54), | 18 | source_range: [24; 54), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [24; 54), | 33 | source_range: [24; 54), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [24; 54), | 48 | source_range: [24; 54), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [24; 54), | 63 | source_range: [24; 54), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return;" | 75 | "return;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [24; 54), | 78 | source_range: [24; 54), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap index 41dc288f6..0f1e66ac3 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.640134+00:00 | 1 | Created: 2019-01-20T04:00:48.207381+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [91; 105), | 18 | source_range: [91; 105), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [91; 105), | 33 | source_range: [91; 105), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [91; 105), | 48 | source_range: [91; 105), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [91; 105), | 63 | source_range: [91; 105), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,8 +75,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "else {$0}" | 75 | "else {$0}" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [91; 105), | 78 | source_range: [91; 105), |
79 | delete_range: None | 79 | text_edit: None |
80 | }, | 80 | }, |
81 | CompletionItem { | 81 | CompletionItem { |
82 | completion_kind: Keyword, | 82 | completion_kind: Keyword, |
@@ -90,8 +90,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
90 | "else if $0 {}" | 90 | "else if $0 {}" |
91 | ), | 91 | ), |
92 | insert_text_format: Snippet, | 92 | insert_text_format: Snippet, |
93 | replace_range: [91; 105), | 93 | source_range: [91; 105), |
94 | delete_range: None | 94 | text_edit: None |
95 | }, | 95 | }, |
96 | CompletionItem { | 96 | CompletionItem { |
97 | completion_kind: Keyword, | 97 | completion_kind: Keyword, |
@@ -105,7 +105,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
105 | "return;" | 105 | "return;" |
106 | ), | 106 | ), |
107 | insert_text_format: Snippet, | 107 | insert_text_format: Snippet, |
108 | replace_range: [91; 105), | 108 | source_range: [91; 105), |
109 | delete_range: None | 109 | text_edit: None |
110 | } | 110 | } |
111 | ] | 111 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap index 6cbed012f..25c29dc18 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.640767+00:00 | 1 | Created: 2019-01-20T04:00:48.211090+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [31; 65), | 18 | source_range: [31; 65), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [31; 65), | 33 | source_range: [31; 65), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [31; 65), | 48 | source_range: [31; 65), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [31; 65), | 63 | source_range: [31; 65), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return $0;" | 75 | "return $0;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [31; 65), | 78 | source_range: [31; 65), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap index b95cb72c1..7e43be4b0 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.664707+00:00 | 1 | Created: 2019-01-20T04:00:48.218272+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [24; 58), | 18 | source_range: [24; 58), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [24; 58), | 33 | source_range: [24; 58), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [24; 58), | 48 | source_range: [24; 58), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [24; 58), | 63 | source_range: [24; 58), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return;" | 75 | "return;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [24; 58), | 78 | source_range: [24; 58), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap index d53c9e72f..7ed890b74 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.639067+00:00 | 1 | Created: 2019-01-20T04:00:48.207433+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "crate::" | 15 | "crate::" |
16 | ), | 16 | ), |
17 | insert_text_format: PlainText, | 17 | insert_text_format: PlainText, |
18 | replace_range: [16; 30), | 18 | source_range: [16; 30), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -28,8 +28,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | lookup: None, | 28 | lookup: None, |
29 | insert_text: None, | 29 | insert_text: None, |
30 | insert_text_format: PlainText, | 30 | insert_text_format: PlainText, |
31 | replace_range: [16; 30), | 31 | source_range: [16; 30), |
32 | delete_range: None | 32 | text_edit: None |
33 | }, | 33 | }, |
34 | CompletionItem { | 34 | CompletionItem { |
35 | completion_kind: Keyword, | 35 | completion_kind: Keyword, |
@@ -43,7 +43,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
43 | "super::" | 43 | "super::" |
44 | ), | 44 | ), |
45 | insert_text_format: PlainText, | 45 | insert_text_format: PlainText, |
46 | replace_range: [16; 30), | 46 | source_range: [16; 30), |
47 | delete_range: None | 47 | text_edit: None |
48 | } | 48 | } |
49 | ] | 49 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap index fee3b6e3b..8d33629ed 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.643595+00:00 | 1 | Created: 2019-01-20T04:00:48.214287+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [18; 20), | 16 | source_range: [18; 20), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Keyword, | 20 | completion_kind: Keyword, |
@@ -28,7 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | "super::" | 28 | "super::" |
29 | ), | 29 | ), |
30 | insert_text_format: PlainText, | 30 | insert_text_format: PlainText, |
31 | replace_range: [18; 20), | 31 | source_range: [18; 20), |
32 | delete_range: None | 32 | text_edit: None |
33 | } | 33 | } |
34 | ] | 34 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap index 2181d6c8b..66ab20f41 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.648502+00:00 | 1 | Created: 2019-01-20T04:00:48.217815+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [23; 24), | 16 | source_range: [23; 24), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Keyword, | 20 | completion_kind: Keyword, |
@@ -28,7 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | "super::" | 28 | "super::" |
29 | ), | 29 | ), |
30 | insert_text_format: PlainText, | 30 | insert_text_format: PlainText, |
31 | replace_range: [23; 24), | 31 | source_range: [23; 24), |
32 | delete_range: None | 32 | text_edit: None |
33 | } | 33 | } |
34 | ] | 34 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap index 6da2c0ea9..2dc47e9b1 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.640449+00:00 | 1 | Created: 2019-01-20T04:00:48.208669+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [62; 100), | 18 | source_range: [62; 100), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [62; 100), | 33 | source_range: [62; 100), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [62; 100), | 48 | source_range: [62; 100), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [62; 100), | 63 | source_range: [62; 100), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return $0;" | 75 | "return $0;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [62; 100), | 78 | source_range: [62; 100), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap index 33bc4bb51..59e11c585 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.649440+00:00 | 1 | Created: 2019-01-20T04:00:48.221138+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [62; 100), | 18 | source_range: [62; 100), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [62; 100), | 33 | source_range: [62; 100), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [62; 100), | 48 | source_range: [62; 100), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [62; 100), | 63 | source_range: [62; 100), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,7 +75,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "return $0;" | 75 | "return $0;" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [62; 100), | 78 | source_range: [62; 100), |
79 | delete_range: None | 79 | text_edit: None |
80 | } | 80 | } |
81 | ] | 81 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap index 9081bd50d..44624473e 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.629020+00:00 | 1 | Created: 2019-01-20T04:00:48.203164+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,7 +15,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "the_method($0)" | 15 | "the_method($0)" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [143; 144), | 18 | source_range: [143; 144), |
19 | delete_range: None | 19 | text_edit: None |
20 | } | 20 | } |
21 | ] | 21 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap index be75ec0b5..9ebb8a357 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.676740+00:00 | 1 | Created: 2019-01-20T04:00:48.243581+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "quux()$0" | 15 | "quux()$0" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [72; 102), | 18 | source_range: [72; 102), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Reference, | 22 | completion_kind: Reference, |
@@ -28,8 +28,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | lookup: None, | 28 | lookup: None, |
29 | insert_text: None, | 29 | insert_text: None, |
30 | insert_text_format: PlainText, | 30 | insert_text_format: PlainText, |
31 | replace_range: [72; 102), | 31 | source_range: [72; 102), |
32 | delete_range: None | 32 | text_edit: None |
33 | }, | 33 | }, |
34 | CompletionItem { | 34 | CompletionItem { |
35 | completion_kind: Reference, | 35 | completion_kind: Reference, |
@@ -41,7 +41,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
41 | lookup: None, | 41 | lookup: None, |
42 | insert_text: None, | 42 | insert_text: None, |
43 | insert_text_format: PlainText, | 43 | insert_text_format: PlainText, |
44 | replace_range: [72; 102), | 44 | source_range: [72; 102), |
45 | delete_range: None | 45 | text_edit: None |
46 | } | 46 | } |
47 | ] | 47 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap index 8277a6191..9b7aa0540 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.677905+00:00 | 1 | Created: 2019-01-20T04:00:48.244757+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "quux()$0" | 15 | "quux()$0" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [100; 102), | 18 | source_range: [100; 102), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Reference, | 22 | completion_kind: Reference, |
@@ -28,7 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | lookup: None, | 28 | lookup: None, |
29 | insert_text: None, | 29 | insert_text: None, |
30 | insert_text_format: PlainText, | 30 | insert_text_format: PlainText, |
31 | replace_range: [100; 102), | 31 | source_range: [100; 102), |
32 | delete_range: None | 32 | text_edit: None |
33 | } | 33 | } |
34 | ] | 34 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap index bb2830737..555f7acc6 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.666350+00:00 | 1 | Created: 2019-01-20T04:00:48.222109+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [12; 14), | 16 | source_range: [12; 14), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -26,7 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
26 | lookup: None, | 26 | lookup: None, |
27 | insert_text: None, | 27 | insert_text: None, |
28 | insert_text_format: PlainText, | 28 | insert_text_format: PlainText, |
29 | replace_range: [12; 14), | 29 | source_range: [12; 14), |
30 | delete_range: None | 30 | text_edit: None |
31 | } | 31 | } |
32 | ] | 32 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap index 8bcf60fa8..fd56a6c8c 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.640842+00:00 | 1 | Created: 2019-01-20T04:00:48.209867+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "if $0 {}" | 15 | "if $0 {}" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [106; 108), | 18 | source_range: [106; 108), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Keyword, | 22 | completion_kind: Keyword, |
@@ -30,8 +30,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "match $0 {}" | 30 | "match $0 {}" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [106; 108), | 33 | source_range: [106; 108), |
34 | delete_range: None | 34 | text_edit: None |
35 | }, | 35 | }, |
36 | CompletionItem { | 36 | CompletionItem { |
37 | completion_kind: Keyword, | 37 | completion_kind: Keyword, |
@@ -45,8 +45,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
45 | "while $0 {}" | 45 | "while $0 {}" |
46 | ), | 46 | ), |
47 | insert_text_format: Snippet, | 47 | insert_text_format: Snippet, |
48 | replace_range: [106; 108), | 48 | source_range: [106; 108), |
49 | delete_range: None | 49 | text_edit: None |
50 | }, | 50 | }, |
51 | CompletionItem { | 51 | CompletionItem { |
52 | completion_kind: Keyword, | 52 | completion_kind: Keyword, |
@@ -60,8 +60,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
60 | "loop {$0}" | 60 | "loop {$0}" |
61 | ), | 61 | ), |
62 | insert_text_format: Snippet, | 62 | insert_text_format: Snippet, |
63 | replace_range: [106; 108), | 63 | source_range: [106; 108), |
64 | delete_range: None | 64 | text_edit: None |
65 | }, | 65 | }, |
66 | CompletionItem { | 66 | CompletionItem { |
67 | completion_kind: Keyword, | 67 | completion_kind: Keyword, |
@@ -75,8 +75,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
75 | "continue" | 75 | "continue" |
76 | ), | 76 | ), |
77 | insert_text_format: Snippet, | 77 | insert_text_format: Snippet, |
78 | replace_range: [106; 108), | 78 | source_range: [106; 108), |
79 | delete_range: None | 79 | text_edit: None |
80 | }, | 80 | }, |
81 | CompletionItem { | 81 | CompletionItem { |
82 | completion_kind: Keyword, | 82 | completion_kind: Keyword, |
@@ -90,8 +90,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
90 | "break" | 90 | "break" |
91 | ), | 91 | ), |
92 | insert_text_format: Snippet, | 92 | insert_text_format: Snippet, |
93 | replace_range: [106; 108), | 93 | source_range: [106; 108), |
94 | delete_range: None | 94 | text_edit: None |
95 | }, | 95 | }, |
96 | CompletionItem { | 96 | CompletionItem { |
97 | completion_kind: Keyword, | 97 | completion_kind: Keyword, |
@@ -105,7 +105,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
105 | "return" | 105 | "return" |
106 | ), | 106 | ), |
107 | insert_text_format: Snippet, | 107 | insert_text_format: Snippet, |
108 | replace_range: [106; 108), | 108 | source_range: [106; 108), |
109 | delete_range: None | 109 | text_edit: None |
110 | } | 110 | } |
111 | ] | 111 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap index 67a075129..e0e5929ff 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.629063+00:00 | 1 | Created: 2019-01-20T04:00:48.203211+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | ), | 13 | ), |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [98; 102), | 16 | source_range: [98; 102), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap index 7f349ea16..2899cf98e 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.629062+00:00 | 1 | Created: 2019-01-20T04:00:48.203236+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | ), | 13 | ), |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [98; 102), | 16 | source_range: [98; 102), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap index 8aa07e2bc..8a4d9ef63 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.630980+00:00 | 1 | Created: 2019-01-20T04:00:48.206552+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | ), | 13 | ), |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [269; 273), | 16 | source_range: [269; 273), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap index 1e69b865f..404c738bd 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.664242+00:00 | 1 | Created: 2019-01-20T04:00:48.220278+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [45; 47), | 16 | source_range: [45; 47), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -26,7 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
26 | lookup: None, | 26 | lookup: None, |
27 | insert_text: None, | 27 | insert_text: None, |
28 | insert_text_format: PlainText, | 28 | insert_text_format: PlainText, |
29 | replace_range: [45; 47), | 29 | source_range: [45; 47), |
30 | delete_range: None | 30 | text_edit: None |
31 | } | 31 | } |
32 | ] | 32 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap index 5d2d01872..6bef3ed95 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.678426+00:00 | 1 | Created: 2019-01-20T04:00:48.245820+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [46; 60), | 16 | source_range: [46; 60), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -28,7 +28,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
28 | "x()$0" | 28 | "x()$0" |
29 | ), | 29 | ), |
30 | insert_text_format: Snippet, | 30 | insert_text_format: Snippet, |
31 | replace_range: [46; 60), | 31 | source_range: [46; 60), |
32 | delete_range: None | 32 | text_edit: None |
33 | } | 33 | } |
34 | ] | 34 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap index 61ed4d0f2..56bfe1b0d 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.679470+00:00 | 1 | Created: 2019-01-20T04:00:48.244260+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [24; 26), | 16 | source_range: [24; 26), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap index 10ced4f28..648d7f189 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.681192+00:00 | 1 | Created: 2019-01-20T04:00:48.252281+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | "eprintln!(\"$0 = {:?}\", $0);" | 15 | "eprintln!(\"$0 = {:?}\", $0);" |
16 | ), | 16 | ), |
17 | insert_text_format: Snippet, | 17 | insert_text_format: Snippet, |
18 | replace_range: [16; 18), | 18 | source_range: [16; 18), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Snippet, | 22 | completion_kind: Snippet, |
@@ -30,7 +30,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "eprintln!(\"$0 = {:#?}\", $0);" | 30 | "eprintln!(\"$0 = {:#?}\", $0);" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [16; 18), | 33 | source_range: [16; 18), |
34 | delete_range: None | 34 | text_edit: None |
35 | } | 35 | } |
36 | ] | 36 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap index 5a87ae357..f5d0140ea 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.682017+00:00 | 1 | Created: 2019-01-20T04:00:48.253073+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -17,8 +17,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
17 | "#[test]\nfn ${1:feature}() {\n $0\n}" | 17 | "#[test]\nfn ${1:feature}() {\n $0\n}" |
18 | ), | 18 | ), |
19 | insert_text_format: Snippet, | 19 | insert_text_format: Snippet, |
20 | replace_range: [49; 79), | 20 | source_range: [49; 79), |
21 | delete_range: None | 21 | text_edit: None |
22 | }, | 22 | }, |
23 | CompletionItem { | 23 | CompletionItem { |
24 | completion_kind: Snippet, | 24 | completion_kind: Snippet, |
@@ -32,7 +32,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
32 | "pub(crate) $0" | 32 | "pub(crate) $0" |
33 | ), | 33 | ), |
34 | insert_text_format: Snippet, | 34 | insert_text_format: Snippet, |
35 | replace_range: [49; 79), | 35 | source_range: [49; 79), |
36 | delete_range: None | 36 | text_edit: None |
37 | } | 37 | } |
38 | ] | 38 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap index 6208d04a4..530c76a02 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.628928+00:00 | 1 | Created: 2019-01-20T04:00:48.203121+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,7 +15,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | lookup: None, | 15 | lookup: None, |
16 | insert_text: None, | 16 | insert_text: None, |
17 | insert_text_format: PlainText, | 17 | insert_text_format: PlainText, |
18 | replace_range: [84; 85), | 18 | source_range: [84; 85), |
19 | delete_range: None | 19 | text_edit: None |
20 | } | 20 | } |
21 | ] | 21 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap index 6de8ada5a..ec861bf7e 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.629043+00:00 | 1 | Created: 2019-01-20T04:00:48.203230+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | lookup: None, | 15 | lookup: None, |
16 | insert_text: None, | 16 | insert_text: None, |
17 | insert_text_format: PlainText, | 17 | insert_text_format: PlainText, |
18 | replace_range: [125; 126), | 18 | source_range: [125; 126), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Reference, | 22 | completion_kind: Reference, |
@@ -30,7 +30,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "foo($0)" | 30 | "foo($0)" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [125; 126), | 33 | source_range: [125; 126), |
34 | delete_range: None | 34 | text_edit: None |
35 | } | 35 | } |
36 | ] | 36 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap index 3e5c4fca9..ee69884c8 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.629041+00:00 | 1 | Created: 2019-01-20T04:00:48.203235+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -15,8 +15,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
15 | lookup: None, | 15 | lookup: None, |
16 | insert_text: None, | 16 | insert_text: None, |
17 | insert_text_format: PlainText, | 17 | insert_text_format: PlainText, |
18 | replace_range: [120; 121), | 18 | source_range: [120; 121), |
19 | delete_range: None | 19 | text_edit: None |
20 | }, | 20 | }, |
21 | CompletionItem { | 21 | CompletionItem { |
22 | completion_kind: Reference, | 22 | completion_kind: Reference, |
@@ -30,7 +30,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
30 | "foo($0)" | 30 | "foo($0)" |
31 | ), | 31 | ), |
32 | insert_text_format: Snippet, | 32 | insert_text_format: Snippet, |
33 | replace_range: [120; 121), | 33 | source_range: [120; 121), |
34 | delete_range: None | 34 | text_edit: None |
35 | } | 35 | } |
36 | ] | 36 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap index bbec167d5..29f7f86f1 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.667522+00:00 | 1 | Created: 2019-01-20T04:00:48.223130+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,8 +13,8 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [11; 13), | 16 | source_range: [11; 13), |
17 | delete_range: None | 17 | text_edit: None |
18 | }, | 18 | }, |
19 | CompletionItem { | 19 | CompletionItem { |
20 | completion_kind: Reference, | 20 | completion_kind: Reference, |
@@ -26,7 +26,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
26 | lookup: None, | 26 | lookup: None, |
27 | insert_text: None, | 27 | insert_text: None, |
28 | insert_text_format: PlainText, | 28 | insert_text_format: PlainText, |
29 | replace_range: [11; 13), | 29 | source_range: [11; 13), |
30 | delete_range: None | 30 | text_edit: None |
31 | } | 31 | } |
32 | ] | 32 | ] |
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap index ed571c605..8b6aca26e 100644 --- a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap +++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap | |||
@@ -1,4 +1,4 @@ | |||
1 | Created: 2019-01-19T16:37:23.669476+00:00 | 1 | Created: 2019-01-20T04:00:48.225170+00:00 |
2 | Creator: [email protected] | 2 | Creator: [email protected] |
3 | Source: crates/ra_ide_api/src/completion/completion_item.rs | 3 | Source: crates/ra_ide_api/src/completion/completion_item.rs |
4 | 4 | ||
@@ -13,7 +13,7 @@ Source: crates/ra_ide_api/src/completion/completion_item.rs | |||
13 | lookup: None, | 13 | lookup: None, |
14 | insert_text: None, | 14 | insert_text: None, |
15 | insert_text_format: PlainText, | 15 | insert_text_format: PlainText, |
16 | replace_range: [24; 26), | 16 | source_range: [24; 26), |
17 | delete_range: None | 17 | text_edit: None |
18 | } | 18 | } |
19 | ] | 19 | ] |
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs index 54a977b7a..23b226fac 100644 --- a/crates/ra_lsp_server/src/conv.rs +++ b/crates/ra_lsp_server/src/conv.rs | |||
@@ -13,7 +13,6 @@ use ra_syntax::{SyntaxKind, TextRange, TextUnit}; | |||
13 | use ra_text_edit::{AtomTextEdit, TextEdit}; | 13 | use ra_text_edit::{AtomTextEdit, TextEdit}; |
14 | 14 | ||
15 | use crate::{req, server_world::ServerWorld, Result}; | 15 | use crate::{req, server_world::ServerWorld, Result}; |
16 | use ra_text_edit::TextEditBuilder; | ||
17 | 16 | ||
18 | pub trait Conv { | 17 | pub trait Conv { |
19 | type Output; | 18 | type Output; |
@@ -79,13 +78,11 @@ impl ConvWith for CompletionItem { | |||
79 | type Ctx = LineIndex; | 78 | type Ctx = LineIndex; |
80 | type Output = ::lsp_types::CompletionItem; | 79 | type Output = ::lsp_types::CompletionItem; |
81 | 80 | ||
82 | fn conv_with(self, ctx: &LineIndex) -> ::lsp_types::CompletionItem { | 81 | fn conv_with(mut self, ctx: &LineIndex) -> ::lsp_types::CompletionItem { |
83 | let atom_text_edit = AtomTextEdit::replace(self.replace_range(), self.insert_text()); | 82 | let atom_text_edit = AtomTextEdit::replace(self.source_range(), self.insert_text()); |
84 | let text_edit = (&atom_text_edit).conv_with(ctx); | 83 | let text_edit = (&atom_text_edit).conv_with(ctx); |
85 | let additional_text_edits = if let Some(delete_range) = self.delete_range() { | 84 | let additional_text_edits = if let Some(edit) = self.take_text_edit() { |
86 | let mut builder = TextEditBuilder::default(); | 85 | Some(edit.conv_with(ctx)) |
87 | builder.delete(delete_range); | ||
88 | Some(builder.finish().conv_with(ctx)) | ||
89 | } else { | 86 | } else { |
90 | None | 87 | None |
91 | }; | 88 | }; |