Merge #11639

11639: internal: Re-arrange ide_db modules r=Veykril a=Veykril

Thins out the `helpers` module by giving some items more appropriate places to live
bors r+

Co-authored-by: Lukas Wirth <[email protected]>

Author: bors[bot]

crates/hir/src/attrs.rs

@@ -149,6 +149,7 @@ fn resolve_doc_path(
     };
 
     let modpath = {
+        // FIXME: this is not how we should get a mod path here
         let ast_path = ast::SourceFile::parse(&format!("type T = {};", link))
             .syntax_node()
             .descendants()

crates/ide/src/expand_macro.rs

@@ -1,6 +1,6 @@
 use hir::Semantics;
 use ide_db::{
-    helpers::{insert_whitespace_into_node::insert_ws_into, pick_best_token},
+    helpers::pick_best_token, syntax_helpers::insert_whitespace_into_node::insert_ws_into,
     RootDatabase,
 };
 use syntax::{ast, ted, AstNode, NodeOrToken, SyntaxKind, SyntaxNode, T};

crates/ide/src/folding_ranges.rs

@@ -1,4 +1,4 @@
-use ide_db::helpers::node_ext::vis_eq;
+use ide_db::syntax_helpers::node_ext::vis_eq;
 use rustc_hash::FxHashSet;
 
 use syntax::{

crates/ide/src/highlight_related.rs

@@ -2,10 +2,9 @@ use hir::Semantics;
 use ide_db::{
     base_db::{FileId, FilePosition},
     defs::{Definition, IdentClass},
-    helpers::{
-        for_each_break_and_continue_expr, for_each_tail_expr, node_ext::walk_expr, pick_best_token,
-    },
+    helpers::pick_best_token,
     search::{FileReference, ReferenceCategory, SearchScope},
+    syntax_helpers::node_ext::{for_each_break_and_continue_expr, for_each_tail_expr, walk_expr},
     RootDatabase,
 };
 use rustc_hash::FxHashSet;

crates/ide/src/hover.rs

@@ -10,7 +10,8 @@ use hir::{HasSource, Semantics};
 use ide_db::{
     base_db::FileRange,
     defs::{Definition, IdentClass},
-    helpers::{pick_best_token, FamousDefs},
+    famous_defs::FamousDefs,
+    helpers::pick_best_token,
     FxIndexSet, RootDatabase,
 };
 use itertools::Itertools;

crates/ide/src/hover/render.rs

@@ -6,10 +6,8 @@ use hir::{AsAssocItem, AttributeTemplate, HasAttrs, HasSource, HirDisplay, Seman
 use ide_db::{
     base_db::SourceDatabase,
     defs::Definition,
-    helpers::{
-        generated_lints::{CLIPPY_LINTS, DEFAULT_LINTS, FEATURES},
-        FamousDefs,
-    },
+    famous_defs::FamousDefs,
+    generated::lints::{CLIPPY_LINTS, DEFAULT_LINTS, FEATURES},
     RootDatabase,
 };
 use itertools::Itertools;

crates/ide/src/inlay_hints.rs

@@ -1,6 +1,6 @@
 use either::Either;
 use hir::{known, Callable, HasVisibility, HirDisplay, Semantics, TypeInfo};
-use ide_db::{base_db::FileRange, helpers::FamousDefs, RootDatabase};
+use ide_db::{base_db::FileRange, famous_defs::FamousDefs, RootDatabase};
 use itertools::Itertools;
 use stdx::to_lower_snake_case;
 use syntax::{

crates/ide/src/join_lines.rs

@@ -1,5 +1,5 @@
 use ide_assists::utils::extract_trivial_expression;
-use ide_db::helpers::node_ext::expr_as_name_ref;
+use ide_db::syntax_helpers::node_ext::expr_as_name_ref;
 use itertools::Itertools;
 use syntax::{
     ast::{self, AstNode, AstToken, IsString},

crates/ide/src/syntax_highlighting/format.rs

@@ -1,6 +1,6 @@
 //! Syntax highlighting for format macro strings.
 use ide_db::{
-    helpers::format_string::{is_format_string, lex_format_specifiers, FormatSpecifier},
+    syntax_helpers::format_string::{is_format_string, lex_format_specifiers, FormatSpecifier},
     SymbolKind,
 };
 use syntax::{ast, TextRange};

crates/ide/src/syntax_highlighting/highlight.rs

@@ -3,7 +3,7 @@
 use hir::{AsAssocItem, HasVisibility, Semantics};
 use ide_db::{
     defs::{Definition, IdentClass, NameClass, NameRefClass},
-    helpers::FamousDefs,
+    famous_defs::FamousDefs,
     RootDatabase, SymbolKind,
 };
 use rustc_hash::FxHashMap;

crates/ide/src/syntax_highlighting/inject.rs

@@ -5,8 +5,7 @@ use std::mem;
 use either::Either;
 use hir::{InFile, Semantics};
 use ide_db::{
-    active_parameter::ActiveParameter, defs::Definition, helpers::rust_doc::is_rust_fence,
-    SymbolKind,
+    active_parameter::ActiveParameter, defs::Definition, rust_doc::is_rust_fence, SymbolKind,
 };
 use syntax::{
     ast::{self, AstNode, IsString, QuoteOffsets},

crates/ide_assists/src/assist_config.rs

@@ -4,7 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! assists if we are allowed to.
 
-use ide_db::helpers::{insert_use::InsertUseConfig, SnippetCap};
+use ide_db::{imports::insert_use::InsertUseConfig, SnippetCap};
 
 use crate::AssistKind;
 

crates/ide_assists/src/assist_context.rs

@@ -5,7 +5,7 @@ use std::mem;
 use hir::Semantics;
 use ide_db::{
     base_db::{AnchoredPathBuf, FileId, FileRange},
-    helpers::SnippetCap,
+    SnippetCap,
 };
 use ide_db::{
     label::Label,

crates/ide_assists/src/handlers/add_explicit_type.rs

@@ -1,5 +1,5 @@
 use hir::HirDisplay;
-use ide_db::helpers::node_ext::walk_ty;
+use ide_db::syntax_helpers::node_ext::walk_ty;
 use syntax::ast::{self, AstNode, LetStmt, Param};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};

crates/ide_assists/src/handlers/add_missing_impl_members.rs

@@ -1,5 +1,7 @@
 use hir::HasSource;
-use ide_db::{helpers::insert_whitespace_into_node::insert_ws_into, traits::resolve_target_trait};
+use ide_db::{
+    syntax_helpers::insert_whitespace_into_node::insert_ws_into, traits::resolve_target_trait,
+};
 use syntax::ast::{self, make, AstNode};
 
 use crate::{

crates/ide_assists/src/handlers/add_missing_match_arms.rs

@@ -2,8 +2,8 @@ use std::iter::{self, Peekable};
 
 use either::Either;
 use hir::{Adt, Crate, HasAttrs, HasSource, ModuleDef, Semantics};
-use ide_db::helpers::{mod_path_to_ast, FamousDefs};
 use ide_db::RootDatabase;
+use ide_db::{famous_defs::FamousDefs, helpers::mod_path_to_ast};
 use itertools::Itertools;
 use syntax::ast::{self, make, AstNode, HasName, MatchArmList, MatchExpr, Pat};
 

crates/ide_assists/src/handlers/auto_import.rs

@@ -1,7 +1,9 @@
-use ide_db::helpers::{
-    import_assets::{ImportAssets, ImportCandidate},
-    insert_use::{insert_use, ImportScope},
-    mod_path_to_ast,
+use ide_db::{
+    helpers::mod_path_to_ast,
+    imports::{
+        import_assets::{ImportAssets, ImportCandidate},
+        insert_use::{insert_use, ImportScope},
+    },
 };
 use syntax::{ast, AstNode, NodeOrToken, SyntaxElement};
 

crates/ide_assists/src/handlers/convert_bool_then.rs

@@ -1,9 +1,8 @@
 use hir::{known, AsAssocItem, Semantics};
 use ide_db::{
-    helpers::{
-        for_each_tail_expr,
-        node_ext::{block_as_lone_tail, is_pattern_cond, preorder_expr},
-        FamousDefs,
+    famous_defs::FamousDefs,
+    syntax_helpers::node_ext::{
+        block_as_lone_tail, for_each_tail_expr, is_pattern_cond, preorder_expr,
     },
     RootDatabase,
 };

crates/ide_assists/src/handlers/convert_into_to_from.rs

@@ -1,7 +1,4 @@
-use ide_db::{
-    helpers::{mod_path_to_ast, FamousDefs},
-    traits::resolve_target_trait,
-};
+use ide_db::{famous_defs::FamousDefs, helpers::mod_path_to_ast, traits::resolve_target_trait};
 use syntax::ast::{self, AstNode, HasName};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};

crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs

@@ -1,5 +1,5 @@
 use hir::known;
-use ide_db::helpers::FamousDefs;
+use ide_db::famous_defs::FamousDefs;
 use stdx::format_to;
 use syntax::{
     ast::{self, edit_in_place::Indent, make, HasArgList, HasLoopBody},

crates/ide_assists/src/handlers/convert_to_guarded_return.rs

@@ -1,6 +1,6 @@
 use std::iter::once;
 
-use ide_db::helpers::node_ext::{is_pattern_cond, single_let};
+use ide_db::syntax_helpers::node_ext::{is_pattern_cond, single_let};
 use syntax::{
     ast::{
         self,

crates/ide_assists/src/handlers/convert_while_to_loop.rs

@@ -1,6 +1,6 @@
 use std::iter::once;
 
-use ide_db::helpers::node_ext::is_pattern_cond;
+use ide_db::syntax_helpers::node_ext::is_pattern_cond;
 use syntax::{
     ast::{
         self,

crates/ide_assists/src/handlers/extract_function.rs

@@ -5,13 +5,11 @@ use either::Either;
 use hir::{HirDisplay, InFile, Local, ModuleDef, Semantics, TypeInfo};
 use ide_db::{
     defs::{Definition, NameRefClass},
-    helpers::{
-        insert_use::{insert_use, ImportScope},
-        mod_path_to_ast,
-        node_ext::{preorder_expr, walk_expr, walk_pat, walk_patterns_in_expr},
-        FamousDefs,
-    },
+    famous_defs::FamousDefs,
+    helpers::mod_path_to_ast,
+    imports::insert_use::{insert_use, ImportScope},
     search::{FileReference, ReferenceCategory, SearchScope},
+    syntax_helpers::node_ext::{preorder_expr, walk_expr, walk_pat, walk_patterns_in_expr},
     FxIndexSet, RootDatabase,
 };
 use itertools::Itertools;

crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs

@@ -4,10 +4,8 @@ use either::Either;
 use hir::{Module, ModuleDef, Name, Variant};
 use ide_db::{
     defs::Definition,
-    helpers::{
-        insert_use::{insert_use, ImportScope, InsertUseConfig},
-        mod_path_to_ast,
-    },
+    helpers::mod_path_to_ast,
+    imports::insert_use::{insert_use, ImportScope, InsertUseConfig},
     search::FileReference,
     RootDatabase,
 };

crates/ide_assists/src/handlers/extract_type_alias.rs

@@ -1,5 +1,5 @@
 use either::Either;
-use ide_db::helpers::node_ext::walk_ty;
+use ide_db::syntax_helpers::node_ext::walk_ty;
 use itertools::Itertools;
 use syntax::{
     ast::{self, edit::IndentLevel, AstNode, HasGenericParams, HasName},

crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs

@@ -1,4 +1,4 @@
-use ide_db::{helpers::FamousDefs, RootDatabase};
+use ide_db::{famous_defs::FamousDefs, RootDatabase};
 use syntax::ast::{self, AstNode, HasName};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};

crates/ide_assists/src/handlers/generate_default_from_new.rs

@@ -1,4 +1,4 @@
-use ide_db::helpers::FamousDefs;
+use ide_db::famous_defs::FamousDefs;
 use itertools::Itertools;
 use stdx::format_to;
 use syntax::{

crates/ide_assists/src/handlers/generate_deref.rs

@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use ide_db::{helpers::FamousDefs, RootDatabase};
+use ide_db::{famous_defs::FamousDefs, RootDatabase};
 use syntax::{
     ast::{self, HasName},
     AstNode, SyntaxNode,

crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs

@@ -1,5 +1,4 @@
-use ide_db::helpers::FamousDefs;
-use ide_db::RootDatabase;
+use ide_db::{famous_defs::FamousDefs, RootDatabase};
 use syntax::ast::{self, AstNode, HasName};
 
 use crate::{utils::generate_trait_impl_text, AssistContext, AssistId, AssistKind, Assists};

crates/ide_assists/src/handlers/generate_function.rs

@@ -1,12 +1,11 @@
 use rustc_hash::{FxHashMap, FxHashSet};
 
 use hir::{HasSource, HirDisplay, Module, Semantics, TypeInfo};
-use ide_db::helpers::FamousDefs;
 use ide_db::{
     base_db::FileId,
     defs::{Definition, NameRefClass},
-    helpers::SnippetCap,
-    RootDatabase,
+    famous_defs::FamousDefs,
+    RootDatabase, SnippetCap,
 };
 use stdx::to_lower_snake_case;
 use syntax::{

crates/ide_assists/src/handlers/generate_getter.rs

@@ -1,4 +1,4 @@
-use ide_db::helpers::FamousDefs;
+use ide_db::famous_defs::FamousDefs;
 use stdx::{format_to, to_lower_snake_case};
 use syntax::ast::{self, AstNode, HasName, HasVisibility};
 

crates/ide_assists/src/handlers/inline_call.rs

@@ -4,9 +4,10 @@ use hir::{db::HirDatabase, PathResolution, Semantics, TypeInfo};
 use ide_db::{
     base_db::{FileId, FileRange},
     defs::Definition,
-    helpers::{insert_use::remove_path_if_in_use_stmt, node_ext::expr_as_name_ref},
+    imports::insert_use::remove_path_if_in_use_stmt,
     path_transform::PathTransform,
     search::{FileReference, SearchScope},
+    syntax_helpers::node_ext::expr_as_name_ref,
     RootDatabase,
 };
 use itertools::{izip, Itertools};

crates/ide_assists/src/handlers/invert_if.rs

@@ -1,4 +1,4 @@
-use ide_db::helpers::node_ext::is_pattern_cond;
+use ide_db::syntax_helpers::node_ext::is_pattern_cond;
 use syntax::{
     ast::{self, AstNode},
     T,

crates/ide_assists/src/handlers/merge_imports.rs

@@ -1,4 +1,4 @@
-use ide_db::helpers::merge_imports::{try_merge_imports, try_merge_trees, MergeBehavior};
+use ide_db::imports::merge_imports::{try_merge_imports, try_merge_trees, MergeBehavior};
 use syntax::{algo::neighbor, ast, ted, AstNode};
 
 use crate::{

crates/ide_assists/src/handlers/promote_local_to_const.rs

@@ -2,7 +2,7 @@ use hir::{HirDisplay, ModuleDef, PathResolution, Semantics};
 use ide_db::{
     assists::{AssistId, AssistKind},
     defs::Definition,
-    helpers::node_ext::preorder_expr,
+    syntax_helpers::node_ext::preorder_expr,
     RootDatabase,
 };
 use stdx::to_upper_snake_case;

crates/ide_assists/src/handlers/qualify_method_call.rs

@@ -1,7 +1,7 @@
 use hir::{ItemInNs, ModuleDef};
 use ide_db::{
     assists::{AssistId, AssistKind},
-    helpers::import_assets::item_for_path_search,
+    imports::import_assets::item_for_path_search,
 };
 use syntax::{ast, AstNode};
 

crates/ide_assists/src/handlers/qualify_path.rs

@@ -1,11 +1,11 @@
 use std::iter;
 
 use hir::AsAssocItem;
-use ide_db::helpers::{
-    import_assets::{ImportCandidate, LocatedImport},
-    mod_path_to_ast,
-};
 use ide_db::RootDatabase;
+use ide_db::{
+    helpers::mod_path_to_ast,
+    imports::import_assets::{ImportCandidate, LocatedImport},
+};
 use syntax::{
     ast,
     ast::{make, HasArgList},

crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs

@@ -1,9 +1,7 @@
 use hir::{InFile, ModuleDef};
 use ide_db::{
-    helpers::{
-        import_assets::NameToImport, insert_whitespace_into_node::insert_ws_into, mod_path_to_ast,
-    },
-    items_locator,
+    helpers::mod_path_to_ast, imports::import_assets::NameToImport, items_locator,
+    syntax_helpers::insert_whitespace_into_node::insert_ws_into,
 };
 use itertools::Itertools;
 use syntax::{

crates/ide_assists/src/handlers/replace_if_let_with_match.rs

@@ -3,7 +3,7 @@ use std::iter::{self, successors};
 use either::Either;
 use ide_db::{
     defs::NameClass,
-    helpers::node_ext::{is_pattern_cond, single_let},
+    syntax_helpers::node_ext::{is_pattern_cond, single_let},
     ty_filter::TryEnum,
     RootDatabase,
 };

crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs

@@ -1,7 +1,7 @@
 use hir::AsAssocItem;
-use ide_db::helpers::{
-    insert_use::{insert_use, ImportScope},
-    mod_path_to_ast,
+use ide_db::{
+    helpers::mod_path_to_ast,
+    imports::insert_use::{insert_use, ImportScope},
 };
 use syntax::{
     ast::{self, make},

crates/ide_assists/src/handlers/unwrap_result_return_type.rs

@@ -1,4 +1,7 @@
-use ide_db::helpers::{for_each_tail_expr, node_ext::walk_expr, FamousDefs};
+use ide_db::{
+    famous_defs::FamousDefs,
+    syntax_helpers::node_ext::{for_each_tail_expr, walk_expr},
+};
 use itertools::Itertools;
 use syntax::{
     ast::{self, Expr},

crates/ide_assists/src/handlers/wrap_return_type_in_result.rs

@@ -1,6 +1,9 @@
 use std::iter;
 
-use ide_db::helpers::{for_each_tail_expr, node_ext::walk_expr, FamousDefs};
+use ide_db::{
+    famous_defs::FamousDefs,
+    syntax_helpers::node_ext::{for_each_tail_expr, walk_expr},
+};
 use syntax::{
     ast::{self, make, Expr},
     match_ast, AstNode,