fix: record completion filtering #13028

yue4u · 2022-08-15T16:27:34Z

yue4u · 2022-08-15T16:32:43Z

crates/ide-completion/src/render/variant.rs

@@ -94,3 +94,12 @@ pub(crate) fn format_literal_label(name: &str, kind: StructKind) -> SmolStr {
        StructKind::Unit => name.into(),
    }
 }
+
+/// Format a struct, etc. literal option for lookup used in completions filtering.
+pub(crate) fn format_literal_lookup(name: &str, kind: StructKind) -> SmolStr {


() and {} are still needed as current testing infra does not allow duplicated lookup.

rust-analyzer/crates/ide-completion/src/tests.rs

Lines 186 to 190 in ec3586e

let (completion,) = completions

.iter()

.filter(|it| it.lookup() == what)

.collect_tuple()

.unwrap_or_else(|| panic!("can't find {:?} completion in {:#?}", what, completions));

I guess IDEs will happily accept duplicated lookup? Anyway these extra parentheses and brackets also allow completing something like E{ so I'd prefer to keep them here.

jonas-schievink · 2022-08-16T13:27:54Z

Thanks!

@bors r+

bors · 2022-08-16T13:27:55Z

📌 Commit 91358bd has been approved by jonas-schievink

It is now in the queue for this repository.

bors · 2022-08-16T13:28:03Z

⌛ Testing commit 91358bd with merge b6fae56...

bors · 2022-08-16T13:35:31Z

☀️ Test successful - checks-actions
Approved by: jonas-schievink
Pushing b6fae56 to master...

fix: format literal lookup

91358bd

yue4u commented Aug 15, 2022

View reviewed changes

bors merged commit b6fae56 into rust-lang:master Aug 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: record completion filtering #13028

fix: record completion filtering #13028

yue4u commented Aug 15, 2022

yue4u Aug 15, 2022

jonas-schievink commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

	let (completion,) = completions
	.iter()
	.filter(\|it\| it.lookup() == what)
	.collect_tuple()
	.unwrap_or_else(\|\| panic!("can't find {:?} completion in {:#?}", what, completions));

fix: record completion filtering #13028

fix: record completion filtering #13028

Conversation

yue4u commented Aug 15, 2022

yue4u Aug 15, 2022

Choose a reason for hiding this comment

jonas-schievink commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022