Skip to content

Commit 8328e19

Browse files
committed
move diagnostics to a separate file
1 parent e4a6343 commit 8328e19

File tree

2 files changed

+22
-27
lines changed

2 files changed

+22
-27
lines changed

crates/ra_ide_api/src/imp.rs renamed to crates/ra_ide_api/src/diagnostics.rs

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
use hir::{
2-
self, Problem, source_binder
3-
};
4-
use ra_ide_api_light::{self, LocalEdit, Severity};
1+
use hir::{Problem, source_binder};
2+
use ra_ide_api_light::Severity;
53
use ra_db::SourceDatabase;
64

7-
use crate::{
8-
db, Diagnostic, FileId, FilePosition, FileSystemEdit,
9-
SourceChange, SourceFileEdit,
10-
};
5+
use crate::{db, Diagnostic, FileId, FileSystemEdit, SourceChange};
116

127
impl db::RootDatabase {
138
pub(crate) fn diagnostics(&self, file_id: FileId) -> Vec<Diagnostic> {
@@ -74,20 +69,3 @@ impl db::RootDatabase {
7469
res
7570
}
7671
}
77-
78-
impl SourceChange {
79-
pub(crate) fn from_local_edit(file_id: FileId, edit: LocalEdit) -> SourceChange {
80-
let file_edit = SourceFileEdit {
81-
file_id,
82-
edit: edit.edit,
83-
};
84-
SourceChange {
85-
label: edit.label,
86-
source_file_edits: vec![file_edit],
87-
file_system_edits: vec![],
88-
cursor_position: edit
89-
.cursor_position
90-
.map(|offset| FilePosition { offset, file_id }),
91-
}
92-
}
93-
}

crates/ra_ide_api/src/lib.rs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![recursion_limit = "128"]
1515

1616
mod db;
17-
mod imp;
1817
pub mod mock_analysis;
1918
mod symbol_index;
2019
mod navigation_target;
@@ -32,6 +31,7 @@ mod parent_module;
3231
mod references;
3332
mod impls;
3433
mod assists;
34+
mod diagnostics;
3535

3636
#[cfg(test)]
3737
mod marks;
@@ -58,7 +58,7 @@ pub use crate::{
5858
change::{AnalysisChange, LibraryData},
5959
};
6060
pub use ra_ide_api_light::{
61-
Fold, FoldKind, HighlightedRange, Severity, StructureNode,
61+
Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit,
6262
LineIndex, LineCol, translate_offset_with_edit,
6363
};
6464
pub use ra_db::{
@@ -399,6 +399,23 @@ impl Analysis {
399399
}
400400
}
401401

402+
impl SourceChange {
403+
pub(crate) fn from_local_edit(file_id: FileId, edit: LocalEdit) -> SourceChange {
404+
let file_edit = SourceFileEdit {
405+
file_id,
406+
edit: edit.edit,
407+
};
408+
SourceChange {
409+
label: edit.label,
410+
source_file_edits: vec![file_edit],
411+
file_system_edits: vec![],
412+
cursor_position: edit
413+
.cursor_position
414+
.map(|offset| FilePosition { offset, file_id }),
415+
}
416+
}
417+
}
418+
402419
#[test]
403420
fn analysis_is_send() {
404421
fn is_send<T: Send>() {}

0 commit comments

Comments
 (0)