1 files changed, 47 insertions, 5 deletions

diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 9dae4c3d1..182ed4c91 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -9,11 +9,11 @@ use ra_db::{FileId, FilePosition};
 use ra_syntax::{
     SyntaxNode,
     ast::{self, AstNode, NameOwner},
-    algo::{find_node_at_offset, find_leaf_at_offset},
+    algo::{find_node_at_offset, find_token_at_offset},
 };
 
 use crate::{
-    HirDatabase, Function, Struct, Enum,
+    HirDatabase, Function, Struct, Enum,Const,Static,
     AsName, Module, HirFileId, Crate, Trait, Resolver,
     ids::LocationCtx,
     expr, AstId
@@ -87,6 +87,27 @@ fn module_from_source(
     )
 }
 
+pub fn const_from_source(
+    db: &impl HirDatabase,
+    file_id: FileId,
+    const_def: &ast::ConstDef,
+) -> Option<Const> {
+    let module = module_from_child_node(db, file_id, const_def.syntax())?;
+    let res = const_from_module(db, module, const_def);
+    Some(res)
+}
+
+pub fn const_from_module(
+    db: &impl HirDatabase,
+    module: Module,
+    const_def: &ast::ConstDef,
+) -> Const {
+    let (file_id, _) = module.definition_source(db);
+    let file_id = file_id.into();
+    let ctx = LocationCtx::new(db, module, file_id);
+    Const { id: ctx.to_def(const_def) }
+}
+
 pub fn function_from_position(db: &impl HirDatabase, position: FilePosition) -> Option<Function> {
     let file = db.parse(position.file_id);
     let fn_def = find_node_at_offset::<ast::FnDef>(file.syntax(), position.offset)?;
@@ -134,6 +155,27 @@ pub fn struct_from_module(
     Struct { id: ctx.to_def(struct_def) }
 }
 
+pub fn static_from_source(
+    db: &impl HirDatabase,
+    file_id: FileId,
+    static_def: &ast::StaticDef,
+) -> Option<Static> {
+    let module = module_from_child_node(db, file_id, static_def.syntax())?;
+    let res = static_from_module(db, module, static_def);
+    Some(res)
+}
+
+pub fn static_from_module(
+    db: &impl HirDatabase,
+    module: Module,
+    static_def: &ast::StaticDef,
+) -> Static {
+    let (file_id, _) = module.definition_source(db);
+    let file_id = file_id.into();
+    let ctx = LocationCtx::new(db, module, file_id);
+    Static { id: ctx.to_def(static_def) }
+}
+
 pub fn enum_from_module(db: &impl HirDatabase, module: Module, enum_def: &ast::EnumDef) -> Enum {
     let (file_id, _) = module.definition_source(db);
     let file_id = file_id.into();
@@ -155,9 +197,9 @@ pub fn trait_from_module(
 pub fn resolver_for_position(db: &impl HirDatabase, position: FilePosition) -> Resolver {
     let file_id = position.file_id;
     let file = db.parse(file_id);
-    find_leaf_at_offset(file.syntax(), position.offset)
-        .find_map(|node| {
-            node.ancestors().find_map(|node| {
+    find_token_at_offset(file.syntax(), position.offset)
+        .find_map(|token| {
+            token.parent().ancestors().find_map(|node| {
                 if ast::Expr::cast(node).is_some() || ast::Block::cast(node).is_some() {
                     if let Some(func) = function_from_child_node(db, file_id, node) {
                         let scopes = func.scopes(db);