Skip to content

Commit d73c0d5

Browse files
committed
Address code review
1 parent cacffa1 commit d73c0d5

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

crates/oak_db/src/file_resolve.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<'db> File {
107107
.symbol(use_site.symbol())
108108
.name()
109109
.to_string();
110-
let interned = Name::new(db, name.as_str());
110+
let name = Name::new(db, name.as_str());
111111

112112
// Get local definitions for that use
113113
let reaching: Vec<(ScopeId, DefinitionId)> =
@@ -124,15 +124,15 @@ impl<'db> File {
124124
let file_scope = ScopeId::from(0);
125125
if use_scope != file_scope {
126126
// Function body: the lazy / end-of-file view the body sees at run time.
127-
return self.resolve(db, interned).into_iter().collect();
127+
return self.resolve(db, name).into_iter().collect();
128128
}
129129

130130
// Top level: collation predecessors / other visible files (exports-only
131131
// chase, same as `resolve`'s imports walk). Avoids the sibling cycle and
132132
// matches R's namespace semantics. TODO: Package-level layers.
133133
for layer in self.imports_at(db, offset) {
134134
if let ImportLayer::File(target) = layer {
135-
if let Some(def) = target.resolve_export(db, interned) {
135+
if let Some(def) = target.resolve_export(db, name) {
136136
return vec![def];
137137
}
138138
}
@@ -144,20 +144,20 @@ impl<'db> File {
144144
fn resolve_definition(
145145
self,
146146
db: &'db dyn Db,
147-
scope: ScopeId,
147+
scope_id: ScopeId,
148148
def_id: DefinitionId,
149149
) -> Option<Definition<'db>> {
150150
let index = self.semantic_index(db);
151151
if let DefinitionKind::Import {
152152
file: target_url,
153153
name: forwarded,
154154
..
155-
} = index.definitions(scope)[def_id].kind()
155+
} = index.definitions(scope_id)[def_id].kind()
156156
{
157157
let target = db.file_by_path(&FilePath::from_url(target_url))?;
158158
return target.resolve_export(db, Name::new(db, forwarded.as_str()));
159159
}
160-
self.definition(db, scope, def_id)
160+
self.definition(db, scope_id, def_id)
161161
}
162162

163163
/// Walk this file's exports chain for `name`, chasing `source()`-forwarded

0 commit comments

Comments
 (0)