From cce418a41c147e4aeb574b1a1bd957f017a02b63 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 20 Jan 2025 10:50:35 +0100 Subject: [PATCH 1/4] editor.diagram: layout ports after initializing subdiagrams --- CHANGELOG.md | 10 ++ .../mps/editor/diagram/runtime/jgraph.mps | 30 ++-- .../de.itemis.mps.extensions.changelog.mps | 161 +++++++++++++----- 3 files changed, 145 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9e1782c5..636326071 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,18 @@ All notable changes to this project are documented in this file. The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. +## January 2025 + +### Fixed + +- *de.itemis.mps.editor.diagram*: An issue was fixed where diagrams with sub-diagrams had ports at the wrong position when the diagram was first opened + ## December 2024 +### Changed + +- combine multiple elements without spaces Reduced from Errors to Warning checks that force policies for all concepts in a language. In this way one can prototype with small set of merge policies. Use Partial police flag in your MergingPolicy to deactivate runtime checks as well. + ### Added - *de.itemis.mps.editor.diagram*: Edges now support custom IDs. diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index 814638c34..417a2c959 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -13324,21 +13324,6 @@ - - - - - - - - - - - - - - - @@ -13582,6 +13567,21 @@ + + + + + + + + + + + + + + + diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps index 19c390513..6643c8edf 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -105,6 +105,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255,6 +340,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -384,47 +504,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f81890ef8b625ceb4da003983aff4ee5e40587f9 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 20 Jan 2025 15:17:59 +0100 Subject: [PATCH 2/4] modellisteners: clear the fast node finder cache when the child is removed --- .../mbeddr/mpsutil/modellisteners/runtime.mps | 15 ++++++++ .../languageModels/listeners.mps | 34 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps index c4ecaeaab..73e4a059d 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps @@ -22,6 +22,7 @@ + @@ -1572,6 +1573,20 @@ + + + + + + + + + + + + + + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/listeners.mps b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/listeners.mps index 4e4996c86..8e5baae90 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/listeners.mps +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/listeners.mps @@ -57,9 +57,16 @@ + + + + + + + @@ -77,6 +84,7 @@ + @@ -102,6 +110,7 @@ + @@ -180,6 +189,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 871bac593c495da4544c78206bdcb6f65e28446a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 22 Jan 2025 09:10:10 +0100 Subject: [PATCH 3/4] update the changelog --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d563d90f5..101ba9f94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,6 @@ All notable changes to this project are documented in this file. The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. -## January 2025 - -### Fixed - -- *de.itemis.mps.editor.diagram*: An issue was fixed where diagrams with sub-diagrams had ports at the wrong position when the diagram was first opened - ## December 2024 ### Changed From 746f567b91f164e401bd64a6c0d62dec74f45afc Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 22 Jan 2025 09:30:45 +0100 Subject: [PATCH 4/4] run migrations --- .../itemis/mps/editor/diagram/runtime/jgraph.mps | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index fb77b6429..33d8821db 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -197,7 +197,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -457,7 +457,7 @@ - + @@ -576,7 +576,7 @@ - + @@ -649,7 +649,7 @@ - +