mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Less filtering in completion tests

Browse Source
This commit is contained in:
Lukas Wirth 2021-06-17 15:10:25 +02:00
parent c82a9141ab
commit 9df848c580
7 changed files with 96 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ide_completion/src/completions/attribute.rs
View File

@ -322,7 +322,7 @@ mod tests {
use expect_test::{expect, Expect};
use crate::{tests::filtered_completion_list, CompletionKind};
use crate::tests::completion_list;
#[test]
fn attributes_are_sorted() {
@ -341,7 +341,7 @@ fn attributes_are_sorted() {
}
fn check(ra_fixture: &str, expect: Expect) {
let actual = filtered_completion_list(ra_fixture, CompletionKind::Attribute);
let actual = completion_list(ra_fixture);
expect.assert_eq(&actual);
}
@ -786,6 +786,7 @@ fn complete_attribute_on_fn() {
at target_feature = "…"
at test
at track_caller
kw return
"#]],
);
}
@ -801,6 +802,7 @@ fn complete_attribute_on_expr() {
at deny(…)
at forbid(…)
at warn(…)
kw return
"#]],
);
}

7
crates/ide_completion/src/completions/attribute/derive.rs
View File

@ -82,7 +82,7 @@ struct DeriveDependencies {
mod tests {
use expect_test::{expect, Expect};
use crate::{tests::filtered_completion_list, CompletionKind};
use crate::tests::completion_list;
fn check(ra_fixture: &str, expect: Expect) {
let builtin_derives = r#"
@ -106,10 +106,7 @@ fn check(ra_fixture: &str, expect: Expect) {
pub macro Ord {}
"#;
let actual = filtered_completion_list(
&format!("{} {}", builtin_derives, ra_fixture),
CompletionKind::Attribute,
);
let actual = completion_list(&format!("{} {}", builtin_derives, ra_fixture));
expect.assert_eq(&actual);
}

1
crates/ide_completion/src/completions/attribute/lint.rs
View File

@ -33,7 +33,6 @@ pub(super) fn complete_lint(
#[cfg(test)]
mod tests {
use crate::tests::check_edit;
#[test]

24
crates/ide_completion/src/completions/keyword.rs
View File

@ -37,17 +37,6 @@ pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
}
};
}
// Suggest .await syntax for types that implement Future trait
if let Some(receiver) = ctx.dot_receiver() {
if let Some(ty) = ctx.sema.type_of_expr(receiver) {
if ty.impls_future(ctx.db) {
let mut item = kw_completion("await");
item.detail("expr.await");
item.add_to(acc);
}
};
}
}
pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionContext) {
@ -59,6 +48,19 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
cov_mark::hit!(no_keyword_completion_in_record_lit);
return;
}
// Suggest .await syntax for types that implement Future trait
if let Some(receiver) = ctx.dot_receiver() {
if let Some(ty) = ctx.sema.type_of_expr(receiver) {
if ty.impls_future(ctx.db) {
let mut item =
CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await");
item.kind(CompletionItemKind::Keyword).detail("expr.await");
item.add_to(acc);
}
};
}
let mut add_keyword = |kw, snippet| add_keyword(ctx, acc, kw, snippet);
let expects_assoc_item = ctx.expects_assoc_item();

14
crates/ide_completion/src/completions/lifetime.rs
View File

