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

HasSource::source -> HasSource::source_old

Browse source 
To start migrating HasSource::source to return an Option.
This commit is contained in:
Nick Spain 2021-01-01 13:05:28 +11:00
parent aa3ce16f26
commit 27cadcd531
15 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/completion/src/completions/trait_impl.rs
View file

@ -156,7 +156,7 @@ fn add_function_impl(
};
let range = TextRange::new(fn_def_node.text_range().start(), ctx.source_range().end());
let function_decl = function_declaration(&func.source(ctx.db).value);
let function_decl = function_declaration(&func.source_old(ctx.db).value);
match ctx.config.snippet_cap {
Some(cap) => {
let snippet = format!("{} {{\n $0\n}}", function_decl);
@ -200,7 +200,7 @@ fn add_const_impl(
let const_name = const_.name(ctx.db).map(|n| n.to_string());
if let Some(const_name) = const_name {
let snippet = make_const_compl_syntax(&const_.source(ctx.db).value);
let snippet = make_const_compl_syntax(&const_.source_old(ctx.db).value);
let range = TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());

2
crates/completion/src/render/const_.rs
View file

@ -27,7 +27,7 @@ struct ConstRender<'a> {
impl<'a> ConstRender<'a> {
fn new(ctx: RenderContext<'a>, const_: hir::Const) -> ConstRender<'a> {
let ast_node = const_.source(ctx.db()).value;
let ast_node = const_.source_old(ctx.db()).value;
ConstRender { ctx, const_, ast_node }
}

2
crates/completion/src/render/function.rs
View file

@ -34,7 +34,7 @@ impl<'a> FunctionRender<'a> {
fn_: hir::Function,
) -> FunctionRender<'a> {
let name = local_name.unwrap_or_else(|| fn_.name(ctx.db()).to_string());
let ast_node = fn_.source(ctx.db()).value;
let ast_node = fn_.source_old(ctx.db()).value;
FunctionRender { ctx, name, func: fn_, ast_node }
}

2
crates/completion/src/render/macro_.rs
View file

@ -96,7 +96,7 @@ impl<'a> MacroRender<'a> {
}
fn detail(&self) -> String {
let ast_node = self.macro_.source(self.ctx.db()).value;
let ast_node = self.macro_.source_old(self.ctx.db()).value;
macro_label(&ast_node)
}
}

2
crates/completion/src/render/type_alias.rs
View file

@ -27,7 +27,7 @@ struct TypeAliasRender<'a> {
impl<'a> TypeAliasRender<'a> {
fn new(ctx: RenderContext<'a>, type_alias: hir::TypeAlias) -> TypeAliasRender<'a> {
let ast_node = type_alias.source(ctx.db()).value;
let ast_node = type_alias.source_old(ctx.db()).value;
TypeAliasRender { ctx, type_alias, ast_node }
}