diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-18 11:41:46 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-18 11:41:46 +0100 |
commit | 886cfd68212bb0b4487d6a822476c350a6eb114f (patch) | |
tree | 5b144eabe1eaf62aa1ec5b804ee6fff00f5f84e9 /crates/ide/src/syntax_highlighting/injection.rs | |
parent | 2067a410f31810f6e1941a86cdea0247c3b7d6f4 (diff) | |
parent | 9e7c952bbddc2e6763c49f0511a295362e9893d6 (diff) |
Merge #6276
6276: Extract call_info and completion into separate crates r=matklad a=popzxc
As it was discussed in [zulip](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Completion.20refactoring), we need to move `completions` into a separate crate.
Unfortunately, the dependency on `call_info::ActiveParameter` doesn't look easy to get rid of, and it seems to be a topic for a separate PR, thus I also extracted `call_info` into a separate crate (on which both `ide` and `completion` crates depend).
Additionally, a few `FIXME`s in doc-comments were resolved in order to make `tidy` happy.
Co-authored-by: Igor Aleksanov <[email protected]>
Diffstat (limited to 'crates/ide/src/syntax_highlighting/injection.rs')
-rw-r--r-- | crates/ide/src/syntax_highlighting/injection.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs index 43f4e6fea..acd91b26c 100644 --- a/crates/ide/src/syntax_highlighting/injection.rs +++ b/crates/ide/src/syntax_highlighting/injection.rs | |||
@@ -3,14 +3,12 @@ | |||
3 | use std::{collections::BTreeMap, convert::TryFrom}; | 3 | use std::{collections::BTreeMap, convert::TryFrom}; |
4 | 4 | ||
5 | use ast::{HasQuotes, HasStringValue}; | 5 | use ast::{HasQuotes, HasStringValue}; |
6 | use call_info::ActiveParameter; | ||
6 | use hir::Semantics; | 7 | use hir::Semantics; |
7 | use itertools::Itertools; | 8 | use itertools::Itertools; |
8 | use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; | 9 | use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; |
9 | 10 | ||
10 | use crate::{ | 11 | use crate::{Analysis, Highlight, HighlightModifier, HighlightTag, HighlightedRange, RootDatabase}; |
11 | call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag, | ||
12 | HighlightedRange, RootDatabase, | ||
13 | }; | ||
14 | 12 | ||
15 | use super::HighlightedRangeStack; | 13 | use super::HighlightedRangeStack; |
16 | 14 | ||