@ -49,19 +49,11 @@ pub(crate) fn complete_label(acc: &mut Completions, ctx: &CompletionContext) {
mod tests {
use expect_test::{expect, Expect};
use crate::{
tests::{check_edit, filtered_completion_list_with_config, TEST_CONFIG},
CompletionConfig, CompletionKind,
};
use crate::tests::{check_edit, completion_list};
fn check(ra_fixture: &str, expect: Expect) {
check_with_config(TEST_CONFIG, ra_fixture, expect);
}
fn check_with_config(config: CompletionConfig, ra_fixture: &str, expect: Expect) {
let actual =
filtered_completion_list_with_config(config, ra_fixture, CompletionKind::Reference);
expect.assert_eq(&actual)
let actual = completion_list(ra_fixture);
expect.assert_eq(&actual);
}
#[test]

134
crates/ide_completion/src/completions/mod_.rs
View File

@ -153,17 +153,17 @@ fn check(ra_fixture: &str, expect: Expect) {
fn lib_module_completion() {
check(
r#"
//- /lib.rs
mod $0
//- /foo.rs
fn foo() {}
//- /foo/ignored_foo.rs
fn ignored_foo() {}
//- /bar/mod.rs
fn bar() {}
//- /bar/ignored_bar.rs
fn ignored_bar() {}
"#,
//- /lib.rs
mod $0
//- /foo.rs
fn foo() {}
//- /foo/ignored_foo.rs
fn ignored_foo() {}
//- /bar/mod.rs
fn bar() {}
//- /bar/ignored_bar.rs
fn ignored_bar() {}
"#,
expect![[r#"
md foo;
md bar;
@ -175,13 +175,13 @@ fn ignored_bar() {}
fn no_module_completion_with_module_body() {
check(
r#"
//- /lib.rs
mod $0 {
//- /lib.rs
mod $0 {
}
//- /foo.rs
fn foo() {}
"#,
}
//- /foo.rs
fn foo() {}
"#,
expect![[r#""#]],
);
}
@ -190,17 +190,17 @@ fn foo() {}
fn main_module_completion() {
check(
r#"
//- /main.rs
mod $0
//- /foo.rs
fn foo() {}
//- /foo/ignored_foo.rs
fn ignored_foo() {}
//- /bar/mod.rs
fn bar() {}
//- /bar/ignored_bar.rs
fn ignored_bar() {}
"#,
//- /main.rs
mod $0
//- /foo.rs
fn foo() {}
//- /foo/ignored_foo.rs
fn ignored_foo() {}
//- /bar/mod.rs
fn bar() {}
//- /bar/ignored_bar.rs
fn ignored_bar() {}
"#,
expect![[r#"
md foo;
md bar;
@ -212,13 +212,13 @@ fn ignored_bar() {}
fn main_test_module_completion() {
check(
r#"
//- /main.rs
mod tests {
mod $0;
}
//- /tests/foo.rs
fn foo() {}
"#,
//- /main.rs
mod tests {
mod $0;
}
//- /tests/foo.rs
fn foo() {}
"#,
expect![[r#"
md foo
"#]],
@ -229,19 +229,19 @@ fn foo() {}
fn directly_nested_module_completion() {
check(
r#"
//- /lib.rs
mod foo;
//- /foo.rs
mod $0;
//- /foo/bar.rs
fn bar() {}
//- /foo/bar/ignored_bar.rs
fn ignored_bar() {}
//- /foo/baz/mod.rs
fn baz() {}
//- /foo/moar/ignored_moar.rs
fn ignored_moar() {}
"#,
//- /lib.rs
mod foo;
//- /foo.rs
mod $0;
//- /foo/bar.rs
fn bar() {}
//- /foo/bar/ignored_bar.rs
fn ignored_bar() {}
//- /foo/baz/mod.rs
fn baz() {}
//- /foo/moar/ignored_moar.rs
fn ignored_moar() {}
"#,
expect![[r#"
md bar
md baz
@ -253,15 +253,15 @@ fn ignored_moar() {}
fn nested_in_source_module_completion() {
check(
r#"
//- /lib.rs
mod foo;
//- /foo.rs
mod bar {
mod $0
}
//- /foo/bar/baz.rs
fn baz() {}
"#,
//- /lib.rs
mod foo;
//- /foo.rs
mod bar {
mod $0
}
//- /foo/bar/baz.rs
fn baz() {}
"#,
expect![[r#"
md baz;
"#]],
@ -299,16 +299,16 @@ fn baz() {}
fn already_declared_bin_module_completion_omitted() {
check(
r#"
//- /src/bin.rs crate:main
fn main() {}
//- /src/bin/foo.rs
mod $0
//- /src/bin/bar.rs
mod foo;
fn bar() {}
//- /src/bin/bar/bar_ignored.rs
fn bar_ignored() {}
"#,
//- /src/bin.rs crate:main
fn main() {}
//- /src/bin/foo.rs
mod $0
//- /src/bin/bar.rs
mod foo;
fn bar() {}
//- /src/bin/bar/bar_ignored.rs
fn bar_ignored() {}
"#,
expect![[r#""#]],
);
}

8
crates/ide_completion/src/tests.rs
View File

@ -1,3 +1,9 @@
//! Tests and test utilities for completions.
//!
//! Most tests live in this module or its submodules unless for very specific completions like
//! `attributes` or `lifetimes` where the completed concept is a distinct thing.
//! Notable examples for completions that are being tested in this module's submodule are paths.
mod item_list;
mod use_tree;
@ -32,7 +38,7 @@
},
};
fn completion_list(code: &str) -> String {
pub(crate) fn completion_list(code: &str) -> String {
completion_list_with_config(TEST_CONFIG, code)
}