diff options
author | Aleksey Kladov <[email protected]> | 2021-06-14 11:15:05 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2021-06-14 15:45:17 +0100 |
commit | 1d2772c2c7dc0a42d8a9429d24ea41412add61b3 (patch) | |
tree | 2e727c6465f972b7f62857bc1143e08f4b4416d4 /crates/ide/src/lib.rs | |
parent | 3d2f0400a26ef6b07d61a06e1b543072b627570e (diff) |
internal: move diagnostics to a new crate
Diffstat (limited to 'crates/ide/src/lib.rs')
-rw-r--r-- | crates/ide/src/lib.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 0511efae3..0019b7ba5 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -24,7 +24,6 @@ mod display; | |||
24 | 24 | ||
25 | mod annotations; | 25 | mod annotations; |
26 | mod call_hierarchy; | 26 | mod call_hierarchy; |
27 | mod diagnostics; | ||
28 | mod expand_macro; | 27 | mod expand_macro; |
29 | mod extend_selection; | 28 | mod extend_selection; |
30 | mod file_structure; | 29 | mod file_structure; |
@@ -71,7 +70,6 @@ use crate::display::ToNav; | |||
71 | pub use crate::{ | 70 | pub use crate::{ |
72 | annotations::{Annotation, AnnotationConfig, AnnotationKind}, | 71 | annotations::{Annotation, AnnotationConfig, AnnotationKind}, |
73 | call_hierarchy::CallItem, | 72 | call_hierarchy::CallItem, |
74 | diagnostics::{Diagnostic, DiagnosticsConfig, Severity}, | ||
75 | display::navigation_target::NavigationTarget, | 73 | display::navigation_target::NavigationTarget, |
76 | expand_macro::ExpandedMacro, | 74 | expand_macro::ExpandedMacro, |
77 | file_structure::{StructureNode, StructureNodeKind}, | 75 | file_structure::{StructureNode, StructureNodeKind}, |
@@ -109,6 +107,7 @@ pub use ide_db::{ | |||
109 | symbol_index::Query, | 107 | symbol_index::Query, |
110 | RootDatabase, SymbolKind, | 108 | RootDatabase, SymbolKind, |
111 | }; | 109 | }; |
110 | pub use ide_diagnostics::{Diagnostic, DiagnosticsConfig, Severity}; | ||
112 | pub use ide_ssr::SsrError; | 111 | pub use ide_ssr::SsrError; |
113 | pub use syntax::{TextRange, TextSize}; | 112 | pub use syntax::{TextRange, TextSize}; |
114 | pub use text_edit::{Indel, TextEdit}; | 113 | pub use text_edit::{Indel, TextEdit}; |
@@ -549,7 +548,7 @@ impl Analysis { | |||
549 | resolve: AssistResolveStrategy, | 548 | resolve: AssistResolveStrategy, |
550 | file_id: FileId, | 549 | file_id: FileId, |
551 | ) -> Cancellable<Vec<Diagnostic>> { | 550 | ) -> Cancellable<Vec<Diagnostic>> { |
552 | self.with_db(|db| diagnostics::diagnostics(db, config, &resolve, file_id)) | 551 | self.with_db(|db| ide_diagnostics::diagnostics(db, config, &resolve, file_id)) |
553 | } | 552 | } |
554 | 553 | ||
555 | /// Convenience function to return assists + quick fixes for diagnostics | 554 | /// Convenience function to return assists + quick fixes for diagnostics |
@@ -568,7 +567,7 @@ impl Analysis { | |||
568 | self.with_db(|db| { | 567 | self.with_db(|db| { |
569 | let ssr_assists = ssr::ssr_assists(db, &resolve, frange); | 568 | let ssr_assists = ssr::ssr_assists(db, &resolve, frange); |
570 | let diagnostic_assists = if include_fixes { | 569 | let diagnostic_assists = if include_fixes { |
571 | diagnostics::diagnostics(db, diagnostics_config, &resolve, frange.file_id) | 570 | ide_diagnostics::diagnostics(db, diagnostics_config, &resolve, frange.file_id) |
572 | .into_iter() | 571 | .into_iter() |
573 | .flat_map(|it| it.fixes.unwrap_or_default()) | 572 | .flat_map(|it| it.fixes.unwrap_or_default()) |
574 | .filter(|it| it.target.intersect(frange.range).is_some()) | 573 | .filter(|it| it.target.intersect(frange.range).is_some()) |