rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs')

-rw-r--r--

1 files changed, 5 insertions, 5 deletions

diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
index 1b373bcb8c..b54e4204e3 100644
--- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs

@@ -1,4 +1,4 @@

-use hir::{HirFileIdExt, InFile, ModuleDef};

+use hir::{InFile, MacroFileIdExt, ModuleDef};

use ide_db::{helpers::mod_path_to_ast, imports::import_assets::NameToImport, items_locator};

use itertools::Itertools;

use syntax::{

@@ -43,12 +43,12 @@ pub(crate) fn replace_derive_with_manual_impl(

) -> Option<()> {

let attr = ctx.find_node_at_offset_with_descend::<ast::Attr>()?;

let path = attr.path()?;

- let hir_file = ctx.sema.hir_file_for(attr.syntax());

- if !hir_file.is_derive_attr_pseudo_expansion(ctx.db()) {

+ let macro_file = ctx.sema.hir_file_for(attr.syntax()).macro_file()?;

+ if !macro_file.is_derive_attr_pseudo_expansion(ctx.db()) {

return None;

}

- let InFile { file_id, value } = hir_file.call_node(ctx.db())?;

+ let InFile { file_id, value } = macro_file.call_node(ctx.db());

if file_id.is_macro() {

// FIXME: make this work in macro files

return None;

@@ -56,7 +56,7 @@ pub(crate) fn replace_derive_with_manual_impl(

// collect the derive paths from the #[derive] expansion

let current_derives = ctx

.sema

- .parse_or_expand(hir_file)

+ .parse_or_expand(macro_file.into())

.descendants()

.filter_map(ast::Attr::cast)

.filter_map(|attr| attr.path())