language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Reexport PrefixKind to remove deps to hir

Browse source
This commit is contained in:
Edwin Cheng 2021-03-22 13:39:13 +08:00
parent 858ad55437
commit 7784cadc3d
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide_db/src/helpers/insert_use.rs
View file

@ -14,10 +14,12 @@ use syntax::{
AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken,
}; };
pub use hir::PrefixKind;
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct InsertUseConfig { pub struct InsertUseConfig {
pub merge: Option<MergeBehavior>, pub merge: Option<MergeBehavior>,
pub prefix_kind: hir::PrefixKind, pub prefix_kind: PrefixKind,
pub group: bool, pub group: bool,
} }

3
crates/rust-analyzer/src/config.rs
View file

@ -10,10 +10,9 @@
use std::{ffi::OsString, iter, path::PathBuf}; use std::{ffi::OsString, iter, path::PathBuf};
use flycheck::FlycheckConfig; use flycheck::FlycheckConfig;
use hir::PrefixKind;
use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig}; use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig};
use ide_db::helpers::{ use ide_db::helpers::{
insert_use::{InsertUseConfig, MergeBehavior}, insert_use::{InsertUseConfig, MergeBehavior, PrefixKind},
SnippetCap, SnippetCap,
}; };
use lsp_types::{ClientCapabilities, MarkupKind}; use lsp_types::{ClientCapabilities, MarkupKind};

6
crates/rust-analyzer/src/to_proto.rs
View file

@ -1073,9 +1073,11 @@ pub(crate) fn rename_error(err: RenameError) -> crate::LspError {
mod tests { mod tests {
use std::sync::Arc; use std::sync::Arc;
use hir::PrefixKind;
use ide::Analysis; use ide::Analysis;
use ide_db::helpers::{insert_use::InsertUseConfig, SnippetCap}; use ide_db::helpers::{
insert_use::{InsertUseConfig, PrefixKind},
SnippetCap,
};
use super::*; use super::*;