nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-19 18:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1321

Browse Source 
1321: Rustc r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-05-23 22:50:34 +00:00
commit 8a9cc67421
62 changed files with 648 additions and 618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
crates/ra_ide_api/src/completion/complete_dot.rs
View File

@ -66,16 +66,18 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "the_field", ⋮ CompletionItem {
source_range: [94; 94), ⋮ label: "the_field",
delete: [94; 94), ⋮ source_range: [94; 94),
insert: "the_field", ⋮ delete: [94; 94),
kind: Field, ⋮ insert: "the_field",
detail: "u32" ⋮ kind: Field,
} ⋮ detail: "u32",
]"### ⋮ },
⋮]
"###
); );
} }
@ -95,27 +97,29 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "foo", ⋮ CompletionItem {
source_range: [187; 187), ⋮ label: "foo",
delete: [187; 187), ⋮ source_range: [187; 187),
insert: "foo()$0", ⋮ delete: [187; 187),
kind: Method, ⋮ insert: "foo()$0",
detail: "fn foo(self)" ⋮ kind: Method,
}, ⋮ detail: "fn foo(self)",
CompletionItem { ⋮ },
label: "the_field", ⋮ CompletionItem {
source_range: [187; 187), ⋮ label: "the_field",
delete: [187; 187), ⋮ source_range: [187; 187),
insert: "the_field", ⋮ delete: [187; 187),
kind: Field, ⋮ insert: "the_field",
detail: "(u32,)", ⋮ kind: Field,
documentation: Documentation( ⋮ detail: "(u32,)",
"This is the_field" ⋮ documentation: Documentation(
) ⋮ "This is the_field",
} ⋮ ),
]"### ⋮ },
⋮]
"###
); );
} }
@ -132,24 +136,26 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "foo", ⋮ CompletionItem {
source_range: [126; 126), ⋮ label: "foo",
delete: [126; 126), ⋮ source_range: [126; 126),
insert: "foo()$0", ⋮ delete: [126; 126),
kind: Method, ⋮ insert: "foo()$0",
detail: "fn foo(&self)" ⋮ kind: Method,
}, ⋮ detail: "fn foo(&self)",
CompletionItem { ⋮ },
label: "the_field", ⋮ CompletionItem {
source_range: [126; 126), ⋮ label: "the_field",
delete: [126; 126), ⋮ source_range: [126; 126),
insert: "the_field", ⋮ delete: [126; 126),
kind: Field, ⋮ insert: "the_field",
detail: "(u32, i32)" ⋮ kind: Field,
} ⋮ detail: "(u32, i32)",
]"### ⋮ },
⋮]
"###
); );
} }
@ -182,16 +188,18 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "the_method", ⋮ CompletionItem {
source_range: [144; 144), ⋮ label: "the_method",
delete: [144; 144), ⋮ source_range: [144; 144),
insert: "the_method()$0", ⋮ delete: [144; 144),
kind: Method, ⋮ insert: "the_method()$0",
detail: "fn the_method(&self)" ⋮ kind: Method,
} ⋮ detail: "fn the_method(&self)",
]"### ⋮ },
⋮]
"###
); );
} }
@ -208,16 +216,18 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "the_method", ⋮ CompletionItem {
source_range: [151; 151), ⋮ label: "the_method",
delete: [151; 151), ⋮ source_range: [151; 151),
insert: "the_method()$0", ⋮ delete: [151; 151),
kind: Method, ⋮ insert: "the_method()$0",
detail: "fn the_method(&self)" ⋮ kind: Method,
} ⋮ detail: "fn the_method(&self)",
]"### ⋮ },
⋮]
"###
); );
} }
@ -257,16 +267,18 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "the_method", ⋮ CompletionItem {
source_range: [249; 249), ⋮ label: "the_method",
delete: [249; 249), ⋮ source_range: [249; 249),
insert: "the_method()$0", ⋮ delete: [249; 249),
kind: Method, ⋮ insert: "the_method()$0",
detail: "fn the_method(&self)" ⋮ kind: Method,
} ⋮ detail: "fn the_method(&self)",
]"### ⋮ },
⋮]
"###
); );
} }
@ -281,24 +293,26 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "0", ⋮ CompletionItem {
source_range: [75; 75), ⋮ label: "0",
delete: [75; 75), ⋮ source_range: [75; 75),
insert: "0", ⋮ delete: [75; 75),
kind: Field, ⋮ insert: "0",
detail: "i32" ⋮ kind: Field,
}, ⋮ detail: "i32",
CompletionItem { ⋮ },
label: "1", ⋮ CompletionItem {
source_range: [75; 75), ⋮ label: "1",
delete: [75; 75), ⋮ source_range: [75; 75),
insert: "1", ⋮ delete: [75; 75),
kind: Field, ⋮ insert: "1",
detail: "f64" ⋮ kind: Field,
} ⋮ detail: "f64",
]"### ⋮ },
⋮]
"###
); );
} }
@ -322,16 +336,18 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "blah", ⋮ CompletionItem {
source_range: [299; 300), ⋮ label: "blah",
delete: [299; 300), ⋮ source_range: [299; 300),
insert: "blah()$0", ⋮ delete: [299; 300),
kind: Method, ⋮ insert: "blah()$0",
detail: "pub fn blah(&self)" ⋮ kind: Method,
} ⋮ detail: "pub fn blah(&self)",
]"### ⋮ },
⋮]
"###
); );
} }
@ -346,16 +362,18 @@ mod tests {
}; };
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "the_field", ⋮ CompletionItem {
source_range: [106; 106), ⋮ label: "the_field",
delete: [106; 106), ⋮ source_range: [106; 106),
insert: "the_field", ⋮ delete: [106; 106),
kind: Field, ⋮ insert: "the_field",
detail: "u32" ⋮ kind: Field,
} ⋮ detail: "u32",
]"### ⋮ },
⋮]
"###
); );
} }
} }

60
crates/ra_ide_api/src/completion/complete_fn_param.rs
View File

@ -71,15 +71,17 @@ mod tests {
fn baz(file<|>) {} fn baz(file<|>) {}
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "file_id: FileId", ⋮ CompletionItem {
source_range: [110; 114), ⋮ label: "file_id: FileId",
delete: [110; 114), ⋮ source_range: [110; 114),
insert: "file_id: FileId", ⋮ delete: [110; 114),
lookup: "file_id" ⋮ insert: "file_id: FileId",
} ⋮ lookup: "file_id",
]"### ⋮ },
⋮]
"###
); );
} }
@ -93,15 +95,17 @@ mod tests {
fn baz(file<|>, x: i32) {} fn baz(file<|>, x: i32) {}
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "file_id: FileId", ⋮ CompletionItem {
source_range: [110; 114), ⋮ label: "file_id: FileId",
delete: [110; 114), ⋮ source_range: [110; 114),
insert: "file_id: FileId", ⋮ delete: [110; 114),
lookup: "file_id" ⋮ insert: "file_id: FileId",
} ⋮ lookup: "file_id",
]"### ⋮ },
⋮]
"###
); );
} }
@ -118,15 +122,17 @@ mod tests {
} }
", ",
), ),
@r###"[ @r###"
CompletionItem { ⋮[
label: "file_id: FileId", ⋮ CompletionItem {
source_range: [289; 293), ⋮ label: "file_id: FileId",
delete: [289; 293), ⋮ source_range: [289; 293),
insert: "file_id: FileId", ⋮ delete: [289; 293),
lookup: "file_id" ⋮ insert: "file_id: FileId",
} ⋮ lookup: "file_id",
]"### ⋮ },
⋮]
"###
); );
} }
} }

