language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #7353

Browse source 
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>
This commit is contained in:
bors[bot] 2021-01-22 15:31:47 +00:00 • committed by GitHub
commit 0c37b3a0fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 227 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ide/src/syntax_highlighting/format.rs
View file

@ -1,10 +1,11 @@
//! Syntax highlighting for format macro strings.
use ide_db::SymbolKind;
use syntax::{
ast::{self, FormatSpecifier, HasFormatSpecifier},
AstNode, AstToken, TextRange,
};
use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag, SymbolKind};
use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag};
pub(super) fn highlight_format_string(
stack: &mut Highlights,

4
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -3,7 +3,7 @@
use hir::{AsAssocItem, Semantics, VariantDef};
use ide_db::{
defs::{Definition, NameClass, NameRefClass},
RootDatabase,
RootDatabase, SymbolKind,
};
use rustc_hash::FxHashMap;
use syntax::{
@ -12,7 +12,7 @@ use syntax::{
SyntaxNode, SyntaxToken, T,
};
use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag, SymbolKind};
use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag};
pub(super) fn element(
sema: &Semantics<RootDatabase>,

2
crates/ide/src/syntax_highlighting/tags.rs
View file

@ -3,7 +3,7 @@
use std::{fmt, ops};
use crate::SymbolKind;
use ide_db::SymbolKind;
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct Highlight {