Component list panel integration

.prettierignore

@@ -30,3 +30,6 @@ Cargo.lock
 # TODO [mwu]: Adjust Engine build to not leave them.
 ci-build/
 enso/
+
+# Popular IDEs
+.idea

CHANGELOG.md

@@ -50,6 +50,10 @@
   node cration.][3186]
 - [Fixed developer console error about failing to decode a notification
   "executionContext/visualisationEvaluationFailed"][3193]
+- [New Version of the Node Searcher - the Component Browser][3530] The available
+  methods, atoms and functions are presented in nice, categorized view. The most
+  popular tools are available at hand. The The panel is unstable, and thus is
+  available under the `--enable-new-component-browser` flag.
 
 #### EnsoGL (rendering engine)
 
@@ -235,6 +239,7 @@
 [3519]: https://github.com/enso-org/enso/pull/3519
 [3523]: https://github.com/enso-org/enso/pull/3523
 [3528]: https://github.com/enso-org/enso/pull/3528
+[3530]: https://github.com/enso-org/enso/pull/3530
 [3542]: https://github.com/enso-org/enso/pull/3542
 [3551]: https://github.com/enso-org/enso/pull/3551
 [3552]: https://github.com/enso-org/enso/pull/3552

app/gui/Cargo.toml

@@ -31,12 +31,14 @@ ensogl-drop-manager = { path = "../../lib/rust/ensogl/component/drop-manager" }
 fuzzly = { path = "../../lib/rust/fuzzly" }
 ast = { path = "language/ast/impl" }
 ide-view = { path = "view" }
+ide-view-component-group = { path = "view/component-browser/component-group" }
 engine-protocol = { path = "controller/engine-protocol" }
 json-rpc = { path = "../../lib/rust/json-rpc" }
 parser = { path = "language/parser" }
 span-tree = { path = "language/span-tree" }
 bimap = { version = "0.4.0" }
 console_error_panic_hook = { version = "0.1.6" }
+convert_case = { version = "0.5.0" }
 failure = { version = "0.1.6" }
 flo_stream = { version = "0.4.0" }
 futures = { version = "0.3.1" }

app/gui/config/src/lib.rs

@@ -66,5 +66,6 @@ ensogl::read_args! {
         test_workflow            : String,
         skip_min_version_check   : bool,
         preferred_engine_version : semver::Version,
+        enable_new_component_browser : bool,
     }
 }

app/gui/controller/double-representation/src/tp.rs

@@ -165,6 +165,17 @@ impl Display for QualifiedName {
 }
 
 
+// === Comparison ===
+
+impl PartialEq<module::QualifiedName> for QualifiedName {
+    fn eq(&self, rhs: &module::QualifiedName) -> bool {
+        self.project_name == rhs.project_name
+            && self.module_segments == rhs.id.parent_segments()
+            && self.name == rhs.id.name().as_ref()
+    }
+}
+
+
 
 // =============
 // === Tests ===

app/gui/src/controller/searcher/component.rs

@@ -6,6 +6,9 @@ use crate::prelude::*;
 
 use crate::model::suggestion_database;
 
+use convert_case::Case;
+use convert_case::Casing;
+
 
 // ==============
 // === Export ===
@@ -29,6 +32,33 @@ pub type MatchInfo = controller::searcher::action::MatchInfo;
 
 
 
+// ==============
+// === Errors ===
+// ==============
+
+// === NoSuchGroup===
+
+#[allow(missing_docs)]
+#[derive(Clone, Debug, Fail)]
+#[fail(display = "No component group with the index {} in section {}.", index, section_name)]
+pub struct NoSuchGroup {
+    section_name: CowString,
+    index:        usize,
+}
+
+
+// === NoSuchComponent ===
+
+#[allow(missing_docs)]
+#[derive(Clone, Debug, Fail)]
+#[fail(display = "No component entry with the index {} in {}.", index, group_name)]
+pub struct NoSuchComponent {
+    group_name: CowString,
+    index:      usize,
+}
+
+
+
 // =============
 // === Order ===
 // =============
@@ -37,25 +67,18 @@ pub type MatchInfo = controller::searcher::action::MatchInfo;
 /// [`Group::update_sorting_and_visibility`].
 #[derive(Copy, Clone, Debug)]
 pub enum Order {
+    /// The same order of components as when the group was built.
+    /// Will use the [`Group::initial_entries_order`] field.
+    Initial,
     /// Order non-modules by name, followed by modules (also by name).
     ByNameNonModulesThenModules,
-    /// Order [`Component`]s by [`Component::match_info`] score (best scores first).
+    /// Order [`Component`]s by [`Component::match_info`] score. The matching entries will go
+    /// first, and the _lesser_ score will take precedence. That is due to way of displaying
+    /// components in component browser - the lower (with greater indices) entries are more
+    /// handy.
     ByMatch,
 }
 
