aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-04-07 15:41:07 +0100
committerGitHub <[email protected]>2020-04-07 15:41:07 +0100
commit33c364b545350134b945fbca834194fd1a28fe08 (patch)
tree9a3ade9b4fdab53cb81e4186f51ec3d15861e89e
parent97b963b44b9da1fca4229da4c8744fa88c25780b (diff)
parent3bde2b742388f3ec3bb08841f93a06a62be04e4d (diff)
Merge #3878
3878: A more precise panic macro r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--crates/ra_ide/src/completion/complete_record.rs11
-rw-r--r--crates/ra_ide/src/completion/completion_context.rs4
-rw-r--r--crates/ra_ide/src/completion/presentation.rs43
-rw-r--r--crates/ra_ide/src/marks.rs1
4 files changed, 52 insertions, 7 deletions
diff --git a/crates/ra_ide/src/completion/complete_record.rs b/crates/ra_ide/src/completion/complete_record.rs
index 01dd8c6db..79f5c8c8f 100644
--- a/crates/ra_ide/src/completion/complete_record.rs
+++ b/crates/ra_ide/src/completion/complete_record.rs
@@ -1,12 +1,13 @@
1//! Complete fields in record literals and patterns. 1//! Complete fields in record literals and patterns.
2use crate::completion::{CompletionContext, Completions};
3use ra_syntax::{ast, ast::NameOwner, SmolStr}; 2use ra_syntax::{ast, ast::NameOwner, SmolStr};
4 3
4use crate::completion::{CompletionContext, Completions};
5
5pub(super) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { 6pub(super) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
6 let (ty, variant, already_present_fields) = 7 let (ty, variant, already_present_fields) =
7 match (ctx.record_lit_pat.as_ref(), ctx.record_lit_syntax.as_ref()) { 8 match (ctx.record_lit_pat.as_ref(), ctx.record_lit_syntax.as_ref()) {
8 (None, None) => return None, 9 (None, None) => return None,
9 (Some(_), Some(_)) => panic!("A record cannot be both a literal and a pattern"), 10 (Some(_), Some(_)) => unreachable!("A record cannot be both a literal and a pattern"),
10 (Some(record_pat), _) => ( 11 (Some(record_pat), _) => (
11 ctx.sema.type_of_pat(&record_pat.clone().into())?, 12 ctx.sema.type_of_pat(&record_pat.clone().into())?,
12 ctx.sema.resolve_record_pattern(record_pat)?, 13 ctx.sema.resolve_record_pattern(record_pat)?,
@@ -59,9 +60,10 @@ fn pattern_ascribed_fields(record_pat: &ast::RecordPat) -> Vec<SmolStr> {
59#[cfg(test)] 60#[cfg(test)]
60mod tests { 61mod tests {
61 mod record_lit_tests { 62 mod record_lit_tests {
62 use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
63 use insta::assert_debug_snapshot; 63 use insta::assert_debug_snapshot;
64 64
65 use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
66
65 fn complete(code: &str) -> Vec<CompletionItem> { 67 fn complete(code: &str) -> Vec<CompletionItem> {
66 do_completion(code, CompletionKind::Reference) 68 do_completion(code, CompletionKind::Reference)
67 } 69 }
@@ -204,9 +206,10 @@ mod tests {
204 } 206 }
205 207
206 mod record_pat_tests { 208 mod record_pat_tests {
207 use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
208 use insta::assert_debug_snapshot; 209 use insta::assert_debug_snapshot;
209 210
211 use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
212
210 fn complete(code: &str) -> Vec<CompletionItem> { 213 fn complete(code: &str) -> Vec<CompletionItem> {
211 do_completion(code, CompletionKind::Reference) 214 do_completion(code, CompletionKind::Reference)
212 } 215 }
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index b8213d62f..f833d2a9a 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -50,6 +50,8 @@ pub(crate) struct CompletionContext<'a> {
50 pub(super) dot_receiver_is_ambiguous_float_literal: bool, 50 pub(super) dot_receiver_is_ambiguous_float_literal: bool,
51 /// If this is a call (method or function) in particular, i.e. the () are already there. 51 /// If this is a call (method or function) in particular, i.e. the () are already there.
52 pub(super) is_call: bool, 52 pub(super) is_call: bool,
53 /// If this is a macro call, i.e. the () are already there.
54 pub(super) is_macro_call: bool,
53 pub(super) is_path_type: bool, 55 pub(super) is_path_type: bool,
54 pub(super) has_type_args: bool, 56 pub(super) has_type_args: bool,
55} 57}
@@ -102,6 +104,7 @@ impl<'a> CompletionContext<'a> {
102 is_new_item: false, 104 is_new_item: false,
103 dot_receiver: None, 105 dot_receiver: None,
104 is_call: false, 106 is_call: false,
107 is_macro_call: false,
105 is_path_type: false, 108 is_path_type: false,
106 has_type_args: false, 109 has_type_args: false,
107 dot_receiver_is_ambiguous_float_literal: false, 110 dot_receiver_is_ambiguous_float_literal: false,
@@ -269,6 +272,7 @@ impl<'a> CompletionContext<'a> {
269 .and_then(ast::PathExpr::cast) 272 .and_then(ast::PathExpr::cast)
270 .and_then(|it| it.syntax().parent().and_then(ast::CallExpr::cast)) 273 .and_then(|it| it.syntax().parent().and_then(ast::CallExpr::cast))
271 .is_some(); 274 .is_some();
275 self.is_macro_call = path.syntax().parent().and_then(ast::MacroCall::cast).is_some();
272 276
273 self.is_path_type = path.syntax().parent().and_then(ast::PathType::cast).is_some(); 277 self.is_path_type = path.syntax().parent().and_then(ast::PathType::cast).is_some();
274 self.has_type_args = segment.type_arg_list().is_some(); 278 self.has_type_args = segment.type_arg_list().is_some();
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index cdfd7bc32..55f75b15a 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -174,7 +174,8 @@ impl Completions {
174 .set_deprecated(is_deprecated(macro_, ctx.db)) 174 .set_deprecated(is_deprecated(macro_, ctx.db))
175 .detail(detail); 175 .detail(detail);
176 176
177 builder = if ctx.use_item_syntax.is_some() { 177 builder = if ctx.use_item_syntax.is_some() || ctx.is_macro_call {
178 tested_by!(dont_insert_macro_call_parens_unncessary);
178 builder.insert_text(name) 179 builder.insert_text(name)
179 } else { 180 } else {
180 let macro_braces_to_insert = 181 let macro_braces_to_insert =
@@ -960,7 +961,8 @@ mod tests {
960 } 961 }
961 962
962 #[test] 963 #[test]
963 fn dont_insert_macro_call_braces_in_use() { 964 fn dont_insert_macro_call_parens_unncessary() {
965 covers!(dont_insert_macro_call_parens_unncessary);
964 assert_debug_snapshot!( 966 assert_debug_snapshot!(
965 do_reference_completion( 967 do_reference_completion(
966 r" 968 r"
@@ -986,6 +988,41 @@ mod tests {
986 }, 988 },
987 ] 989 ]
988 "### 990 "###
989 ) 991 );
992
993 assert_debug_snapshot!(
994 do_reference_completion(
995 r"
996 //- /main.rs
997 macro_rules frobnicate {
998 () => ()
999 }
1000 fn main() {
1001 frob<|>!();
1002 }
1003 "
1004 ),
1005 @r###"
1006 [
1007 CompletionItem {
1008 label: "frobnicate!",
1009 source_range: [56; 60),
1010 delete: [56; 60),
1011 insert: "frobnicate",
1012 kind: Macro,
1013 detail: "macro_rules! frobnicate",
1014 },
1015 CompletionItem {
1016 label: "main()",
1017 source_range: [56; 60),
1018 delete: [56; 60),
1019 insert: "main()$0",
1020 kind: Function,
1021 lookup: "main",
1022 detail: "fn main()",
1023 },
1024 ]
1025 "###
1026 );
990 } 1027 }
991} 1028}
diff --git a/crates/ra_ide/src/marks.rs b/crates/ra_ide/src/marks.rs
index 1236cb773..5e1f135c5 100644
--- a/crates/ra_ide/src/marks.rs
+++ b/crates/ra_ide/src/marks.rs
@@ -7,4 +7,5 @@ test_utils::marks!(
7 dont_complete_current_use 7 dont_complete_current_use
8 test_resolve_parent_module_on_module_decl 8 test_resolve_parent_module_on_module_decl
9 search_filters_by_range 9 search_filters_by_range
10 dont_insert_macro_call_parens_unncessary
10); 11);