Make call_info a part of ide_db

Author: popzxc

Cargo.lock

@@ -21,7 +21,6 @@ base_db = { path = "../base_db", version = "0.0.0" }
 ide_db = { path = "../ide_db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
-call_info = { path = "../call_info", version = "0.0.0" }
 
 # completions crate should depend only on the top-level `hir` package. if you need
 # something from some `hir_xxx` subpackage, reexport the API via `hir`.

crates/call_info/Cargo.toml

@@ -1,9 +1,8 @@
 //! See `CompletionContext` structure.
 
 use base_db::{FilePosition, SourceDatabase};
-use call_info::ActiveParameter;
 use hir::{Local, ScopeDef, Semantics, SemanticsScope, Type};
-use ide_db::RootDatabase;
+use ide_db::{call_info::ActiveParameter, RootDatabase};
 use syntax::{
  algo::{find_covering_element, find_node_at_offset},
  ast, match_ast, AstNode, NodeOrToken,

crates/completion/Cargo.toml

@@ -30,7 +30,6 @@ profile = { path = "../profile", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
 assists = { path = "../assists", version = "0.0.0" }
 ssr = { path = "../ssr", version = "0.0.0" }
-call_info = { path = "../call_info", version = "0.0.0" }
 completion = { path = "../completion", version = "0.0.0" }
 
 # ide should depend only on the top-level `hir` package. if you need

crates/completion/src/completion_context.rs

@@ -2,8 +2,8 @@
 
 use indexmap::IndexMap;
 
-use call_info::FnCallNode;
 use hir::Semantics;
+use ide_db::call_info::FnCallNode;
 use ide_db::RootDatabase;
 use syntax::{ast, match_ast, AstNode, TextRange};
 

crates/ide/Cargo.toml

@@ -80,10 +80,10 @@ pub use crate::{
  Highlight, HighlightModifier, HighlightModifiers, HighlightTag, HighlightedRange,
  },
 };
-pub use call_info::CallInfo;
 pub use completion::{
  CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat,
 };
+pub use ide_db::call_info::CallInfo;
 
 pub use assists::{
  utils::MergeBehaviour, Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist,
@@ -396,7 +396,7 @@ impl Analysis {
 
  /// Computes parameter information for the given call expression.
  pub fn call_info(&self, position: FilePosition) -> Cancelable<Option<CallInfo>> {
- self.with_db(|db| call_info::call_info(db, position))
+ self.with_db(|db| ide_db::call_info::call_info(db, position))
  }
 
  /// Computes call hierarchy candidates for the given file position.

crates/ide/src/call_hierarchy.rs

@@ -3,8 +3,8 @@
 use std::{collections::BTreeMap, convert::TryFrom};
 
 use ast::{HasQuotes, HasStringValue};
-use call_info::ActiveParameter;
 use hir::Semantics;
+use ide_db::call_info::ActiveParameter;
 use itertools::Itertools;
 use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
 

crates/ide/src/lib.rs

@@ -29,3 +29,6 @@ test_utils = { path = "../test_utils", version = "0.0.0" }
 # ide should depend only on the top-level `hir` package. if you need
 # something from some `hir_xxx` subpackage, reexport the API via `hir`.
 hir = { path = "../hir", version = "0.0.0" }
+
+[dev-dependencies]
+expect-test = "1.0"

crates/ide/src/syntax_highlighting/injection.rs

@@ -2,14 +2,15 @@
 use base_db::FilePosition;
 use either::Either;
 use hir::{HasAttrs, HirDisplay, Semantics, Type};
-use ide_db::RootDatabase;
 use stdx::format_to;
 use syntax::{
  ast::{self, ArgListOwner},
  match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
 use test_utils::mark;
 
+use crate::RootDatabase;
+
 /// Contains information about a call site. Specifically the
 /// `FunctionSignature`and current parameter.
 #[derive(Debug)]
@@ -228,9 +229,9 @@ impl FnCallNode {
 
 #[cfg(test)]
 mod tests {
+ use crate::RootDatabase;
  use base_db::{fixture::ChangeFixture, FilePosition};
  use expect_test::{expect, Expect};
- use ide_db::RootDatabase;
  use test_utils::{mark, RangeOrOffset};
 
  /// Creates analysis from a multi-file fixture, returns positions marked with <|>.
@@ -249,7 +250,7 @@ mod tests {
 
  fn check(ra_fixture: &str, expect: Expect) {
  let (db, position) = position(ra_fixture);
- let call_info = crate::call_info(&db, position);
+ let call_info = crate::call_info::call_info(&db, position);
  let actual = match call_info {
  Some(call_info) => {
  let docs = match &call_info.doc {