Skip to content

Merge maintenance/mps20243 into master #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mps-ci-buildbot merged 7 commits into from
Feb 3, 2025
+1,183 −64
Merged

Merge maintenance/mps20243 into master #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfb99fe
editor.diagram: make some graph component options customizable
Jan 28, 2025
4b9fd51
run migrations
Jan 28, 2025
6b44df0
Merge pull request #1139 from JetBrains/bugfix/diagram_graph_componen…
Jan 28, 2025
640a8fb
mpsutil.blutil: provide a special editor hint for editors that are si…
Jan 30, 2025
1229436
Merge branch 'maintenance/mps20241' into merge/mps20241
sergej-koscejev Feb 3, 2025
7e29fdb
Merge pull request #1140 from JetBrains/merge/mps20241
mps-ci-buildbot Feb 3, 2025
fed9e68
Merge pull request #1149 from JetBrains/merge/mps20243
mps-ci-buildbot Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ 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

### Added

- *de.itemis.mps.editor.diagram*: Some more options of the diagram component like the pan amount and minimum scaling can now be customized in the diagram editor

## December 2024

### Changed
Expand Down
15 changes: 15 additions & 0 deletions code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,16 @@
<concept id="6718020819487620873" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Named" flags="ng" index="A1WHu">
<reference id="6718020819487620874" name="menu" index="A1WHt" />
</concept>
<concept id="5944657839000868711" name="jetbrains.mps.lang.editor.structure.ConceptEditorContextHints" flags="ig" index="2ABfQD">
<child id="5944657839000877563" name="hints" index="2ABdcP" />
</concept>
<concept id="3547227755871693971" name="jetbrains.mps.lang.editor.structure.PredefinedSelector" flags="ng" index="2B6iha">
<property id="2162403111523065396" name="cellId" index="1lyBwo" />
</concept>
<concept id="5944657839003601246" name="jetbrains.mps.lang.editor.structure.ConceptEditorHintDeclaration" flags="ig" index="2BsEeg">
<property id="168363875802087287" name="showInUI" index="2gpH_U" />
<property id="5944657839012629576" name="presentation" index="2BUmq6" />
</concept>
<concept id="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
<property id="3473224453637651917" name="placeInCell" index="CtIbK" />
</concept>
Expand Down Expand Up @@ -4240,5 +4247,13 @@
<node concept="l2Vlx" id="i0MCu6Q" role="2iSdaV" />
</node>
</node>
<node concept="2ABfQD" id="4ji0xD6WAsy">
<property role="TrG5h" value="EditorHints" />
<node concept="2BsEeg" id="4ji0xD6WAsz" role="2ABdcP">
<property role="2gpH_U" value="true" />
<property role="TrG5h" value="performance" />
<property role="2BUmq6" value="performance" />
</node>
</node>
</model>

54 changes: 54 additions & 0 deletions code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
<concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
<child id="8118189177080264854" name="alternative" index="nSUat" />
</concept>
<concept id="5279705229678483897" name="jetbrains.mps.baseLanguage.structure.FloatingPointFloatConstant" flags="nn" index="2$xPTn">
<property id="5279705229678483899" name="value" index="2$xPTl" />
</concept>
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
Expand Down Expand Up @@ -229,6 +232,11 @@
<child id="1742468285817538342" name="disableNodeEditing" index="2gDVEa" />
<child id="53713348769907228" name="autoLayoutOnChange" index="2hB_ot" />
<child id="2060885462441433843" name="allowElementsBelowRequiredSize" index="2F3Mqr" />
<child id="9014008627795543036" name="arrowKeyMoveAmount" index="3b5RbE" />
<child id="9014008627795543367" name="arrowKeyMoveAmountSlow" index="3b5Rhh" />
<child id="9014008627795543370" name="minimumScale" index="3b5Rhs" />
<child id="9014008627795543368" name="panAmount" index="3b5Rhu" />
<child id="9014008627795543369" name="panAmountSlow" index="3b5Rhv" />
<child id="3401785396303280005" name="gridColor" index="1bWipe" />
<child id="7349833668006295675" name="gridSize" index="3ehQaW" />
<child id="5128117196760806289" name="useGridSnapping" index="3wlkzU" />
Expand Down Expand Up @@ -268,6 +276,7 @@
<concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
<concept id="8963411245957652387" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_Query" flags="ig" index="37q72E" />
<concept id="8963411245958754161" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_ParameterObject" flags="ng" index="37u81S" />
<concept id="7899485855304485736" name="de.itemis.mps.editor.diagram.structure.QueryFunction_Float" flags="ig" index="1k1hvw" />
<concept id="8637411062076624999" name="de.itemis.mps.editor.diagram.structure.Function_ConnectionTypes" flags="ig" index="1xLmZY" />
<concept id="8637411062062623445" name="de.itemis.mps.editor.diagram.structure.Parameter_PaletteFolder_Concept" flags="ng" index="1yATlc" />
<concept id="8637411062062430894" name="de.itemis.mps.editor.diagram.structure.Function_PaletteFolder" flags="ig" index="1yB8kR" />
Expand Down Expand Up @@ -932,6 +941,51 @@
</node>
</node>
</node>
<node concept="1k1hvw" id="7OochqQvfTn" role="3b5RbE">
<node concept="3clFbS" id="7OochqQvfTo" role="2VODD2">
<node concept="3clFbF" id="7OochqQvgdB" role="3cqZAp">
<node concept="3cmrfG" id="7OochqQvgdA" role="3clFbG">
<property role="3cmrfH" value="10" />
</node>
</node>
</node>
</node>
<node concept="1k1hvw" id="7OochqQvgf$" role="3b5Rhh">
<node concept="3clFbS" id="7OochqQvgf_" role="2VODD2">
<node concept="3clFbF" id="7OochqQvgfH" role="3cqZAp">
<node concept="3cmrfG" id="7OochqQvgfG" role="3clFbG">
<property role="3cmrfH" value="20" />
</node>
</node>
</node>
</node>
<node concept="1k1hvw" id="7OochqQvgX4" role="3b5Rhs">
<node concept="3clFbS" id="7OochqQvgX5" role="2VODD2">
<node concept="3clFbF" id="7OochqQvhhp" role="3cqZAp">
<node concept="2$xPTn" id="7OochqQvhyq" role="3clFbG">
<property role="2$xPTl" value="0.0f" />
</node>
</node>
</node>
</node>
<node concept="1k1hvw" id="7OochqQvCS7" role="3b5Rhu">
<node concept="3clFbS" id="7OochqQvCS8" role="2VODD2">
<node concept="3clFbF" id="7OochqQvDW0" role="3cqZAp">
<node concept="3cmrfG" id="7OochqQvDVZ" role="3clFbG">
<property role="3cmrfH" value="10" />
</node>
</node>
</node>
</node>
<node concept="1k1hvw" id="7OochqQvDZ3" role="3b5Rhv">
<node concept="3clFbS" id="7OochqQvDZ4" role="2VODD2">
<node concept="3clFbF" id="7OochqQvDZf" role="3cqZAp">
<node concept="3cmrfG" id="7OochqQvDZe" role="3clFbG">
<property role="3cmrfH" value="20" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2ABfQD" id="4_qW8fWM_gV">
Expand Down
Loading