Fix expression changing during editing

CHANGELOG.md

@@ -18,10 +18,19 @@ these updates be shipped in a stable release before the end of the year.
   details in
   [the engine release notes](https://github.com/enso-org/enso/blob/main/RELEASES.md).
 
+<br/>![Bug Fixes](/docs/assets/tags/bug_fixes.svg)
+
+#### Visual Environment
+
+- [Fixed a bug where edited node expression was sometimes altered.][1743]. When
+  editing node expression, the changes were occasionally reverted, or the
+  grayed-out parameter names were added to the actual expression.
+
 <br/>
 
 [1700]: https://github.com/enso-org/ide/pull/1700
 [1726]: https://github.com/enso-org/ide/pull/1726
+[1743]: https://github.com/enso-org/ide/pull/1743
 
 # Enso 2.0.0-alpha.10 (2021-07-23)
 

src/rust/ide/src/ide/integration/project.rs

@@ -863,12 +863,14 @@ impl Model {
         };
         let expression_changed =
             !self.expression_views.borrow().get(&id).contains(&&code_and_trees);
-        if expression_changed {
+        let node_is_edited = self.view.graph().frp.node_being_edited.value().contains(&id);
+        if expression_changed && !node_is_edited {
             for sub_expression in node.info.ast().iter_recursive() {
                 if let Some(expr_id) = sub_expression.id {
                     self.node_view_by_expression.borrow_mut().insert(expr_id,id);
                 }
             }
+            info!(self.logger, "Refreshing node {id:?} expression");
             self.view.graph().frp.input.set_node_expression.emit(&(id,code_and_trees.clone()));
             self.expression_views.borrow_mut().insert(id,code_and_trees);
         }
@@ -1338,7 +1340,7 @@ impl Model {
                 Ok(())
             },
             Err(err) => {
-                self.view.graph().frp.remove_node.emit(displayed_id);
+                self.view.graph().frp.remove_node(displayed_id);
                 Err(err)
             }
         }

src/rust/ide/view/graph-editor/src/component/node/expression.rs

@@ -9,7 +9,7 @@ use span_tree::traits::*;
 // === Expression ===
 // ==================
 
-#[derive(Clone,Default,Eq,PartialEq)]
+#[derive(Clone,Debug,Default,Eq,PartialEq)]
 pub struct Expression {
     pub pattern             : Option<String>,
     pub code                : String,
@@ -30,7 +30,7 @@ impl Expression {
     }
 }
 
-impl Debug for Expression {
+impl Display for Expression {
     fn fmt(&self, f:&mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f,"Expression({})",self.code)
     }