aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r--crates/ra_analysis/src/completion.rs5
-rw-r--r--crates/ra_analysis/src/lib.rs5
2 files changed, 6 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/completion.rs b/crates/ra_analysis/src/completion.rs
index 0f154112a..f480af611 100644
--- a/crates/ra_analysis/src/completion.rs
+++ b/crates/ra_analysis/src/completion.rs
@@ -1,10 +1,11 @@
1mod reference_completion; 1mod reference_completion;
2 2
3use ra_editor::find_node_at_offset; 3use ra_editor::find_node_at_offset;
4use ra_text_edit::AtomTextEdit;
4use ra_syntax::{ 5use ra_syntax::{
5 algo::visit::{visitor_ctx, VisitorCtx}, 6 algo::visit::{visitor_ctx, VisitorCtx},
6 ast, 7 ast,
7 AstNode, AtomEdit, 8 AstNode,
8 SyntaxNodeRef, 9 SyntaxNodeRef,
9}; 10};
10use ra_db::SyntaxDatabase; 11use ra_db::SyntaxDatabase;
@@ -33,7 +34,7 @@ pub(crate) fn completions(
33 let original_file = db.source_file(position.file_id); 34 let original_file = db.source_file(position.file_id);
34 // Insert a fake ident to get a valid parse tree 35 // Insert a fake ident to get a valid parse tree
35 let file = { 36 let file = {
36 let edit = AtomEdit::insert(position.offset, "intellijRulezz".to_string()); 37 let edit = AtomTextEdit::insert(position.offset, "intellijRulezz".to_string());
37 original_file.reparse(&edit) 38 original_file.reparse(&edit)
38 }; 39 };
39 40
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index eaf24cb36..22fff71ab 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -18,7 +18,8 @@ pub mod mock_analysis;
18 18
19use std::{fmt, sync::Arc}; 19use std::{fmt, sync::Arc};
20 20
21use ra_syntax::{AtomEdit, SourceFileNode, TextRange, TextUnit}; 21use ra_syntax::{SourceFileNode, TextRange, TextUnit};
22use ra_text_edit::AtomTextEdit;
22use ra_db::FileResolverImp; 23use ra_db::FileResolverImp;
23use rayon::prelude::*; 24use rayon::prelude::*;
24use relative_path::RelativePathBuf; 25use relative_path::RelativePathBuf;
@@ -120,7 +121,7 @@ pub struct SourceChange {
120#[derive(Debug)] 121#[derive(Debug)]
121pub struct SourceFileNodeEdit { 122pub struct SourceFileNodeEdit {
122 pub file_id: FileId, 123 pub file_id: FileId,
123 pub edits: Vec<AtomEdit>, 124 pub edits: Vec<AtomTextEdit>,
124} 125}
125 126
126#[derive(Debug)] 127#[derive(Debug)]