62
crates/ra_ide_api/src/completion/complete_pattern.rs
View File

@ -53,35 +53,37 @@ mod tests {
} }
", ",
); );
assert_debug_snapshot_matches!(completions, @r###"[ assert_debug_snapshot_matches!(completions, @r###"
CompletionItem { ⋮[
label: "E", ⋮ CompletionItem {
source_range: [246; 246), ⋮ label: "E",
delete: [246; 246), ⋮ source_range: [246; 246),
insert: "E", ⋮ delete: [246; 246),
kind: Enum ⋮ insert: "E",
}, ⋮ kind: Enum,
CompletionItem { ⋮ },
label: "X", ⋮ CompletionItem {
source_range: [246; 246), ⋮ label: "X",
delete: [246; 246), ⋮ source_range: [246; 246),
insert: "X", ⋮ delete: [246; 246),
kind: EnumVariant ⋮ insert: "X",
}, ⋮ kind: EnumVariant,
CompletionItem { ⋮ },
label: "Z", ⋮ CompletionItem {
source_range: [246; 246), ⋮ label: "Z",
delete: [246; 246), ⋮ source_range: [246; 246),
insert: "Z", ⋮ delete: [246; 246),
kind: Const ⋮ insert: "Z",
}, ⋮ kind: Const,
CompletionItem { ⋮ },
label: "m", ⋮ CompletionItem {
source_range: [246; 246), ⋮ label: "m",
delete: [246; 246), ⋮ source_range: [246; 246),
insert: "m", ⋮ delete: [246; 246),
kind: Module ⋮ insert: "m",
} ⋮ kind: Module,
]"###); ⋮ },
⋮]
"###);
} }
} }

22
crates/ra_ide_api/src/completion/complete_struct_literal.rs
View File

@ -44,15 +44,17 @@ mod tests {
} }
", ",
); );
assert_debug_snapshot_matches!(completions, @r###"[ assert_debug_snapshot_matches!(completions, @r###"
CompletionItem { ⋮[
label: "the_field", ⋮ CompletionItem {
source_range: [83; 86), ⋮ label: "the_field",
delete: [83; 86), ⋮ source_range: [83; 86),
insert: "the_field", ⋮ delete: [83; 86),
kind: Field, ⋮ insert: "the_field",
detail: "u32" ⋮ kind: Field,
} ⋮ detail: "u32",
]"###); ⋮ },
⋮]
"###);
} }
} }

10
crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.132341107Z" created: "2019-05-23T22:23:35.119822026Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,13 +11,13 @@ expression: kind_completions
delete: [83; 83), delete: [83; 83),
insert: "quux()$0", insert: "quux()$0",
kind: Function, kind: Function,
detail: "fn quux()" detail: "fn quux()",
}, },
CompletionItem { CompletionItem {
label: "x", label: "x",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "x", insert: "x",
kind: Binding kind: Binding,
} },
] ]

12
crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.126809445Z" created: "2019-05-23T22:23:35.122168608Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,14 +10,14 @@ expression: kind_completions
source_range: [214; 214), source_range: [214; 214),
delete: [214; 214), delete: [214; 214),
insert: "a", insert: "a",
kind: Binding kind: Binding,
}, },
CompletionItem { CompletionItem {
label: "b", label: "b",
source_range: [214; 214), source_range: [214; 214),
delete: [214; 214), delete: [214; 214),
insert: "b", insert: "b",
kind: Binding kind: Binding,
}, },
CompletionItem { CompletionItem {
label: "quux", label: "quux",
@ -25,6 +25,6 @@ expression: kind_completions
delete: [214; 214), delete: [214; 214),
insert: "quux()$0", insert: "quux()$0",
kind: Function, kind: Function,
detail: "fn quux()" detail: "fn quux()",
} },
] ]

12
crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.126696322Z" created: "2019-05-23T22:23:35.122797188Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,20 +11,20 @@ expression: kind_completions
delete: [79; 79), delete: [79; 79),
insert: "quux($0)", insert: "quux($0)",
kind: Function, kind: Function,
detail: "fn quux(x: i32)" detail: "fn quux(x: i32)",
}, },
CompletionItem { CompletionItem {
label: "x", label: "x",
source_range: [79; 79), source_range: [79; 79),
delete: [79; 79), delete: [79; 79),
insert: "x", insert: "x",
kind: Binding kind: Binding,
}, },
CompletionItem { CompletionItem {
label: "y", label: "y",
source_range: [79; 79), source_range: [79; 79),
delete: [79; 79), delete: [79; 79),
insert: "y", insert: "y",
kind: Binding kind: Binding,
} },
] ]

20
crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.976673150Z" created: "2019-05-23T22:23:35.067956470Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,48 +10,48 @@ expression: kind_completions
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "break;", insert: "break;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "continue", label: "continue",
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "continue;", insert: "continue;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "if", label: "if",
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "return $0;", insert: "return $0;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [55; 55), source_range: [55; 55),
delete: [55; 55), delete: [55; 55),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.068967569Z" created: "2019-05-23T22:44:10.859967190Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [60; 60), source_range: [60; 60),
delete: [60; 60), delete: [60; 60),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [60; 60), source_range: [60; 60),
delete: [60; 60), delete: [60; 60),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [60; 60), source_range: [60; 60),
delete: [60; 60), delete: [60; 60),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [60; 60), source_range: [60; 60),
delete: [60; 60), delete: [60; 60),
insert: "return $0;", insert: "return $0;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [60; 60), source_range: [60; 60),
delete: [60; 60), delete: [60; 60),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