-impl Order {
-    /// Compare two [`Component`]s according to [`Order`].
-    fn compare(&self, a: &Component, b: &Component) -> std::cmp::Ordering {
-        match self {
-            Order::ByNameNonModulesThenModules => {
-                let cmp_can_be_entered = a.can_be_entered().cmp(&b.can_be_entered());
-                cmp_can_be_entered.then_with(|| a.label().cmp(b.label()))
-            }
-            Order::ByMatch => a.match_info.borrow().cmp(&*b.match_info.borrow()).reverse(),
-        }
-    }
-}
-
 
 
 // =================
@@ -87,8 +110,8 @@ impl Component {
     }
 
     /// The label which should be displayed in the Component Browser.
-    pub fn label(&self) -> &str {
-        &self.suggestion.name
+    pub fn label(&self) -> String {
+        self.to_string()
     }
 
     /// Checks if component is filtered out.
@@ -109,7 +132,7 @@ impl Component {
     /// It should be called each time the filtering pattern changes.
     pub fn update_matching_info(&self, pattern: impl Str) {
         let label = self.label();
-        let matches = fuzzly::matches(label, pattern.as_ref());
+        let matches = fuzzly::matches(&label, pattern.as_ref());
         let subsequence = matches.and_option_from(|| {
             let metric = fuzzly::metric::default();
             fuzzly::find_best_subsequence(label, pattern, metric)
@@ -121,6 +144,20 @@ impl Component {
     }
 }
 
+impl Display for Component {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let self_type_not_here =
+            self.suggestion.self_type.as_ref().filter(|t| *t != &self.suggestion.module);
+        if let Some(self_type) = self_type_not_here {
+            let self_name = self_type.name.from_case(Case::Snake).to_case(Case::Title);
+            let name = self.suggestion.name.from_case(Case::Snake).to_case(Case::Lower);
+            write!(f, "{} {}", self_name, name)
+        } else {
+            write!(f, "{}", self.suggestion.name.from_case(Case::Snake).to_case(Case::Lower))
+        }
+    }
+}
+
 
 
 // ============
@@ -190,20 +227,46 @@ impl List {
         self.module_groups.get(&component).map(|mg| &mg.content)
     }
 
+    /// Get the component from Top Modules by index.
+    pub fn top_module_entry_by_index(
+        &self,
+        group_index: usize,
+        entry_index: usize,
+    ) -> FallibleResult<Component> {
+        self.top_modules().entry_by_index("Sub-modules".into(), group_index, entry_index)
+    }
+
+    /// Get the component from Favorites section by index.
+    pub fn favorites_entry_by_index(
+        &self,
+        group_index: usize,
+        entry_index: usize,
+    ) -> FallibleResult<Component> {
+        self.favorites.entry_by_index("Favorites".into(), group_index, entry_index)
+    }
+
+    /// Get the component from Local Scope section by index.
+    pub fn local_scope_entry_by_index(&self, index: usize) -> FallibleResult<Component> {
+        let error =
+            || NoSuchComponent { group_name: self.local_scope.name.to_string().into(), index };
+        self.local_scope.get_entry(index).ok_or_else(error).map_err(|e| e.into())
+    }
+
     /// Update matching info in all components according to the new filtering pattern.
     pub fn update_filtering(&self, pattern: impl AsRef<str>) {
         let pattern = pattern.as_ref();
         for component in &*self.all_components {
             component.update_matching_info(pattern)
         }
         let pattern_not_empty = !pattern.is_empty();
-        let components_order =
+        let submodules_order =
             if pattern_not_empty { Order::ByMatch } else { Order::ByNameNonModulesThenModules };
+        let favorites_order = if pattern_not_empty { Order::ByMatch } else { Order::Initial };
         for group in self.all_groups_not_in_favorites() {
-            group.update_sorting_and_visibility(components_order);
+            group.update_sorting(submodules_order);
         }
         for group in self.favorites.iter() {
-            group.update_visibility();
+            group.update_sorting(favorites_order);
         }
         self.filtered.set(pattern_not_empty);
     }
@@ -317,11 +380,10 @@ pub(crate) mod tests {
             .entries
             .borrow()
             .iter()
-            .filter(|c| matches!(*c.match_info.borrow(), MatchInfo::Matches { .. }))
+            .take_while(|c| matches!(*c.match_info.borrow(), MatchInfo::Matches { .. }))
             .map(|c| *c.id)
             .collect_vec();
         assert_eq!(ids_of_matches, expected_ids);
-        assert_eq!(group.visible.get(), !expected_ids.is_empty());
     }
 
     #[test]
@@ -343,6 +405,13 @@ pub(crate) mod tests {
         let list = builder.build();
 
         list.update_filtering("fu");
+        let match_infos = list.top_modules()[0]
+            .entries
+            .borrow()
+            .iter()
+            .map(|c| c.match_info.borrow().clone())
+            .collect_vec();
+        DEBUG!("{match_infos:?}");
         assert_ids_of_matches_entries(&list.top_modules()[0], &[2, 3]);
         assert_ids_of_matches_entries(&list.favorites[0], &[3, 2]);
         assert_ids_of_matches_entries(&list.local_scope, &[2]);