Skip to content

Commit

Permalink
Merge pull request #1184 from JetBrains/merge/master
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20243 into master
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Mar 5, 2025
2 parents f88e211 + eb572d5 commit 3437e07
Show file tree
Hide file tree
Showing 4 changed files with 396 additions and 63 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
- *de.itemis.mps.editor.diagram*: An issue was fixed where edges of sub-diagrams where not correctly displayed when the diagram was first opened
- *de.itemis.mps.editor.diagram*: Diagram boxes not properly support borders.

### Added

- *de.itemis.mps.editor.diagram*: Connectable ports are now highlighted in green and non-connectable ports are highlighted in red when you try to create a connection between 2 ports.

## January 2025

### Fixed
Expand Down
80 changes: 53 additions & 27 deletions code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1774,42 +1774,68 @@
<node concept="3Tm1VV" id="7vufT$m7AS0" role="1B3o_S" />
<node concept="3clFbS" id="7vufT$m7AS2" role="3clF47">
<node concept="3clFbF" id="7vufT$m7PaA" role="3cqZAp">
<node concept="1Wc70l" id="7vufT$m7RFM" role="3clFbG">
<node concept="1Wc70l" id="7vufT$m7QAG" role="3uHU7B">
<node concept="1Wc70l" id="7vufT$m7PY2" role="3uHU7B">
<node concept="2OqwBi" id="7vufT$m7PiY" role="3uHU7B">
<node concept="37vLTw" id="7vufT$m7Pa_" role="2Oq$k0">
<ref role="3cqZAo" node="7vufT$m7ARR" resolve="fromNode" />
<node concept="1Wc70l" id="6_uYAT6nsLk" role="3clFbG">
<node concept="2OqwBi" id="6_uYAT6nwBD" role="3uHU7w">
<node concept="37vLTw" id="6_uYAT6nwaS" role="2Oq$k0">
<ref role="3cqZAo" node="7vufT$m7ARX" resolve="toPort" />
</node>
<node concept="liA8E" id="6_uYAT6nwOD" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
<node concept="Xl_RD" id="6_uYAT6nx89" role="37wK5m">
<property role="Xl_RC" value="in" />
</node>
</node>
</node>
<node concept="1Wc70l" id="7vufT$m7RFM" role="3uHU7B">
<node concept="1Wc70l" id="7vufT$m7QAG" role="3uHU7B">
<node concept="1Wc70l" id="6_uYAT6njt1" role="3uHU7B">
<node concept="2OqwBi" id="6_uYAT6nmE8" role="3uHU7w">
<node concept="37vLTw" id="6_uYAT6nkpq" role="2Oq$k0">
<ref role="3cqZAo" node="7vufT$m7ART" resolve="fromPort" />
</node>
<node concept="liA8E" id="6_uYAT6nnFY" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
<node concept="Xl_RD" id="6_uYAT6nnYQ" role="37wK5m">
<property role="Xl_RC" value="out" />
</node>
</node>
</node>
<node concept="1mIQ4w" id="7vufT$m7PNI" role="2OqNvi">
<node concept="chp4Y" id="7vufT$m7PP1" role="cj9EA">
<ref role="cht4Q" to="7fae:4KKQOHJ7Kqo" resolve="IComponent" />
<node concept="1Wc70l" id="7vufT$m7PY2" role="3uHU7B">
<node concept="2OqwBi" id="7vufT$m7PiY" role="3uHU7B">
<node concept="37vLTw" id="7vufT$m7Pa_" role="2Oq$k0">
<ref role="3cqZAo" node="7vufT$m7ARR" resolve="fromNode" />
</node>
<node concept="1mIQ4w" id="7vufT$m7PNI" role="2OqNvi">
<node concept="chp4Y" id="7vufT$m7PP1" role="cj9EA">
<ref role="cht4Q" to="7fae:4KKQOHJ7Kqo" resolve="IComponent" />
</node>
</node>
</node>
<node concept="3y3z36" id="7vufT$m7QqM" role="3uHU7w">
<node concept="37vLTw" id="7vufT$m7Q72" role="3uHU7B">
<ref role="3cqZAo" node="7vufT$m7ART" resolve="fromPort" />
</node>
<node concept="10Nm6u" id="7vufT$m7QzO" role="3uHU7w" />
</node>
</node>
</node>
<node concept="3y3z36" id="7vufT$m7QqM" role="3uHU7w">
<node concept="37vLTw" id="7vufT$m7Q72" role="3uHU7B">
<ref role="3cqZAo" node="7vufT$m7ART" resolve="fromPort" />
<node concept="2OqwBi" id="7vufT$m7QV4" role="3uHU7w">
<node concept="37vLTw" id="7vufT$m7QKu" role="2Oq$k0">
<ref role="3cqZAo" node="7vufT$m7ARV" resolve="toNode" />
</node>
<node concept="10Nm6u" id="7vufT$m7QzO" role="3uHU7w" />
</node>
</node>
<node concept="2OqwBi" id="7vufT$m7QV4" role="3uHU7w">
<node concept="37vLTw" id="7vufT$m7QKu" role="2Oq$k0">
<ref role="3cqZAo" node="7vufT$m7ARV" resolve="toNode" />
</node>
<node concept="1mIQ4w" id="7vufT$m7Rua" role="2OqNvi">
<node concept="chp4Y" id="7vufT$m7Rxl" role="cj9EA">
<ref role="cht4Q" to="7fae:4KKQOHJ7Kqo" resolve="IComponent" />
<node concept="1mIQ4w" id="7vufT$m7Rua" role="2OqNvi">
<node concept="chp4Y" id="7vufT$m7Rxl" role="cj9EA">
<ref role="cht4Q" to="7fae:4KKQOHJ7Kqo" resolve="IComponent" />
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="7vufT$m7SbK" role="3uHU7w">
<node concept="37vLTw" id="7vufT$m7RQ$" role="3uHU7B">
<ref role="3cqZAo" node="7vufT$m7ARX" resolve="toPort" />
<node concept="3y3z36" id="7vufT$m7SbK" role="3uHU7w">
<node concept="37vLTw" id="7vufT$m7RQ$" role="3uHU7B">
<ref role="3cqZAo" node="7vufT$m7ARX" resolve="toPort" />
</node>
<node concept="10Nm6u" id="7vufT$m7Sme" role="3uHU7w" />
</node>
<node concept="10Nm6u" id="7vufT$m7Sme" role="3uHU7w" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit 3437e07

Please sign in to comment.