12
crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.180517434Z" created: "2019-05-23T22:23:35.139262926Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,7 +10,7 @@ expression: kind_completions
source_range: [18; 18), source_range: [18; 18),
delete: [18; 18), delete: [18; 18),
insert: "Option", insert: "Option",
kind: Struct kind: Struct,
}, },
CompletionItem { CompletionItem {
label: "foo", label: "foo",
@ -18,13 +18,13 @@ expression: kind_completions
delete: [18; 18), delete: [18; 18),
insert: "foo()$0", insert: "foo()$0",
kind: Function, kind: Function,
detail: "fn foo()" detail: "fn foo()",
}, },
CompletionItem { CompletionItem {
label: "std", label: "std",
source_range: [18; 18), source_range: [18; 18),
delete: [18; 18), delete: [18; 18),
insert: "std", insert: "std",
kind: Module kind: Module,
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__completes_use_paths_across_crates.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.118807216Z" created: "2019-05-23T22:23:35.108690807Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,6 +10,6 @@ expression: kind_completions
source_range: [9; 9), source_range: [9; 9),
delete: [9; 9), delete: [9; 9),
insert: "bar", insert: "bar",
kind: Module kind: Module,
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.044567777Z" created: "2019-05-23T22:23:35.085633034Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,6 +10,6 @@ expression: kind_completions
source_range: [23; 25), source_range: [23; 25),
delete: [23; 25), delete: [23; 25),
insert: "Spam", insert: "Spam",
kind: Struct kind: Struct,
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.987788705Z" created: "2019-05-23T22:23:35.081993214Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [85; 85), source_range: [85; 85),
delete: [85; 85), delete: [85; 85),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [85; 85), source_range: [85; 85),
delete: [85; 85), delete: [85; 85),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [85; 85), source_range: [85; 85),
delete: [85; 85), delete: [85; 85),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [85; 85), source_range: [85; 85),
delete: [85; 85), delete: [85; 85),
insert: "return $0", insert: "return $0",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [85; 85), source_range: [85; 85),
delete: [85; 85), delete: [85; 85),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.211680376Z" created: "2019-05-23T22:23:35.158296242Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,7 +11,7 @@ expression: kind_completions
delete: [35; 39), delete: [35; 39),
insert: "frobnicate", insert: "frobnicate",
kind: Function, kind: Function,
detail: "fn frobnicate()" detail: "fn frobnicate()",
}, },
CompletionItem { CompletionItem {
label: "main", label: "main",
@ -19,6 +19,6 @@ expression: kind_completions
delete: [35; 39), delete: [35; 39),
insert: "main", insert: "main",
kind: Function, kind: Function,
detail: "fn main()" detail: "fn main()",
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-24T16:33:48.008220694Z" created: "2019-05-23T22:44:10.920136527Z"
creator: insta@0.6.3 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,6 +11,6 @@ expression: kind_completions
delete: [67; 69), delete: [67; 69),
insert: "new", insert: "new",
kind: Function, kind: Function,
detail: "fn new() -> Foo" detail: "fn new() -> Foo",
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.213677341Z" created: "2019-05-23T22:23:35.154795561Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,6 +11,6 @@ expression: kind_completions
delete: [40; 41), delete: [40; 41),
insert: "foo", insert: "foo",
kind: Function, kind: Function,
detail: "pub fn foo()" detail: "pub fn foo()",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-04-04T14:52:24.531844100Z" created: "2019-05-23T22:23:35.142044205Z"
creator: insta@0.7.4 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,7 +10,7 @@ expression: kind_completions
source_range: [126; 126), source_range: [126; 126),
delete: [126; 126), delete: [126; 126),
insert: "bar", insert: "bar",
kind: Binding kind: Binding,
}, },
CompletionItem { CompletionItem {
label: "foo", label: "foo",
@ -18,6 +18,6 @@ expression: kind_completions
delete: [126; 126), delete: [126; 126),
insert: "foo()$0", insert: "foo()$0",
kind: Function, kind: Function,
detail: "fn foo()" detail: "fn foo()",
} },
] ]

14
crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.045355450Z" created: "2019-05-23T22:23:35.090178265Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -13,8 +13,8 @@ expression: kind_completions
kind: EnumVariant, kind: EnumVariant,
detail: "(i32)", detail: "(i32)",
documentation: Documentation( documentation: Documentation(
"Bar Variant with i32" "Bar Variant with i32",
) ),
}, },
CompletionItem { CompletionItem {
label: "Foo", label: "Foo",
@ -24,7 +24,7 @@ expression: kind_completions
kind: EnumVariant, kind: EnumVariant,
detail: "()", detail: "()",
documentation: Documentation( documentation: Documentation(
"Foo Variant" "Foo Variant",
) ),
} },
] ]

