Skip to content

Better fuzzy heuristics #6946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 19, 2020
Merged

Better fuzzy heuristics #6946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fa078f
Add a slightly better fuzzy search heuristics
SomeoneToIgnore Dec 19, 2020
8c292e3
Keep the original completion order in tests
SomeoneToIgnore Dec 19, 2020
0415dcd
Tidy up
SomeoneToIgnore Dec 19, 2020
b45ec84
Fewer allocations
SomeoneToIgnore Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions crates/completion/src/completions/attribute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ struct Test {}
at Hash
at PartialEq
at PartialEq, Eq
at PartialEq, Eq, PartialOrd, Ord
at PartialEq, PartialOrd
at PartialEq, Eq, PartialOrd, Ord
"#]],
);
}
Expand Down Expand Up @@ -457,10 +457,10 @@ struct Test {}
at Clone, Copy
at Debug
at Default
at Eq
at Eq, PartialOrd, Ord
at Hash
at Eq
at PartialOrd
at Eq, PartialOrd, Ord
"#]],
)
}
Expand All @@ -472,14 +472,14 @@ struct Test {}
expect![[r#"
at allow(…)
at automatically_derived
at cfg(…)
at cfg_attr(…)
at cfg(…)
at cold
at deny(…)
at deprecated = "…"
at derive(…)
at doc = "…"
at export_name = "…"
at doc = "…"
at forbid(…)
at ignore = "…"
at inline(…)
Expand Down Expand Up @@ -518,15 +518,15 @@ struct Test {}
expect![[r#"
at allow(…)
at automatically_derived
at cfg(…)
at cfg_attr(…)
at cfg(…)
at cold
at crate_name = ""
at deny(…)
at deprecated = "…"
at derive(…)
at doc = "…"
at export_name = "…"
at doc = "…"
at feature(…)
at forbid(…)
at global_allocator
Expand All @@ -538,8 +538,8 @@ struct Test {}
at macro_export
at macro_use
at must_use = "…"
at no_implicit_prelude
at no_link
at no_implicit_prelude
at no_main
at no_mangle
at no_std
Expand Down
8 changes: 4 additions & 4 deletions crates/completion/src/completions/dot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ impl S {
fn foo(s: S) { s.<|> }
"#,
expect![[r#"
me bar() fn bar(&self)
fd foo u32
me bar() fn bar(&self)
"#]],
);
}
Expand All @@ -98,8 +98,8 @@ impl S {
}
"#,
expect![[r#"
me foo() fn foo(self)
fd the_field (u32,)
me foo() fn foo(self)
"#]],
)
}
Expand All @@ -114,8 +114,8 @@ impl A {
}
"#,
expect![[r#"
me foo() fn foo(&self)
fd the_field (u32, i32)
me foo() fn foo(&self)
"#]],
)
}
Expand Down Expand Up @@ -147,8 +147,8 @@ mod inner {
fn foo(a: inner::A) { a.<|> }
"#,
expect![[r#"
fd crate_field u32
fd pub_field u32
fd crate_field u32
fd super_field u32
"#]],
);
Expand Down
142 changes: 71 additions & 71 deletions crates/completion/src/completions/keyword.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,21 +223,21 @@ mod tests {
check(
r"m<|>",
expect![[r#"
kw const
kw enum
kw extern
kw fn
kw use
kw impl
kw mod
kw pub
kw pub(crate)
kw static
kw struct
kw trait
kw type
kw enum
kw struct
kw union
kw mod
kw const
kw type
kw static
kw extern
kw unsafe
kw use
kw pub(crate)
kw pub
"#]],
);
}
Expand All @@ -247,23 +247,23 @@ mod tests {
check(
r"fn quux() { <|> }",
expect![[r#"
kw const
kw extern
kw fn
kw use
kw impl
kw trait
kw match
kw while
kw loop
kw if
kw if let
kw impl
kw let
kw loop
kw match
kw mod
kw return
kw static
kw trait
kw const
kw type
kw static
kw extern
kw unsafe
kw use
kw while
kw return
"#]],
);
}
Expand All @@ -273,23 +273,23 @@ mod tests {
check(
r"fn quux() { if true { <|> } }",
expect![[r#"
kw const
kw extern
kw fn
kw use
kw impl
kw trait
kw match
kw while
kw loop
kw if
kw if let
kw impl
kw let
kw loop
kw match
kw mod
kw return
kw static
kw trait
kw const
kw type
kw static
kw extern
kw unsafe
kw use
kw while
kw return
"#]],
);
}
Expand All @@ -299,25 +299,25 @@ mod tests {
check(
r#"fn quux() { if true { () } <|> }"#,
expect![[r#"
kw const
kw else
kw else if
kw extern
kw fn
kw use
kw impl
kw trait
kw match
kw while
kw loop
kw if
kw if let
kw impl
kw let
kw loop
kw match
kw else
kw else if
kw mod
kw return
kw static
kw trait
kw const
kw type
kw static
kw extern
kw unsafe
kw use
kw while
kw return
"#]],
);
check_edit(
Expand All @@ -336,13 +336,13 @@ fn quux() -> i32 {
}
"#,
expect![[r#"
kw match
kw while
kw loop
kw if
kw if let
kw loop
kw match
kw return
kw unsafe
kw while
kw return
"#]],
);
}
Expand All @@ -352,8 +352,8 @@ fn quux() -> i32 {
check(
r"trait My { <|> }",
expect![[r#"
kw const
kw fn
kw const
kw type
kw unsafe
"#]],
Expand All @@ -365,12 +365,12 @@ fn quux() -> i32 {
check(
r"impl My { <|> }",
expect![[r#"
kw const
kw fn
kw pub
kw pub(crate)
kw const
kw type
kw unsafe
kw pub(crate)
kw pub
"#]],
);
}
Expand All @@ -380,25 +380,25 @@ fn quux() -> i32 {
check(
r"fn my() { loop { <|> } }",
expect![[r#"
kw break
kw const
kw continue
kw extern
kw fn
kw use
kw impl
kw trait
kw match
kw while
kw loop
kw if
kw if let
kw impl
kw let
kw loop
kw match
kw mod
kw return
kw static
kw trait
kw const
kw type
kw static
kw extern
kw unsafe
kw use
kw while
kw continue
kw break
kw return
"#]],
);
}
Expand All @@ -409,8 +409,8 @@ fn quux() -> i32 {
r"unsafe <|>",
expect![[r#"
kw fn
kw impl
kw trait
kw impl
"#]],
);
}
Expand All @@ -421,8 +421,8 @@ fn quux() -> i32 {
r"fn my_fn() { unsafe <|> }",
expect![[r#"
kw fn
kw impl
kw trait
kw impl
"#]],
);
}
Expand Down Expand Up @@ -542,12 +542,12 @@ pub mod future {
check(
r#"fn main() { let _ = <|> }"#,
expect![[r#"
kw match
kw while
kw loop
kw if
kw if let
kw loop
kw match
kw return
kw while
"#]],
)
}
Expand All @@ -562,8 +562,8 @@ struct Foo {
}
"#,
expect![[r#"
kw pub
kw pub(crate)
kw pub
"#]],
)
}
Expand Down Expand Up @@ -600,12 +600,12 @@ fn foo() {
}
"#,
expect![[r#"
kw match
kw while
kw loop
kw if
kw if let
kw loop
kw match
kw return
kw while
"#]],
);
}
Expand Down
Loading