mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the helpers into ide_db

Browse Source
This commit is contained in:
Kirill Bulatov 2020-11-28 16:30:39 +02:00
parent 7b145bd99c
commit 3f612d37c6
27 changed files with 29 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@ -53,7 +53,6 @@ dependencies = [
"either",
"hir",
"ide_db",
"ide_helpers",
"itertools",
"profile",
"rustc-hash",
@ -259,7 +258,6 @@ dependencies = [
"expect-test",
"hir",
"ide_db",
"ide_helpers",
"itertools",
"log",
"profile",
@ -658,7 +656,6 @@ dependencies = [
"expect-test",
"hir",
"ide_db",
"ide_helpers",
"indexmap",
"itertools",
"log",
@ -684,6 +681,7 @@ dependencies = [
"expect-test",
"fst",
"hir",
"itertools",
"log",
"once_cell",
"profile",
@ -695,19 +693,6 @@ dependencies = [
"text_edit",
]
[[package]]
name = "ide_helpers"
version = "0.0.0"
dependencies = [
"either",
"hir",
"ide_db",
"itertools",
"profile",
"syntax",
"test_utils",
]
[[package]]
name = "idna"
version = "0.2.0"
@ -1376,7 +1361,6 @@ dependencies = [
"hir_ty",
"ide",
"ide_db",
"ide_helpers",
"itertools",
"jod-thread",
"log",

1
crates/assists/Cargo.toml
View File

@ -21,4 +21,3 @@ profile = { path = "../profile", version = "0.0.0" }
ide_db = { path = "../ide_db", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
test_utils = { path = "../test_utils", version = "0.0.0" }
ide_helpers = { path = "../ide_helpers", version = "0.0.0" }

2
crates/assists/src/assist_config.rs
View File

@ -5,7 +5,7 @@
//! assists if we are allowed to.
use hir::PrefixKind;
use ide_helpers::insert_use::MergeBehaviour;
use ide_db::helpers::insert_use::MergeBehaviour;
use crate::AssistKind;

2
crates/assists/src/ast_transform.rs
View File

@ -1,6 +1,6 @@
//! `AstTransformer`s are functions that replace nodes in an AST and can be easily combined.
use hir::{HirDisplay, PathResolution, SemanticsScope};
use ide_helpers::mod_path_to_ast;
use ide_db::helpers::mod_path_to_ast;
use rustc_hash::FxHashMap;
use syntax::{
algo::SyntaxRewriter,

2
crates/assists/src/handlers/auto_import.rs
View File

@ -1,4 +1,4 @@
use ide_helpers::{
use ide_db::helpers::{
insert_use::{insert_use, ImportScope},
mod_path_to_ast,
};

6
crates/assists/src/handlers/extract_struct_from_enum_variant.rs
View File

@ -2,11 +2,11 @@
use either::Either;
use hir::{AsName, EnumVariant, Module, ModuleDef, Name};
use ide_db::{defs::Definition, search::Reference, RootDatabase};
use ide_helpers::{
use ide_db::helpers::{
insert_use::{insert_use, ImportScope},
mod_path_to_ast,
};
use ide_db::{defs::Definition, search::Reference, RootDatabase};
use rustc_hash::{FxHashMap, FxHashSet};
use syntax::{
algo::{find_node_at_offset, SyntaxRewriter},
@ -237,7 +237,7 @@ fn update_reference(
#[cfg(test)]
mod tests {
use ide_helpers::FamousDefs;
use ide_db::helpers::FamousDefs;
use crate::tests::{check_assist, check_assist_not_applicable};

4
crates/assists/src/handlers/fill_match_arms.rs
View File

@ -1,8 +1,8 @@
use std::iter;
use hir::{Adt, HasSource, ModuleDef, Semantics};
use ide_db::helpers::{mod_path_to_ast, FamousDefs};
use ide_db::RootDatabase;
use ide_helpers::{mod_path_to_ast, FamousDefs};
use itertools::Itertools;
use syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat};
use test_utils::mark;
@ -213,7 +213,7 @@ fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::EnumVariant) -> O
#[cfg(test)]
mod tests {
use ide_helpers::FamousDefs;
use ide_db::helpers::FamousDefs;
use test_utils::mark;
use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};

2
crates/assists/src/handlers/generate_from_impl_for_enum.rs
View File

@ -1,5 +1,5 @@
use ide_db::helpers::FamousDefs;
use ide_db::RootDatabase;
use ide_helpers::FamousDefs;
use syntax::ast::{self, AstNode, NameOwner};
use test_utils::mark;

2
crates/assists/src/handlers/merge_imports.rs
View File

@ -1,4 +1,4 @@
use ide_helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehaviour};
use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehaviour};
use syntax::{
algo::{neighbor, SyntaxRewriter},
ast, AstNode,

2
crates/assists/src/handlers/qualify_path.rs
View File

@ -1,8 +1,8 @@
use std::iter;
use hir::AsName;
use ide_db::helpers::mod_path_to_ast;
use ide_db::RootDatabase;
use ide_helpers::mod_path_to_ast;
use syntax::{
ast,
ast::{make, ArgListOwner},

2
crates/assists/src/handlers/replace_derive_with_manual_impl.rs
View File

@ -1,5 +1,5 @@
use ide_db::helpers::mod_path_to_ast;
use ide_db::imports_locator;
use ide_helpers::mod_path_to_ast;
use itertools::Itertools;
use syntax::{
ast::{self, make, AstNode},

2
crates/assists/src/handlers/replace_qualified_name_with_use.rs
View File

@ -1,4 +1,4 @@
use ide_helpers::insert_use::{insert_use, ImportScope};
use ide_db::helpers::insert_use::{insert_use, ImportScope};
use syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SyntaxNode};
use test_utils::mark;

1
crates/completion/Cargo.toml
View File

@ -22,7 +22,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" }
ide_helpers = { path = "../ide_helpers", 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`.

4
crates/completion/src/completions/record.rs
View File

@ -1,5 +1,5 @@
//! Complete fields in record literals and patterns.
use ide_helpers::FamousDefs;
use ide_db::helpers::FamousDefs;
use syntax::ast::Expr;
use crate::{
@ -46,7 +46,7 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
#[cfg(test)]
mod tests {
use expect_test::{expect, Expect};
use ide_helpers::FamousDefs;
use ide_db::helpers::FamousDefs;
use crate::{test_utils::completion_list, CompletionKind};

2
crates/completion/src/completions/unqualified_path.rs
View File

@ -2,8 +2,8 @@
use either::Either;
use hir::{Adt, ModuleDef, ScopeDef, Type};
use ide_db::helpers::insert_use::ImportScope;
use ide_db::imports_locator;
use ide_helpers::insert_use::ImportScope;
use syntax::AstNode;
use test_utils::mark;

2
crates/completion/src/config.rs
View File

@ -4,7 +4,7 @@
//! module, and we use to statically check that we only produce snippet
//! completions if we are allowed to.
use ide_helpers::insert_use::MergeBehaviour;
use ide_db::helpers::insert_use::MergeBehaviour;
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct CompletionConfig {

2
crates/completion/src/item.rs
View File

@ -3,7 +3,7 @@
use std::fmt;
use hir::{Documentation, ModPath, Mutability};
use ide_helpers::{
use ide_db::helpers::{
insert_use::{self, ImportScope, MergeBehaviour},
mod_path_to_ast,
};

2
crates/completion/src/render.rs
View File

@ -10,8 +10,8 @@
mod builder_ext;
use hir::{Documentation, HasAttrs, HirDisplay, ModPath, Mutability, ScopeDef, Type};
use ide_db::helpers::insert_use::{ImportScope, MergeBehaviour};
use ide_db::RootDatabase;
use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
use syntax::TextRange;
use test_utils::mark;

1
crates/ide/Cargo.toml
View File

@ -24,7 +24,6 @@ stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
text_edit = { path = "../text_edit", version = "0.0.0" }
ide_db = { path = "../ide_db", version = "0.0.0" }
ide_helpers = { path = "../ide_helpers", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
test_utils = { path = "../test_utils", version = "0.0.0" }

4
crates/ide/src/inlay_hints.rs
View File

@ -1,7 +1,7 @@
use either::Either;
use hir::{known, Callable, HirDisplay, Semantics};
use ide_db::helpers::FamousDefs;
use ide_db::RootDatabase;
use ide_helpers::FamousDefs;
use stdx::to_lower_snake_case;
use syntax::{
ast::{self, ArgListOwner, AstNode, NameOwner},
@ -428,7 +428,7 @@ fn get_callable(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<hir:
#[cfg(test)]
mod tests {
use expect_test::{expect, Expect};
use ide_helpers::FamousDefs;
use ide_db::helpers::FamousDefs;
use test_utils::extract_annotations;
use crate::{fixture, inlay_hints::InlayHintsConfig};

3
crates/ide_db/Cargo.toml
View File

@ -18,7 +18,8 @@ rayon = "1.5.0"
fst = { version = "0.4", default-features = false }
rustc-hash = "1.1.0"
once_cell = "1.3.1"
either = "1.5.3"
either = "1.6.1"
itertools = "0.9.0"
stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }

2
crates/ide_helpers/src/lib.rs → crates/ide_db/src/helpers.rs
View File

@ -1,6 +1,6 @@
//! A module with ide helpers for high-level ide features.
use crate::RootDatabase;
use hir::{Crate, Enum, Module, ScopeDef, Semantics, Trait};
use ide_db::RootDatabase;
use syntax::ast::{self, make};
pub mod insert_use;

2
crates/ide_helpers/src/insert_use.rs → crates/ide_db/src/helpers/insert_use.rs
View File

@ -1,8 +1,8 @@
//! Handle syntactic aspects of inserting a new `use`.
use std::{cmp::Ordering, iter::successors};
use crate::RootDatabase;
use hir::Semantics;
use ide_db::RootDatabase;
use itertools::{EitherOrBoth, Itertools};
use syntax::{
algo::SyntaxRewriter,

1
crates/ide_db/src/lib.rs
View File

@ -13,6 +13,7 @@
pub mod ty_filter;
pub mod traits;
pub mod call_info;
pub mod helpers;
use std::{fmt, sync::Arc};

23
crates/ide_helpers/Cargo.toml
View File

@ -1,23 +0,0 @@
[package]
name = "ide_helpers"
version = "0.0.0"
description = "A set of helper methods shared between various ide-level modules"
license = "MIT OR Apache-2.0"
authors = ["rust-analyzer developers"]
edition = "2018"
[lib]
doctest = false
[features]
wasm = []
[dependencies]
either = "1.6.1"
itertools = "0.9.0"
syntax = { path = "../syntax", version = "0.0.0" }
ide_db = { path = "../ide_db", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
test_utils = { path = "../test_utils", version = "0.0.0" }

3
crates/rust-analyzer/Cargo.toml
View File

@ -39,7 +39,7 @@ tracing-tree = { version = "0.1.4" }
stdx = { path = "../stdx", version = "0.0.0" }
flycheck = { path = "../flycheck", version = "0.0.0" }
ide = { path = "../ide", version = "0.0.0" }
ide_helpers = { path = "../ide_helpers", version = "0.0.0" }
ide_db = { path = "../ide_db", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
project_model = { path = "../project_model", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
@ -50,7 +50,6 @@ cfg = { path = "../cfg", version = "0.0.0" }
toolchain = { path = "../toolchain", version = "0.0.0" }
# This should only be used in CLI
ide_db = { path = "../ide_db", version = "0.0.0" }
ssr = { path = "../ssr", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
hir_def = { path = "../hir_def", version = "0.0.0" }

2
crates/rust-analyzer/src/config.rs
View File

@ -12,7 +12,7 @@
use flycheck::FlycheckConfig;
use hir::PrefixKind;
use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig};
use ide_helpers::insert_use::MergeBehaviour;
use ide_db::helpers::insert_use::MergeBehaviour;
use lsp_types::{ClientCapabilities, MarkupKind};
use project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
use rustc_hash::FxHashSet;