18
crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-04-02T07:43:12.954637543Z" created: "2019-05-23T22:23:35.091325331Z"
creator: insta@0.7.4 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -13,8 +13,8 @@ expression: kind_completions
kind: EnumVariant, kind: EnumVariant,
detail: "(i32, u32)", detail: "(i32, u32)",
documentation: Documentation( documentation: Documentation(
"Bar Variant with i32 and u32" "Bar Variant with i32 and u32",
) ),
}, },
CompletionItem { CompletionItem {
label: "Foo", label: "Foo",
@ -24,8 +24,8 @@ expression: kind_completions
kind: EnumVariant, kind: EnumVariant,
detail: "()", detail: "()",
documentation: Documentation( documentation: Documentation(
"Foo Variant (empty)" "Foo Variant (empty)",
) ),
}, },
CompletionItem { CompletionItem {
label: "S", label: "S",
@ -35,7 +35,7 @@ expression: kind_completions
kind: EnumVariant, kind: EnumVariant,
detail: "(S)", detail: "(S)",
documentation: Documentation( documentation: Documentation(
"" "",
) ),
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.137183638Z" created: "2019-05-23T22:23:35.123197049Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,6 +10,6 @@ expression: kind_completions
source_range: [4; 4), source_range: [4; 4),
delete: [4; 4), delete: [4; 4),
insert: "other_crate", insert: "other_crate",
kind: Module kind: Module,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.143253235Z" created: "2019-05-23T22:23:35.123825399Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,7 +10,7 @@ expression: kind_completions
source_range: [44; 44), source_range: [44; 44),
delete: [44; 44), delete: [44; 44),
insert: "T", insert: "T",
kind: TypeParam kind: TypeParam,
}, },
CompletionItem { CompletionItem {
label: "quux", label: "quux",
@ -18,6 +18,6 @@ expression: kind_completions
delete: [44; 44), delete: [44; 44),
insert: "quux()$0", insert: "quux()$0",
kind: Function, kind: Function,
detail: "fn quux<T>()" detail: "fn quux<T>()",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.149424158Z" created: "2019-05-23T22:23:35.130778739Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [46; 46), source_range: [46; 46),
delete: [46; 46), delete: [46; 46),
insert: "T", insert: "T",
kind: TypeParam kind: TypeParam,
}, },
CompletionItem { CompletionItem {
label: "X", label: "X",
source_range: [46; 46), source_range: [46; 46),
delete: [46; 46), delete: [46; 46),
insert: "X", insert: "X",
kind: Struct kind: Struct,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.224510370Z" created: "2019-05-23T22:23:35.156115632Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,7 +11,7 @@ expression: kind_completions
delete: [53; 56), delete: [53; 56),
insert: "main()$0", insert: "main()$0",
kind: Function, kind: Function,
detail: "fn main()" detail: "fn main()",
}, },
CompletionItem { CompletionItem {
label: "no_args", label: "no_args",
@ -19,6 +19,6 @@ expression: kind_completions
delete: [53; 56), delete: [53; 56),
insert: "no_args()$0", insert: "no_args()$0",
kind: Function, kind: Function,
detail: "fn no_args()" detail: "fn no_args()",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.267013140Z" created: "2019-05-23T22:44:10.916806744Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,7 +11,7 @@ expression: kind_completions
delete: [72; 77), delete: [72; 77),
insert: "main()$0", insert: "main()$0",
kind: Function, kind: Function,
detail: "fn main()" detail: "fn main()",
}, },
CompletionItem { CompletionItem {
label: "with_args", label: "with_args",
@ -19,6 +19,6 @@ expression: kind_completions
delete: [72; 77), delete: [72; 77),
insert: "with_args($0)", insert: "with_args($0)",
kind: Function, kind: Function,
detail: "fn with_args(x: i32, y: String)" detail: "fn with_args(x: i32, y: String)",
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.303360770Z" created: "2019-05-23T22:44:40.543731193Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,6 +11,6 @@ expression: kind_completions
delete: [139; 140), delete: [139; 140),
insert: "foo()$0", insert: "foo()$0",
kind: Method, kind: Method,
detail: "fn foo(&self)" detail: "fn foo(&self)",
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.987788720Z" created: "2019-05-23T22:23:35.075690846Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "return;", insert: "return;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

20
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.984740354Z" created: "2019-05-23T22:23:35.068799431Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,48 +10,48 @@ expression: kind_completions
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "else {$0}", insert: "else {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "else if", label: "else if",
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "else if $0 {}", insert: "else if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "if", label: "if",
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "return;", insert: "return;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [92; 92), source_range: [92; 92),
delete: [92; 92), delete: [92; 92),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.049699338Z" created: "2019-05-23T22:23:35.085655258Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [48; 48), source_range: [48; 48),
delete: [48; 48), delete: [48; 48),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [48; 48), source_range: [48; 48),
delete: [48; 48), delete: [48; 48),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [48; 48), source_range: [48; 48),
delete: [48; 48), delete: [48; 48),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [48; 48), source_range: [48; 48),
delete: [48; 48), delete: [48; 48),
insert: "return $0;", insert: "return $0;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [48; 48), source_range: [48; 48),
delete: [48; 48), delete: [48; 48),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.090949782Z" created: "2019-05-23T22:44:10.869539856Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "return;", insert: "return;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [41; 41), source_range: [41; 41),
delete: [41; 41), delete: [41; 41),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

12
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.988755424Z" created: "2019-05-23T22:23:35.066687241Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,20 +10,20 @@ expression: kind_completions
source_range: [17; 17), source_range: [17; 17),
delete: [17; 17), delete: [17; 17),
insert: "crate::", insert: "crate::",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "self", label: "self",
source_range: [17; 17), source_range: [17; 17),
delete: [17; 17), delete: [17; 17),
insert: "self", insert: "self",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "super", label: "super",
source_range: [17; 17), source_range: [17; 17),
delete: [17; 17), delete: [17; 17),
insert: "super::", insert: "super::",
kind: Keyword kind: Keyword,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.030382527Z" created: "2019-05-23T22:44:10.859494330Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [20; 20), source_range: [20; 20),
delete: [20; 20), delete: [20; 20),
insert: "self", insert: "self",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "super", label: "super",
source_range: [20; 20), source_range: [20; 20),
delete: [20; 20), delete: [20; 20),
insert: "super::", insert: "super::",
kind: Keyword kind: Keyword,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.073607133Z" created: "2019-05-23T22:44:40.506690279Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [24; 24), source_range: [24; 24),
delete: [24; 24), delete: [24; 24),
insert: "self", insert: "self",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "super", label: "super",
source_range: [24; 24), source_range: [24; 24),
delete: [24; 24), delete: [24; 24),
insert: "super::", insert: "super::",
kind: Keyword kind: Keyword,
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.989188654Z" created: "2019-05-23T22:23:35.082403612Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "return $0;", insert: "return $0;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

16
crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.036383875Z" created: "2019-05-23T22:44:10.871868390Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,34 +10,34 @@ expression: kind_completions
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "return $0;", insert: "return $0;",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [83; 83), source_range: [83; 83),
delete: [83; 83), delete: [83; 83),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.066918191Z" created: "2019-05-23T22:23:35.093689514Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -12,7 +12,7 @@ expression: kind_completions
insert: "my", insert: "my",
kind: Module, kind: Module,
documentation: Documentation( documentation: Documentation(
"Some simple\ndocs describing `mod my`." "Some simple\ndocs describing `mod my`.",
) ),
} },
] ]

12
crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.161888678Z" created: "2019-05-23T22:23:35.133106898Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,14 +10,14 @@ expression: kind_completions
source_range: [89; 89), source_range: [89; 89),
delete: [89; 89), delete: [89; 89),
insert: "Baz", insert: "Baz",
kind: Enum kind: Enum,
}, },
CompletionItem { CompletionItem {
label: "Foo", label: "Foo",
source_range: [89; 89), source_range: [89; 89),
delete: [89; 89), delete: [89; 89),
insert: "Foo", insert: "Foo",
kind: Struct kind: Struct,
}, },
CompletionItem { CompletionItem {
label: "quux", label: "quux",
@ -25,6 +25,6 @@ expression: kind_completions
delete: [89; 89), delete: [89; 89),
insert: "quux()$0", insert: "quux()$0",
kind: Function, kind: Function,
detail: "fn quux()" detail: "fn quux()",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.180517419Z" created: "2019-05-23T22:23:35.134417551Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,7 +10,7 @@ expression: kind_completions
source_range: [101; 101), source_range: [101; 101),
delete: [101; 101), delete: [101; 101),
insert: "Bar", insert: "Bar",
kind: Struct kind: Struct,
}, },
CompletionItem { CompletionItem {
label: "quux", label: "quux",
@ -18,6 +18,6 @@ expression: kind_completions
delete: [101; 101), delete: [101; 101),
insert: "quux()$0", insert: "quux()$0",
kind: Function, kind: Function,
detail: "fn quux()" detail: "fn quux()",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.085605313Z" created: "2019-05-23T22:23:35.099358768Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [12; 14), source_range: [12; 14),
delete: [12; 14), delete: [12; 14),
insert: "Spam", insert: "Spam",
kind: Struct kind: Struct,
}, },
CompletionItem { CompletionItem {
label: "foo", label: "foo",
source_range: [12; 14), source_range: [12; 14),
delete: [12; 14), delete: [12; 14),
insert: "foo", insert: "foo",
kind: Module kind: Module,
} },
] ]

