Merge #897

897: Add basic const/static type inference r=flodiebold a=vipentti

This adds basic const/static type inference discussed in #887.

Currently the inference does not work for const/static declared inside a block. In addition the inference does not work inside the bodies of const/static.

Co-authored-by: Ville Penttinen <[email protected]>

1 files changed, 37 insertions, 0 deletions

diff --git a/crates/ra_hir/src/code_model_impl/konst.rs b/crates/ra_hir/src/code_model_impl/konst.rs
new file mode 100644
index 000000000..ecf4c8122
--- /dev/null
+++ b/crates/ra_hir/src/code_model_impl/konst.rs
@@ -0,0 +1,37 @@
+use std::sync::Arc;

+

+use ra_syntax::ast::{self, NameOwner};

+

+use crate::{

+    Name, AsName, Const, ConstSignature, Static,

+    type_ref::{TypeRef},

+    PersistentHirDatabase,

+};

+

+fn const_signature_for<N: NameOwner>(

+    node: &N,

+    type_ref: Option<&ast::TypeRef>,

+) -> Arc<ConstSignature> {

+    let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);

+    let type_ref = TypeRef::from_ast_opt(type_ref);

+    let sig = ConstSignature { name, type_ref };

+    Arc::new(sig)

+}

+

+impl ConstSignature {

+    pub(crate) fn const_signature_query(

+        db: &impl PersistentHirDatabase,

+        konst: Const,

+    ) -> Arc<ConstSignature> {

+        let (_, node) = konst.source(db);

+        const_signature_for(&*node, node.type_ref())

+    }

+

+    pub(crate) fn static_signature_query(

+        db: &impl PersistentHirDatabase,

+        konst: Static,

+    ) -> Arc<ConstSignature> {

+        let (_, node) = konst.source(db);

+        const_signature_for(&*node, node.type_ref())

+    }

+}