temp commit

orchid-api/src/tree.rs

@@ -72,7 +72,6 @@ pub struct Member {
 pub enum MemberKind {
 	Const(Expression),
 	Module(Module),
-	Import(TStrv),
 	Lazy(TreeId),
 }
 
@@ -105,10 +104,10 @@ pub enum LsModuleError {
 	TreeUnavailable,
 }
 
+/// Information about a module sent from the host to an extension. By necessity,
+/// members and imports are non-overlapping.
 #[derive(Clone, Debug, Coding)]
 pub struct ModuleInfo {
-	/// If the name isn't a canonical name, returns the true name.
-	pub canonical: Option<TStrv>,
 	/// List the names defined in this module
 	pub members: HashMap<TStr, MemberInfo>,
 }
@@ -116,9 +115,7 @@ pub struct ModuleInfo {
 #[derive(Clone, Copy, Debug, Coding)]
 pub struct MemberInfo {
 	/// true if the name is exported
-	pub exported: bool,
-	/// If it's imported, you can find the canonical name here
-	pub canonical: Option<TStrv>,
+	pub public: bool,
 	/// Whether the tree item is a constant value or a module
 	pub kind: MemberInfoKind,
 }