]> git.lizzy.rs Git - rust.git/commit
Merge #7353
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Fri, 22 Jan 2021 15:31:47 +0000 (15:31 +0000)
committerGitHub <noreply@github.com>
Fri, 22 Jan 2021 15:31:47 +0000 (15:31 +0000)
commit0c37b3a0fc6d62cd1401320c53feb51a58ea09a6
tree3798ba62e958b1c3642c30e4fab13011171b4837
parenta5322e3d5b813e4bce7a73762c14bebbd9a36e01
parent08b822b25914bea7405a30383fe43c7235d14346
Merge #7353

7353: Add LifetimeParam and ConstParam to CompletionItemKind r=matklad a=Veykril

Adds `LifetimeParam` and `ConstParam` to `CompletionItemKind` and maps them both to `TypeParam` in the protocol conversion as there are no equivalents, so nothing really changes there.
`ConstParam` could be mapped to `Const` I guess but I'm split on whether that would be better?

Additions were solely inspired by (the single) test output for const params.

Also sorts the variants of `CompletionItemKind` and its to_proto match.

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
crates/ide/src/display/navigation_target.rs
crates/ide/src/runnables.rs
crates/ide/src/syntax_highlighting/format.rs
crates/rust-analyzer/src/handlers.rs