2 files changed, 32 insertions, 7 deletions
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index eecccdae2..178d74be1 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -17,8 +17,8 @@ use crate::{
    db::HirDatabase,
    source_analyzer::{resolve_hir_path, ReferenceDescriptor, SourceAnalyzer},
    source_binder::{ChildContainer, SourceBinder},
-    Function, HirFileId, InFile, Local, MacroDef, Module, Name, Origin, Path, PathResolution,
+    Function, HirFileId, InFile, Local, MacroDef, Module, ModuleDef, Name, Origin, Path,
-    ScopeDef, StructField, Trait, Type, TypeParam, VariantDef,
+    PathResolution, ScopeDef, StructField, Trait, Type, TypeParam, VariantDef,
 };
 use hir_expand::ExpansionInfo;
 use ra_prof::profile;
@@ -129,6 +129,10 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
        self.analyze(path.syntax()).resolve_path(self.db, path)
    }
+    pub fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
+        self.analyze(pat.syntax()).resolve_bind_pat_to_const(self.db, pat)
+    }
    // FIXME: use this instead?
    // pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>;
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index b655e2c32..c650a9e08 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -11,9 +11,9 @@ use either::Either;
 use hir_def::{
    body::{
        scope::{ExprScopes, ScopeId},
-        BodySourceMap,
+        Body, BodySourceMap,
    },
-    expr::{ExprId, PatId},
+    expr::{ExprId, Pat, PatId},
    resolver::{resolver_for_scope, Resolver, TypeNs, ValueNs},
    AsMacroCall, DefWithBodyId,
 };
@@ -25,8 +25,8 @@ use ra_syntax::{
 };
 use crate::{
-    db::HirDatabase, Adt, Const, EnumVariant, Function, Local, MacroDef, Path, Static, Struct,
+    db::HirDatabase, Adt, Const, EnumVariant, Function, Local, MacroDef, ModuleDef, Path, Static,
-    Trait, Type, TypeAlias, TypeParam,
+    Struct, Trait, Type, TypeAlias, TypeParam,
 };
 /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of
@@ -35,6 +35,7 @@ use crate::{
 pub(crate) struct SourceAnalyzer {
    file_id: HirFileId,
    pub(crate) resolver: Resolver,
+    body: Option<Arc<Body>>,
    body_source_map: Option<Arc<BodySourceMap>>,
    infer: Option<Arc<InferenceResult>>,
    scopes: Option<Arc<ExprScopes>>,
@@ -66,7 +67,7 @@ impl SourceAnalyzer {
        node: InFile<&SyntaxNode>,
        offset: Option<TextUnit>,
    ) -> SourceAnalyzer {
-        let (_body, source_map) = db.body_with_source_map(def);
+        let (body, source_map) = db.body_with_source_map(def);
        let scopes = db.expr_scopes(def);
        let scope = match offset {
            None => scope_for(&scopes, &source_map, node),
@@ -75,6 +76,7 @@ impl SourceAnalyzer {
        let resolver = resolver_for_scope(db, def, scope);
        SourceAnalyzer {
            resolver,
+            body: Some(body),
            body_source_map: Some(source_map),
            infer: Some(db.infer(def)),
            scopes: Some(scopes),
@@ -88,6 +90,7 @@ impl SourceAnalyzer {
    ) -> SourceAnalyzer {
        SourceAnalyzer {
            resolver,
+            body: None,
            body_source_map: None,
            infer: None,
            scopes: None,
@@ -197,6 +200,24 @@ impl SourceAnalyzer {
        self.resolver.resolve_path_as_macro(db, path.mod_path()).map(|it| it.into())
    }
+    pub(crate) fn resolve_bind_pat_to_const(
+        &self,
+        db: &impl HirDatabase,
+        pat: &ast::BindPat,
+    ) -> Option<ModuleDef> {
+        let pat_id = self.pat_id(&pat.clone().into())?;
+        let body = self.body.as_ref()?;
+        let path = match &body[pat_id] {
+            Pat::Path(path) => path,
+            _ => return None,
+        };
+        let res = resolve_hir_path(db, &self.resolver, &path)?;
+        match res {
+            PathResolution::Def(def) => Some(def),
+            _ => None,
+        }
+    }
    pub(crate) fn resolve_path(
        &self,
        db: &impl HirDatabase,