20
crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:23.999953358Z" created: "2019-05-23T22:23:35.085365816Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,48 +10,48 @@ expression: kind_completions
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "break", insert: "break",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "continue", label: "continue",
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "continue", insert: "continue",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "if", label: "if",
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "if $0 {}", insert: "if $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "loop", label: "loop",
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "loop {$0}", insert: "loop {$0}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "match $0 {}", insert: "match $0 {}",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "return", label: "return",
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "return", insert: "return",
kind: Keyword kind: Keyword,
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [106; 108), source_range: [106; 108),
delete: [106; 108), delete: [106; 108),
insert: "while $0 {}", insert: "while $0 {}",
kind: Keyword kind: Keyword,
} },
] ]

20
crates/ra_ide_api/src/completion/snapshots/completion_item__postfix_completion_works_for_trivial_path_expression.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-04-22T07:37:13.981826301Z" created: "2019-05-23T22:23:35.118738523Z"
creator: insta@0.7.4 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,48 +10,48 @@ expression: kind_completions
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "dbg!(bar)", insert: "dbg!(bar)",
detail: "dbg!(expr)" detail: "dbg!(expr)",
}, },
CompletionItem { CompletionItem {
label: "if", label: "if",
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "if bar {$0}", insert: "if bar {$0}",
detail: "if expr {}" detail: "if expr {}",
}, },
CompletionItem { CompletionItem {
label: "match", label: "match",
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "match bar {\n ${1:_} => {$0\\},\n}", insert: "match bar {\n ${1:_} => {$0\\},\n}",
detail: "match expr {}" detail: "match expr {}",
}, },
CompletionItem { CompletionItem {
label: "not", label: "not",
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "!bar", insert: "!bar",
detail: "!expr" detail: "!expr",
}, },
CompletionItem { CompletionItem {
label: "ref", label: "ref",
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "&bar", insert: "&bar",
detail: "&expr" detail: "&expr",
}, },
CompletionItem { CompletionItem {
label: "refm", label: "refm",
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "&mut bar", insert: "&mut bar",
detail: "&mut expr" detail: "&mut expr",
}, },
CompletionItem { CompletionItem {
label: "while", label: "while",
source_range: [76; 76), source_range: [76; 76),
delete: [72; 76), delete: [72; 76),
insert: "while bar {\n$0\n}", insert: "while bar {\n$0\n}",
detail: "while expr {}" detail: "while expr {}",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-04-04T14:52:24.525395600Z" created: "2019-05-23T22:23:35.140648630Z"
creator: insta@0.7.4 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,7 +10,7 @@ expression: kind_completions
source_range: [47; 47), source_range: [47; 47),
delete: [47; 47), delete: [47; 47),
insert: "Foo", insert: "Foo",
kind: Struct kind: Struct,
}, },
CompletionItem { CompletionItem {
label: "x", label: "x",
@ -18,6 +18,6 @@ expression: kind_completions
delete: [47; 47), delete: [47; 47),
insert: "x()$0", insert: "x()$0",
kind: Function, kind: Function,
detail: "fn x()" detail: "fn x()",
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.174038680Z" created: "2019-05-23T22:23:35.141900902Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [25; 25), source_range: [25; 25),
delete: [25; 25), delete: [25; 25),
insert: "Self", insert: "Self",
kind: TypeParam kind: TypeParam,
}, },
CompletionItem { CompletionItem {
label: "self", label: "self",
source_range: [25; 25), source_range: [25; 25),
delete: [25; 25), delete: [25; 25),
insert: "self", insert: "self",
kind: Binding kind: Binding,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.191576723Z" created: "2019-05-23T22:23:35.141901047Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [17; 17), source_range: [17; 17),
delete: [17; 17), delete: [17; 17),
insert: "eprintln!(\"$0 = {:?}\", $0);", insert: "eprintln!(\"$0 = {:?}\", $0);",
kind: Snippet kind: Snippet,
}, },
CompletionItem { CompletionItem {
label: "ppd", label: "ppd",
source_range: [17; 17), source_range: [17; 17),
delete: [17; 17), delete: [17; 17),
insert: "eprintln!(\"$0 = {:#?}\", $0);", insert: "eprintln!(\"$0 = {:#?}\", $0);",
kind: Snippet kind: Snippet,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.187670733Z" created: "2019-05-23T22:23:35.149234118Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -11,13 +11,13 @@ expression: kind_completions
delete: [66; 66), delete: [66; 66),
insert: "#[test]\nfn ${1:feature}() {\n $0\n}", insert: "#[test]\nfn ${1:feature}() {\n $0\n}",
kind: Snippet, kind: Snippet,
lookup: "tfn" lookup: "tfn",
}, },
CompletionItem { CompletionItem {
label: "pub(crate)", label: "pub(crate)",
source_range: [66; 66), source_range: [66; 66),
delete: [66; 66), delete: [66; 66),
insert: "pub(crate) $0", insert: "pub(crate) $0",
kind: Snippet kind: Snippet,
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_const.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.093406123Z" created: "2019-05-23T22:23:35.101474826Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -13,7 +13,7 @@ expression: kind_completions
kind: Const, kind: Const,
detail: "const C: i32 = 42;", detail: "const C: i32 = 42;",
documentation: Documentation( documentation: Documentation(
"An associated const" "An associated const",
) ),
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_method.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-24T16:33:47.990111169Z" created: "2019-05-23T22:23:35.102351365Z"
creator: insta@0.6.3 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -13,7 +13,7 @@ expression: kind_completions
kind: Function, kind: Function,
detail: "fn m()", detail: "fn m()",
documentation: Documentation( documentation: Documentation(
"An associated method" "An associated method",
) ),
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_type.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.090876030Z" created: "2019-05-23T22:23:35.105188762Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -13,7 +13,7 @@ expression: kind_completions
kind: TypeAlias, kind: TypeAlias,
detail: "type T = i32;", detail: "type T = i32;",
documentation: Documentation( documentation: Documentation(
"An associated type" "An associated type",
) ),
} },
] ]

10
crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.098574884Z" created: "2019-05-23T22:23:35.105336210Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,13 +10,13 @@ expression: kind_completions
source_range: [11; 13), source_range: [11; 13),
delete: [11; 13), delete: [11; 13),
insert: "Spam", insert: "Spam",
kind: Struct kind: Struct,
}, },
CompletionItem { CompletionItem {
label: "foo", label: "foo",
source_range: [11; 13), source_range: [11; 13),
delete: [11; 13), delete: [11; 13),
insert: "foo", insert: "foo",
kind: Module kind: Module,
} },
] ]

8
crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-02-18T09:22:24.102063333Z" created: "2019-05-23T22:23:35.106923266Z"
creator: insta@0.6.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/completion/completion_item.rs source: crates/ra_ide_api/src/completion/completion_item.rs
expression: kind_completions expression: kind_completions
--- ---
@ -10,6 +10,6 @@ expression: kind_completions
source_range: [26; 26), source_range: [26; 26),
delete: [26; 26), delete: [26; 26),
insert: "Bar", insert: "Bar",
kind: Struct kind: Struct,
} },
] ]

