diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-22 15:31:47 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-22 15:31:47 +0000 |
commit | 0c37b3a0fc6d62cd1401320c53feb51a58ea09a6 (patch) | |
tree | 3798ba62e958b1c3642c30e4fab13011171b4837 /crates/ide/src/file_structure.rs | |
parent | a5322e3d5b813e4bce7a73762c14bebbd9a36e01 (diff) | |
parent | 08b822b25914bea7405a30383fe43c7235d14346 (diff) |
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 <[email protected]>
Diffstat (limited to 'crates/ide/src/file_structure.rs')
-rw-r--r-- | crates/ide/src/file_structure.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ide/src/file_structure.rs b/crates/ide/src/file_structure.rs index 32556dad3..26793bdb4 100644 --- a/crates/ide/src/file_structure.rs +++ b/crates/ide/src/file_structure.rs | |||
@@ -1,10 +1,9 @@ | |||
1 | use ide_db::SymbolKind; | ||
1 | use syntax::{ | 2 | use syntax::{ |
2 | ast::{self, AttrsOwner, GenericParamsOwner, NameOwner}, | 3 | ast::{self, AttrsOwner, GenericParamsOwner, NameOwner}, |
3 | match_ast, AstNode, SourceFile, SyntaxNode, TextRange, WalkEvent, | 4 | match_ast, AstNode, SourceFile, SyntaxNode, TextRange, WalkEvent, |
4 | }; | 5 | }; |
5 | 6 | ||
6 | use crate::SymbolKind; | ||
7 | |||
8 | #[derive(Debug, Clone)] | 7 | #[derive(Debug, Clone)] |
9 | pub struct StructureNode { | 8 | pub struct StructureNode { |
10 | pub parent: Option<usize>, | 9 | pub parent: Option<usize>, |