language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dont depend on ra_editor directly

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-08 20:31:43 +03:00
parent 1c25bf05d7
commit 1b82084a5f
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -736,7 +736,6 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ra_analysis 0.1.0", "ra_analysis 0.1.0",
"ra_editor 0.1.0",
"ra_syntax 0.1.0", "ra_syntax 0.1.0",
"ra_text_edit 0.1.0", "ra_text_edit 0.1.0",
"ra_vfs 0.1.0", "ra_vfs 0.1.0",

5
crates/ra_analysis/src/lib.rs
View file

@ -40,7 +40,10 @@ pub use crate::{
completion::{CompletionItem, CompletionItemKind, InsertText}, completion::{CompletionItem, CompletionItemKind, InsertText},
runnables::{Runnable, RunnableKind}, runnables::{Runnable, RunnableKind},
}; };
pub use ra_editor::{Fold, FoldKind, HighlightedRange, LineIndex, Severity, StructureNode}; pub use ra_editor::{
Fold, FoldKind, HighlightedRange, Severity, StructureNode,
LineIndex, LineCol, translate_offset_with_edit,
};
pub use ra_db::{ pub use ra_db::{
Cancelable, Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, FilesDatabase, Cancelable, Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, FilesDatabase,

1
crates/ra_lsp_server/Cargo.toml
View file

@ -28,7 +28,6 @@ parking_lot = "0.7.0"
thread_worker = { path = "../thread_worker" } thread_worker = { path = "../thread_worker" }
ra_syntax = { path = "../ra_syntax" } ra_syntax = { path = "../ra_syntax" }
ra_editor = { path = "../ra_editor" }
ra_text_edit = { path = "../ra_text_edit" } ra_text_edit = { path = "../ra_text_edit" }
ra_analysis = { path = "../ra_analysis" } ra_analysis = { path = "../ra_analysis" }
gen_lsp_server = { path = "../gen_lsp_server" } gen_lsp_server = { path = "../gen_lsp_server" }

2
crates/ra_lsp_server/src/conv.rs
View file

@ -7,8 +7,8 @@ use languageserver_types::{
use ra_analysis::{ use ra_analysis::{
CompletionItem, CompletionItemKind, FileId, FilePosition, FileRange, FileSystemEdit, CompletionItem, CompletionItemKind, FileId, FilePosition, FileRange, FileSystemEdit,
InsertText, NavigationTarget, SourceChange, SourceFileEdit, InsertText, NavigationTarget, SourceChange, SourceFileEdit,
LineCol, LineIndex, translate_offset_with_edit
}; };
use ra_editor::{translate_offset_with_edit, LineCol, LineIndex};
use ra_syntax::{SyntaxKind, TextRange, TextUnit}; use ra_syntax::{SyntaxKind, TextRange, TextUnit};
use ra_text_edit::{AtomTextEdit, TextEdit}; use ra_text_edit::{AtomTextEdit, TextEdit};