itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1991

Browse Source 
1991: Use `original_file` instead of `as_original_file` r=matklad a=sinkuu

I saw ra_lsp_server panics originating from `as_original_file`, though I have not been able to reproduce.

Co-authored-by: Shotaro Yamada <sinkuu@sinkuu.xyz>
This commit is contained in:
bors[bot] 2019-10-11 06:01:58 +00:00 committed by GitHub
commit ef6ccd75e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ra_hir/src/ids.rs
View File

@ -50,16 +50,6 @@ impl HirFileId {
} }
} }
/// XXX: this is a temporary function, which should go away when we implement the
/// nameresolution+macro expansion combo. Prefer using `original_file` if
/// possible.
pub fn as_original_file(self) -> FileId {
match self.0 {
HirFileIdRepr::File(file_id) => file_id,
HirFileIdRepr::Macro(_r) => panic!("macro generated file: {:?}", self),
}
}
/// Get the crate which the macro lives in, if it is a macro file. /// Get the crate which the macro lives in, if it is a macro file.
pub(crate) fn macro_crate(self, db: &impl AstDatabase) -> Option<Crate> { pub(crate) fn macro_crate(self, db: &impl AstDatabase) -> Option<Crate> {
match self.0 { match self.0 {

6
crates/ra_ide_api/src/display/navigation_target.rs
View File

@ -119,7 +119,7 @@ impl NavigationTarget {
pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget { pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
let src = module.definition_source(db); let src = module.definition_source(db);
let file_id = src.file_id.as_original_file(); let file_id = src.file_id.original_file(db);
let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default(); let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
match src.ast { match src.ast {
ModuleSource::SourceFile(node) => { ModuleSource::SourceFile(node) => {
@ -139,7 +139,7 @@ impl NavigationTarget {
pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget { pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default(); let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
if let Some(src) = module.declaration_source(db) { if let Some(src) = module.declaration_source(db) {
let file_id = src.file_id.as_original_file(); let file_id = src.file_id.original_file(db);
return NavigationTarget::from_syntax( return NavigationTarget::from_syntax(
file_id, file_id,
name, name,
@ -213,7 +213,7 @@ impl NavigationTarget {
) -> NavigationTarget { ) -> NavigationTarget {
let src = impl_block.source(db); let src = impl_block.source(db);
NavigationTarget::from_syntax( NavigationTarget::from_syntax(
src.file_id.as_original_file(), src.file_id.original_file(db),
"impl".into(), "impl".into(),
None, None,
src.ast.syntax(), src.ast.syntax(),

2
crates/ra_ide_api/src/references.rs
View File

@ -140,7 +140,7 @@ fn rename_mod(
let module_src = hir::Source { file_id: position.file_id.into(), ast: ast_module.clone() }; let module_src = hir::Source { file_id: position.file_id.into(), ast: ast_module.clone() };
if let Some(module) = hir::Module::from_declaration(db, module_src) { if let Some(module) = hir::Module::from_declaration(db, module_src) {
let src = module.definition_source(db); let src = module.definition_source(db);
let file_id = src.file_id.as_original_file(); let file_id = src.file_id.original_file(db);
match src.ast { match src.ast {
ModuleSource::SourceFile(..) => { ModuleSource::SourceFile(..) => {
let mod_path: RelativePathBuf = db.file_relative_path(file_id); let mod_path: RelativePathBuf = db.file_relative_path(file_id);