language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix usages after rename

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-08 22:33:36 +03:00
parent 6bca91af53
commit 5b573deb20
30 changed files with 4280 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ use languageserver_types::{
TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier,
WorkspaceEdit,
};
use ra_analysis::{
use ra_ide_api::{
CompletionItem, CompletionItemKind, FileId, FilePosition, FileRange, FileSystemEdit,
InsertText, NavigationTarget, SourceChange, SourceFileEdit,
LineCol, LineIndex, translate_offset_with_edit

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

@ -10,7 +10,7 @@ use gen_lsp_server::{
handle_shutdown, ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse,
};
use languageserver_types::NumberOrString;
use ra_analysis::{Canceled, FileId, LibraryData};
use ra_ide_api::{Canceled, FileId, LibraryData};
use ra_vfs::VfsTask;
use rayon;
use rustc_hash::FxHashSet;

4
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -8,7 +8,7 @@ use languageserver_types::{
ParameterInformation, ParameterLabel, Position, PrepareRenameResponse, Range, RenameParams,
SignatureInformation, SymbolInformation, TextDocumentIdentifier, TextEdit, WorkspaceEdit,
};
use ra_analysis::{
use ra_ide_api::{
FileId, FilePosition, FileRange, FoldKind, Query, RunnableKind, Severity, SourceChange,
};
use ra_syntax::{TextUnit, AstNode};
@ -736,7 +736,7 @@ fn highlight(world: &ServerWorld, file_id: FileId) -> Result<Vec<Decoration>> {
}
fn to_diagnostic_severity(severity: Severity) -> DiagnosticSeverity {
use ra_analysis::Severity::*;
use ra_ide_api::Severity::*;
match severity {
Error => DiagnosticSeverity::Error,

2
crates/ra_lsp_server/src/main_loop/subscriptions.rs
View file

@ -1,4 +1,4 @@
use ra_analysis::FileId;
use ra_ide_api::FileId;
use rustc_hash::FxHashSet;
pub struct Subscriptions {

6
crates/ra_lsp_server/src/server_world.rs
View file

@ -1,10 +1,10 @@
use std::{
path::{PathBuf},
path::PathBuf,
sync::Arc,
};
use languageserver_types::Url;
use ra_analysis::{
use ra_ide_api::{
Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData,
SourceRootId
};
@ -12,7 +12,7 @@ use ra_vfs::{Vfs, VfsChange, VfsFile, VfsRoot};
use rustc_hash::FxHashMap;
use relative_path::RelativePathBuf;
use parking_lot::RwLock;
use failure::{format_err};
use failure::format_err;
use crate::{
project_model::{CargoWorkspace, TargetKind},