46
crates/ra_ide_api/src/diagnostics.rs
View File

@ -310,28 +310,30 @@ mod tests {
fn test_unresolved_module_diagnostic() { fn test_unresolved_module_diagnostic() {
let (analysis, file_id) = single_file("mod foo;"); let (analysis, file_id) = single_file("mod foo;");
let diagnostics = analysis.diagnostics(file_id).unwrap(); let diagnostics = analysis.diagnostics(file_id).unwrap();
assert_debug_snapshot_matches!(diagnostics, @r####"[ assert_debug_snapshot_matches!(diagnostics, @r###"
Diagnostic { ⋮[
message: "unresolved module", ⋮ Diagnostic {
range: [0; 8), ⋮ message: "unresolved module",
fix: Some( ⋮ range: [0; 8),
SourceChange { ⋮ fix: Some(
label: "create module", ⋮ SourceChange {
source_file_edits: [], ⋮ label: "create module",
file_system_edits: [ ⋮ source_file_edits: [],
CreateFile { ⋮ file_system_edits: [
source_root: SourceRootId( ⋮ CreateFile {
0 ⋮ source_root: SourceRootId(
), ⋮ 0,
path: "foo.rs" ⋮ ),
} ⋮ path: "foo.rs",
], ⋮ },
cursor_position: None ⋮ ],
} ⋮ cursor_position: None,
), ⋮ },
severity: Error ⋮ ),
} ⋮ severity: Error,
]"####); ⋮ },
⋮]
"###);
} }
#[test] #[test]

68
crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap
View File

@ -1,6 +1,6 @@
--- ---
created: "2019-04-08T09:44:50.196004400Z" created: "2019-05-23T22:23:35.168422050Z"
creator: insta@0.7.4 creator: insta@0.8.1
source: crates/ra_ide_api/src/display/structure.rs source: crates/ra_ide_api/src/display/structure.rs
expression: structure expression: structure
--- ---
@ -12,20 +12,20 @@ expression: structure
node_range: [1; 26), node_range: [1; 26),
kind: STRUCT_DEF, kind: STRUCT_DEF,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: Some( parent: Some(
0 0,
), ),
label: "x", label: "x",
navigation_range: [18; 19), navigation_range: [18; 19),
node_range: [18; 24), node_range: [18; 24),
kind: NAMED_FIELD_DEF, kind: NAMED_FIELD_DEF,
detail: Some( detail: Some(
"i32" "i32",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -34,46 +34,46 @@ expression: structure
node_range: [28; 158), node_range: [28; 158),
kind: MODULE, kind: MODULE,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: Some( parent: Some(
2 2,
), ),
label: "bar1", label: "bar1",
navigation_range: [43; 47), navigation_range: [43; 47),
node_range: [40; 52), node_range: [40; 52),
kind: FN_DEF, kind: FN_DEF,
detail: Some( detail: Some(
"fn()" "fn()",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: Some( parent: Some(
2 2,
), ),
label: "bar2", label: "bar2",
navigation_range: [60; 64), navigation_range: [60; 64),
node_range: [57; 81), node_range: [57; 81),
kind: FN_DEF, kind: FN_DEF,
detail: Some( detail: Some(
"fn<T>(t: T) -> T" "fn<T>(t: T) -> T",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: Some( parent: Some(
2 2,
), ),
label: "bar3", label: "bar3",
navigation_range: [89; 93), navigation_range: [89; 93),
node_range: [86; 156), node_range: [86; 156),
kind: FN_DEF, kind: FN_DEF,
detail: Some( detail: Some(
"fn<A, B>(a: A, b: B) -> Vec< u32 >" "fn<A, B>(a: A, b: B) -> Vec< u32 >",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -82,29 +82,29 @@ expression: structure
node_range: [160; 180), node_range: [160; 180),
kind: ENUM_DEF, kind: ENUM_DEF,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: Some( parent: Some(
6 6,
), ),
label: "X", label: "X",
navigation_range: [169; 170), navigation_range: [169; 170),
node_range: [169; 170), node_range: [169; 170),
kind: ENUM_VARIANT, kind: ENUM_VARIANT,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: Some( parent: Some(
6 6,
), ),
label: "Y", label: "Y",
navigation_range: [172; 173), navigation_range: [172; 173),
node_range: [172; 178), node_range: [172; 178),
kind: ENUM_VARIANT, kind: ENUM_VARIANT,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -113,9 +113,9 @@ expression: structure
node_range: [181; 193), node_range: [181; 193),
kind: TYPE_ALIAS_DEF, kind: TYPE_ALIAS_DEF,
detail: Some( detail: Some(
"()" "()",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -124,9 +124,9 @@ expression: structure
node_range: [194; 213), node_range: [194; 213),
kind: STATIC_DEF, kind: STATIC_DEF,
detail: Some( detail: Some(
"i32" "i32",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -135,9 +135,9 @@ expression: structure
node_range: [214; 232), node_range: [214; 232),
kind: CONST_DEF, kind: CONST_DEF,
detail: Some( detail: Some(
"i32" "i32",
), ),
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -146,7 +146,7 @@ expression: structure
node_range: [234; 243), node_range: [234; 243),
kind: IMPL_BLOCK, kind: IMPL_BLOCK,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -155,7 +155,7 @@ expression: structure
node_range: [245; 269), node_range: [245; 269),
kind: IMPL_BLOCK, kind: IMPL_BLOCK,
detail: None, detail: None,
deprecated: false deprecated: false,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -164,9 +164,9 @@ expression: structure
node_range: [271; 301), node_range: [271; 301),
kind: FN_DEF, kind: FN_DEF,
detail: Some( detail: Some(
"fn()" "fn()",
), ),
deprecated: true deprecated: true,
}, },
StructureNode { StructureNode {
parent: None, parent: None,
@ -175,8 +175,8 @@ expression: structure
node_range: [303; 359), node_range: [303; 359),
kind: FN_DEF, kind: FN_DEF,
detail: Some( detail: Some(
"fn()" "fn()",
), ),
deprecated: true deprecated: true,
} },
] ]

74
crates/ra_ide_api/src/snapshots/tests__highlighting.snap
View File

@ -1,5 +1,5 @@
--- ---
created: "2019-05-23T12:10:32.628883358Z" created: "2019-05-23T22:23:35.242742395Z"
creator: insta@0.8.1 creator: insta@0.8.1
source: crates/ra_ide_api/src/syntax_highlighting.rs source: crates/ra_ide_api/src/syntax_highlighting.rs
expression: result expression: result
@ -8,139 +8,139 @@ Ok(
[ [
HighlightedRange { HighlightedRange {
range: [1; 24), range: [1; 24),
tag: "attribute" tag: "attribute",
}, },
HighlightedRange { HighlightedRange {
range: [25; 31), range: [25; 31),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [32; 35), range: [32; 35),
tag: "function" tag: "function",
}, },
HighlightedRange { HighlightedRange {
range: [42; 45), range: [42; 45),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [46; 47), range: [46; 47),
tag: "function" tag: "function",
}, },
HighlightedRange { HighlightedRange {
range: [49; 52), range: [49; 52),
tag: "text" tag: "text",
}, },
HighlightedRange { HighlightedRange {
range: [58; 61), range: [58; 61),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [62; 63), range: [62; 63),
tag: "function" tag: "function",
}, },
HighlightedRange { HighlightedRange {
range: [65; 68), range: [65; 68),
tag: "text" tag: "text",
}, },
HighlightedRange { HighlightedRange {
range: [73; 75), range: [73; 75),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [76; 79), range: [76; 79),
tag: "function" tag: "function",
}, },
HighlightedRange { HighlightedRange {
range: [80; 81), range: [80; 81),
tag: "type" tag: "type",
}, },
HighlightedRange { HighlightedRange {
range: [80; 81), range: [80; 81),
tag: "function" tag: "function",
}, },
HighlightedRange { HighlightedRange {
range: [88; 89), range: [88; 89),
tag: "type" tag: "type",
}, },
HighlightedRange { HighlightedRange {
range: [96; 110), range: [96; 110),
tag: "macro" tag: "macro",
}, },
HighlightedRange { HighlightedRange {
range: [117; 127), range: [117; 127),
tag: "comment" tag: "comment",
}, },
HighlightedRange { HighlightedRange {
range: [128; 130), range: [128; 130),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [131; 135), range: [131; 135),
tag: "function" tag: "function",
}, },
HighlightedRange { HighlightedRange {
range: [145; 153), range: [145; 153),
tag: "macro" tag: "macro",
}, },
HighlightedRange { HighlightedRange {
range: [154; 166), range: [154; 166),
tag: "string" tag: "string",
}, },
HighlightedRange { HighlightedRange {
range: [168; 170), range: [168; 170),
tag: "literal" tag: "literal",
}, },
HighlightedRange { HighlightedRange {
range: [178; 181), range: [178; 181),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [182; 185), range: [182; 185),
tag: "keyword" tag: "keyword",
}, },
HighlightedRange { HighlightedRange {
range: [186; 189), range: [186; 189),
tag: "macro" tag: "macro",
}, },
HighlightedRange { HighlightedRange {
range: [197; 200), range: [197; 200),
tag: "macro" tag: "macro",
}, },
HighlightedRange { HighlightedRange {
range: [192; 195), range: [192; 195),
tag: "text" tag: "text",
}, },
HighlightedRange { HighlightedRange {
range: [208; 211), range: [208; 211),
tag: "macro" tag: "macro",
}, },
HighlightedRange { HighlightedRange {
range: [212; 216), range: [212; 216),
tag: "macro" tag: "macro",
}, },
HighlightedRange { HighlightedRange {
range: [226; 227), range: [226; 227),
tag: "literal" tag: "literal",
}, },
HighlightedRange { HighlightedRange {
range: [232; 233), range: [232; 233),
tag: "literal" tag: "literal",
}, },
HighlightedRange { HighlightedRange {
range: [242; 248), range: [242; 248),
tag: "keyword.unsafe" tag: "keyword.unsafe",
}, },
HighlightedRange { HighlightedRange {
range: [251; 254), range: [251; 254),
tag: "text" tag: "text",
}, },
HighlightedRange { HighlightedRange {
range: [255; 262), range: [255; 262),
tag: "text" tag: "text",
}, },
HighlightedRange { HighlightedRange {
range: [263; 264), range: [263; 264),
tag: "literal" tag: "literal",
} },
] ],
) )

30
crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
View File

@ -1,8 +1,8 @@
--- ---
created: "2019-01-24T08:39:53.759318522+00:00" created: "2019-05-23T22:23:35.215905447Z"
creator: insta@0.5.2 creator: insta@0.8.1
source: crates/ra_ide_api/src/references.rs
expression: "&source_change" expression: "&source_change"
source: crates/ra_ide_api/src/rename.rs
--- ---
Some( Some(
SourceChange { SourceChange {
@ -10,29 +10,29 @@ Some(
source_file_edits: [ source_file_edits: [
SourceFileEdit { SourceFileEdit {
file_id: FileId( file_id: FileId(
2 2,
), ),
edit: TextEdit { edit: TextEdit {
atoms: [ atoms: [
AtomTextEdit { AtomTextEdit {
delete: [4; 7), delete: [4; 7),
insert: "foo2" insert: "foo2",
} },
] ],
} },
} },
], ],
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(
3 3,
), ),
dst_source_root: SourceRootId( dst_source_root: SourceRootId(
0 0,
), ),
dst_path: "bar/foo2.rs" dst_path: "bar/foo2.rs",
} },
], ],
cursor_position: None cursor_position: None,
} },
) )

30
crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
View File

@ -1,8 +1,8 @@
--- ---
created: "2019-01-22T14:45:00.975229300+00:00" created: "2019-05-23T22:23:35.213830371Z"
creator: insta@0.4.0 creator: insta@0.8.1
source: crates/ra_ide_api/src/references.rs
expression: "&source_change" expression: "&source_change"
source: "crates\\ra_ide_api\\src\\rename.rs"
--- ---
Some( Some(
SourceChange { SourceChange {
@ -10,29 +10,29 @@ Some(
source_file_edits: [ source_file_edits: [
SourceFileEdit { SourceFileEdit {
file_id: FileId( file_id: FileId(
1 1,
), ),
edit: TextEdit { edit: TextEdit {
atoms: [ atoms: [
AtomTextEdit { AtomTextEdit {
delete: [4; 7), delete: [4; 7),
insert: "foo2" insert: "foo2",
} },
] ],
} },
} },
], ],
file_system_edits: [ file_system_edits: [
MoveFile { MoveFile {
src: FileId( src: FileId(
2 2,
), ),
dst_source_root: SourceRootId( dst_source_root: SourceRootId(
0 0,
), ),
dst_path: "foo2/mod.rs" dst_path: "foo2/mod.rs",
} },
], ],
cursor_position: None cursor_position: None,
} },
) )

18
crates/ra_ide_api/src/snapshots/tests__runnables.snap
View File

@ -1,24 +1,24 @@
--- ---
created: "2019-01-22T14:45:00.975229300+00:00" created: "2019-05-23T22:23:35.217100106Z"
creator: insta@0.4.0 creator: insta@0.8.1
source: crates/ra_ide_api/src/runnables.rs
expression: "&runnables" expression: "&runnables"
source: "crates\\ra_ide_api\\src\\runnables.rs"
--- ---
[ [
Runnable { Runnable {
range: [1; 21), range: [1; 21),
kind: Bin kind: Bin,
}, },
Runnable { Runnable {
range: [22; 46), range: [22; 46),
kind: Test { kind: Test {
name: "test_foo" name: "test_foo",
} },
}, },
Runnable { Runnable {
range: [47; 81), range: [47; 81),
kind: Test { kind: Test {
name: "test_foo" name: "test_foo",
} },
} },
] ]

16
crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
View File

@ -1,20 +1,20 @@
--- ---
created: "2019-01-22T14:45:00.976230700+00:00" created: "2019-05-23T22:23:35.219258850Z"
creator: insta@0.4.0 creator: insta@0.8.1
source: crates/ra_ide_api/src/runnables.rs
expression: "&runnables" expression: "&runnables"
source: "crates\\ra_ide_api\\src\\runnables.rs"
--- ---
[ [
Runnable { Runnable {
range: [1; 59), range: [1; 59),
kind: TestMod { kind: TestMod {
path: "test_mod" path: "test_mod",
} },
}, },
Runnable { Runnable {
range: [28; 57), range: [28; 57),
kind: Test { kind: Test {
name: "test_foo1" name: "test_foo1",
} },
} },
] ]

16
crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
View File

@ -1,20 +1,20 @@
--- ---
created: "2019-01-22T14:45:00.979218100+00:00" created: "2019-05-23T22:23:35.219671663Z"
creator: insta@0.4.0 creator: insta@0.8.1
source: crates/ra_ide_api/src/runnables.rs
expression: "&runnables" expression: "&runnables"
source: "crates\\ra_ide_api\\src\\runnables.rs"
--- ---
[ [
Runnable { Runnable {
range: [41; 115), range: [41; 115),
kind: TestMod { kind: TestMod {
path: "foo::bar::test_mod" path: "foo::bar::test_mod",
} },
}, },
Runnable { Runnable {
range: [68; 105), range: [68; 105),
kind: Test { kind: Test {
name: "test_foo1" name: "test_foo1",
} },
} },
] ]

16
crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
View File

@ -1,20 +1,20 @@
--- ---
created: "2019-01-22T14:45:01.016119500+00:00" created: "2019-05-23T22:23:35.224315047Z"
creator: insta@0.4.0 creator: insta@0.8.1
source: crates/ra_ide_api/src/runnables.rs
expression: "&runnables" expression: "&runnables"
source: "crates\\ra_ide_api\\src\\runnables.rs"
--- ---
[ [
Runnable { Runnable {
range: [23; 85), range: [23; 85),
kind: TestMod { kind: TestMod {
path: "foo::test_mod" path: "foo::test_mod",
} },
}, },
Runnable { Runnable {
range: [46; 79), range: [46; 79),
kind: Test { kind: Test {
name: "test_foo1" name: "test_foo1",
} },
} },
] ]

4
crates/ra_parser/src/grammar/items.rs
View File

@ -103,7 +103,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
p.bump_remap(T![auto]); p.bump_remap(T![auto]);
has_mods = true; has_mods = true;
} }
if p.at(IDENT) && p.at_contextual_kw("default") && p.nth(1) == T![impl ] { if p.at(IDENT) && p.at_contextual_kw("default") && p.nth(1) == T![impl] {
p.bump_remap(T![default]); p.bump_remap(T![default]);
has_mods = true; has_mods = true;
} }
@ -161,7 +161,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
// test unsafe_default_impl // test unsafe_default_impl
// unsafe default impl Foo {} // unsafe default impl Foo {}
T![impl ] => { T![impl] => {
traits::impl_block(p); traits::impl_block(p);
m.complete(p, IMPL_BLOCK); m.complete(p, IMPL_BLOCK);
} }

4
crates/ra_parser/src/grammar/items/traits.rs
View File

@ -44,7 +44,7 @@ pub(crate) fn trait_item_list(p: &mut Parser) {
// test impl_block // test impl_block
// impl Foo {} // impl Foo {}
pub(super) fn impl_block(p: &mut Parser) { pub(super) fn impl_block(p: &mut Parser) {
assert!(p.at(T![impl ])); assert!(p.at(T![impl]));
p.bump(); p.bump();
if choose_type_params_over_qpath(p) { if choose_type_params_over_qpath(p) {
type_params::opt_type_param_list(p); type_params::opt_type_param_list(p);
@ -130,7 +130,7 @@ fn choose_type_params_over_qpath(p: &Parser) -> bool {
// impl impl NotType {} // impl impl NotType {}
// impl Trait2 for impl NotType {} // impl Trait2 for impl NotType {}
pub(crate) fn impl_type(p: &mut Parser) { pub(crate) fn impl_type(p: &mut Parser) {
if p.at(T![impl ]) { if p.at(T![impl]) {
p.error("expected trait or type"); p.error("expected trait or type");
return; return;
} }

4
crates/ra_parser/src/grammar/type_params.rs
View File

@ -150,7 +150,7 @@ pub(super) fn opt_where_clause(p: &mut Parser) {
fn is_where_predicate(p: &mut Parser) -> bool { fn is_where_predicate(p: &mut Parser) -> bool {
match p.current() { match p.current() {
LIFETIME => true, LIFETIME => true,
T![impl ] => false, T![impl] => false,
token => types::TYPE_FIRST.contains(token), token => types::TYPE_FIRST.contains(token),
} }
} }
@ -170,7 +170,7 @@ fn where_predicate(p: &mut Parser) {
p.error("expected colon"); p.error("expected colon");
} }
} }
T![impl ] => { T![impl] => {
p.error("expected lifetime or type"); p.error("expected lifetime or type");
} }
_ => { _ => {

4
crates/ra_parser/src/grammar/types.rs
View File

@ -25,7 +25,7 @@ fn type_with_bounds_cond(p: &mut Parser, allow_bounds: bool) {
T![_] => placeholder_type(p), T![_] => placeholder_type(p),
T![fn] | T![unsafe] | T![extern] => fn_pointer_type(p), T![fn] | T![unsafe] | T![extern] => fn_pointer_type(p),
T![for] => for_type(p), T![for] => for_type(p),
T![impl ] => impl_trait_type(p), T![impl] => impl_trait_type(p),
T![dyn ] => dyn_trait_type(p), T![dyn ] => dyn_trait_type(p),
// Some path types are not allowed to have bounds (no plus) // Some path types are not allowed to have bounds (no plus)
T![<] => path_type_(p, allow_bounds), T![<] => path_type_(p, allow_bounds),
@ -221,7 +221,7 @@ pub(super) fn for_type(p: &mut Parser) {
// test impl_trait_type // test impl_trait_type
// type A = impl Iterator<Item=Foo<'a>> + 'a; // type A = impl Iterator<Item=Foo<'a>> + 'a;
fn impl_trait_type(p: &mut Parser) { fn impl_trait_type(p: &mut Parser) {
assert!(p.at(T![impl ])); assert!(p.at(T![impl]));
let m = p.start(); let m = p.start();
p.bump(); p.bump();
type_params::bounds_without_colon(p); type_params::bounds_without_colon(p);