go to def and find all references support for import/export declarations

Author: minestarks

source/language_service/src/definition/tests.rs

@@ -680,3 +680,44 @@ fn notebook_local_from_later_cell() {
         ("cell2", "let z = ↘x + 2;"),
     ]);
 }
+
+#[test]
+fn item_export() {
+    assert_definition(
+        r#"
+        namespace Test {
+            operation ◉Foo◉() : Unit {
+            }
+            export Fo↘o;
+        }
+    "#,
+    );
+}
+
+#[test]
+fn item_export_with_alias() {
+    assert_definition(
+        r#"
+        namespace Test {
+            operation ◉Foo◉() : Unit {
+            }
+            export Fo↘o as Bar;
+        }
+    "#,
+    );
+}
+
+#[test]
+fn item_import() {
+    assert_definition(
+        r#"
+        namespace Test {
+            operation ◉Foo◉() : Unit {
+            }
+        }
+        namespace Other {
+            import X, Test.Fo↘o;
+        }
+    "#,
+    );
+}

source/language_service/src/name_locator.rs

@@ -6,7 +6,7 @@ use std::rc::Rc;
 
 use crate::compilation::Compilation;
 use qsc::ast::visit::{
-    Visitor, walk_attr, walk_expr, walk_namespace, walk_pat, walk_ty, walk_ty_def,
+    Visitor, walk_attr, walk_expr, walk_item, walk_namespace, walk_pat, walk_ty, walk_ty_def,
 };
 use qsc::ast::{FieldAccess, Idents, PathKind};
 use qsc::display::Lookup;
@@ -267,7 +267,7 @@ impl<'package, T: Handler<'package>> Visitor<'package> for Locator<'_, 'package,
                         self.context.current_item_name = context_curr_item_name;
                     }
                 }
-                _ => {}
+                _ => walk_item(self, item),
             }
             self.context.current_item_doc = context;
         }
@@ -447,12 +447,13 @@ impl<'package, T: Handler<'package>> Visitor<'package> for Locator<'_, 'package,
                         }
                     }
                 }
-                // The path is a namespace path.
+                // The path is not a field accessor.
                 None => match self.compilation.get_res(path.id) {
-                    Some(resolve::Res::Item(item_id, _)) => {
+                    Some(res) if res.item_id().is_some() => {
+                        let item_id = res.item_id().expect("should have item id");
                         let (item, _, resolved_item_id) = self
                             .compilation
-                            .resolve_item_relative_to_user_package(item_id);
+                            .resolve_item_relative_to_user_package(&item_id);
                         match &item.kind {
                             hir::ItemKind::Callable(decl) => {
                                 self.inner.at_callable_ref(path, &resolved_item_id, decl);

source/language_service/src/references.rs

@@ -343,9 +343,11 @@ struct FindItemRefs<'a> {
 impl Visitor<'_> for FindItemRefs<'_> {
     fn visit_path(&mut self, path: &ast::Path) {
         let res = self.compilation.get_res(path.id);
-        if let Some(resolve::Res::Item(item_id, _)) = res {
-            if self.eq(item_id) {
-                self.locations.push(path.name.span);
+        if let Some(res) = res {
+            if let Some(item_id) = res.item_id() {
+                if self.eq(&item_id) {
+                    self.locations.push(path.name.span);
+                }
             }
         }
     }

source/language_service/src/references/tests.rs

@@ -928,3 +928,32 @@ fn notebook_local_reference() {
         ("cell2", "let z = ◉↘x◉ + 2;"),
     ]);
 }
+
+#[test]
+fn export() {
+    check_include_decl(
+        r#"
+        namespace Test {
+            operation ◉Fo↘o◉() : Unit {
+            }
+            export ◉Foo◉ as Bar;
+        }
+    "#,
+    );
+}
+
+#[test]
+fn import() {
+    check_include_decl(
+        r#"
+        namespace Test {
+            operation ◉Fo↘o◉() : Unit {
+            }
+        }
+        namespace Other {
+            import X, Test.◉Foo◉;
+            import ◉Foo◉ as Bar;
+        }
+    "#,
+    );
+}