Skip to content
This repository has been archived by the owner on Dec 28, 2021. It is now read-only.

Fix expression changing during editing #1743

Merged
merged 4 commits into from
Jul 30, 2021
Merged

Fix expression changing during editing #1743

merged 4 commits into from
Jul 30, 2021

Conversation

farmaazon
Copy link
Collaborator

@farmaazon farmaazon commented Jul 30, 2021

Pull Request Description

Important Notes

Checklist

Please include the following checklist in your PR:

  • The CHANGELOG.md was updated with the changes introduced in this PR.
  • The documentation has been updated if necessary.
  • All code conforms to the Rust style guide.
  • All code has automatic tests where possible.
  • All code has been profiled where possible.
  • All code has been manually tested in the IDE.
  • All code has been manually tested in the "debug/interface" scene.
  • All code has been manually tested by the PR owner against our test scenarios.
  • All code has been manually tested by at least one reviewer against our test scenarios.

@farmaazon farmaazon added Difficulty: Intermediate Some prior knowledge required Priority: High Should be scheduled as soon as possible Type: Bug A bug in Enso IDE Category: Controllers The Application layer not bound to visual part Category: GUI The Graphical User Interface labels Jul 30, 2021
@farmaazon farmaazon self-assigned this Jul 30, 2021
@farmaazon farmaazon requested a review from wdanilo as a code owner July 30, 2021 10:24
Copy link
Contributor

@mwu-tow mwu-tow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just print the code without {}

@@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

node_is_edited -> node_is_being_edited

@farmaazon farmaazon merged commit 8decddd into develop Jul 30, 2021
@farmaazon farmaazon deleted the wip/ao/fix branch July 30, 2021 12:38
mwu-tow pushed a commit to enso-org/enso that referenced this pull request Oct 30, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Category: Controllers The Application layer not bound to visual part Category: GUI The Graphical User Interface Difficulty: Intermediate Some prior knowledge required Priority: High Should be scheduled as soon as possible Type: Bug A bug in Enso IDE
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants