Merge branch 'develop' into wip/mm/ide-1302-show-visualization-on-out…

…put-port-hover

CHANGELOG.md

@@ -49,6 +49,8 @@
 - [Disable area selection][1318]. The area selection was visible despite being
   non-functional. To avoid confusion, area selection has been disabled until it
   is [correctly implemented][479].
+- [Fix error after adding a node][1332]. Sometimes, after picking a suggestion
+  the inserted node was annotated with "The name could not be found" error.
 - [Handle syntax errors in custom-defined visualizations][1341]. The IDE is now
   able to run properly, even if some of the custom-defined visualisations inside
   a project contain syntax errors.
@@ -78,6 +80,8 @@ you can find their release notes
 [1064]: https://github.com/enso-org/ide/pull/1064
 [1316]: https://github.com/enso-org/ide/pull/1316
 [1318]: https://github.com/enso-org/ide/pull/1318
+[1332]: https://github.com/enso-org/ide/pull/1332
+[1341]: https://github.com/enso-org/ide/pull/1341
 [1328]: https://github.com/enso-org/ide/pull/1328
 [1341]: https://github.com/enso-org/ide/pull/1341
 [1348]: https://github.com/enso-org/ide/pull/1348

src/rust/ide/src/controller/searcher.rs

@@ -657,6 +657,9 @@ impl Searcher {
         };
         let intended_method = self.intended_method();
 
+        // We add the required imports before we create the node/edit its content. This way, we
+        // avoid an intermediate state where imports would already be in use but not yet available.
+        self.add_required_imports()?;
         let id = match *self.mode {
             Mode::NewNode {position} => {
                 let mut new_node           = NewNodeInfo::new_pushed_back(expression);
@@ -676,7 +679,6 @@ impl Searcher {
                 node_id
             }
         };
-        self.add_required_imports()?;
         Ok(id)
     }