Skip to content

Commit

Permalink
Merge pull request #930 from JetBrains/merge/mps20223
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderpann authored Aug 27, 2024
2 parents 20cbbc8 + 7ea0208 commit 8950f29
Show file tree
Hide file tree
Showing 26 changed files with 19,979 additions and 14,873 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e

### Added

- *de.slisson.mps.tables*: Sticky table cells were added. Add the style sheet item *horizontal-sticky-cell* or *vertical-sticky-cell* *to* *a* *table* *cell* *to* *activate* *the* *feature.*
- *de.itemis.mps.editor.diagram*: A new option for diagrams was added to allow boxes to set a new required minimum size.
- *de.slisson.mps.editor.multiline*: A new cell *constant multi-line* can be used to create dynamic read-only text that spans multiple lines.

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21269,6 +21269,11 @@
<ref role="3bR37D" node="4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
</node>
</node>
<node concept="1SiIV0" id="4Dfm9e0q5f" role="3bR37C">
<node concept="3bR9La" id="4Dfm9e0q5g" role="1SiIV1">
<ref role="3bR37D" node="1sO539bGQvB" resolve="de.slisson.mps.richtext" />
</node>
</node>
</node>
<node concept="1E1JtA" id="6$6tsX_CJdr" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -21579,6 +21584,11 @@
<ref role="3bR37D" node="6$6tsX_CISo" resolve="test.de.itemis.mps.editor.diagram.lang" />
</node>
</node>
<node concept="1SiIV0" id="4Dfm9e0q6Y" role="3bR37C">
<node concept="3bR9La" id="4Dfm9e0q6Z" role="1SiIV1">
<ref role="3bR37D" node="1sO539bGQvB" resolve="de.slisson.mps.richtext" />
</node>
</node>
</node>
<node concept="1E1JtD" id="7qi8mU1OzOZ" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -21669,31 +21679,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jd" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4je" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jf" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jg" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jh" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4ji" role="1SiIV1">
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jl" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jm" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jn" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jo" role="1SiIV1">
<ref role="3bR37D" node="6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
</node>
</node>
<node concept="1yeLz9" id="vVBnaOe2HD" role="1TViLv">
<property role="TrG5h" value="de.itemis.mps.editor.diagram.demo.elk.generator" />
<property role="3LESm3" value="48d94ad6-a113-4499-aacc-a4391725805d" />
Expand Down Expand Up @@ -21723,9 +21708,29 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jL" role="3bR37C">
<node concept="1Busua" id="naXaFmz4jM" role="1SiIV1">
<ref role="1Busuk" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
<node concept="1SiIV0" id="naXaFmz4jd" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4je" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jf" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jg" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jh" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4ji" role="1SiIV1">
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jl" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jm" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jn" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jo" role="1SiIV1">
<ref role="3bR37D" node="6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
</node>
</node>
<node concept="1BupzO" id="naXaFmz4jI" role="3bR31x">
Expand All @@ -21750,6 +21755,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jL" role="3bR37C">
<node concept="1Busua" id="naXaFmz4jM" role="1SiIV1">
<ref role="1Busuk" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="3rtmxn" id="naXaFmzPtx" role="3bR31x">
<node concept="3LXTmp" id="naXaFmzPty" role="3rtmxm">
<node concept="398BVA" id="naXaFmzPtz" role="3LXTmr">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<dependency reexport="false">f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes)</dependency>
<dependency reexport="false">fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)</dependency>
<dependency reexport="false">aff569ad-098d-414a-aa23-96963959392c(test.de.itemis.mps.editor.diagram.lang)</dependency>
<dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
</dependencies>
<languageVersions>
<language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
Expand Down Expand Up @@ -78,8 +79,11 @@
<module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
<module reference="21063c66-85ba-4e98-839b-036445b17ae2(de.itemis.mps.editor.layout)" version="0" />
<module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
<module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
<import index="tc27" ref="r:92d28f3c-6acc-431a-94ba-30cd184d2da4(de.itemis.mps.editor.diagram.runtime.substitute)" />
<import index="wo6c" ref="r:de91083f-90a8-4dd4-83b1-8a92d65ab81d(de.itemis.mps.editor.diagram.shapes)" />
<import index="vgho" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:org.eclipse.elk.core.math(de.itemis.mps.editor.diagram.runtime/)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="88j9" ref="r:20c4aa5c-ab36-4815-af32-01895ee9c2f5(de.itemis.mps.editor.diagram.editor)" implicit="true" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
Expand All @@ -32,6 +33,7 @@
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
<concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
<concept id="4242538589859161874" name="jetbrains.mps.lang.editor.structure.ExplicitHintsSpecification" flags="ng" index="2w$q5c">
<child id="4242538589859162459" name="hints" index="2w$qW5" />
</concept>
Expand All @@ -51,6 +53,9 @@
</concept>
<concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
<concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
<concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
<property id="1221209241505" name="value" index="1lJzqX" />
</concept>
<concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
<concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
<concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
Expand All @@ -65,6 +70,9 @@
<concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
</concept>
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
<child id="1142887637401" name="renderingCondition" index="pqm2j" />
</concept>
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
Expand All @@ -73,7 +81,7 @@
<property id="1073389577007" name="text" index="3F0ifm" />
</concept>
<concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
<child id="1219418656006" name="styleItem" index="3F10Kt" />
</concept>
<concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
Expand Down Expand Up @@ -160,7 +168,7 @@
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand All @@ -180,7 +188,7 @@
<child id="8276990574895933173" name="catchBody" index="1zc67A" />
<child id="8276990574895933172" name="throwable" index="1zc67B" />
</concept>
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
Expand Down Expand Up @@ -210,6 +218,7 @@
<child id="8433227566816393050" name="layoutAlgorithm" index="35U2g" />
<child id="1742468285817538342" name="disableNodeEditing" index="2gDVEa" />
<child id="53713348769907228" name="autoLayoutOnChange" index="2hB_ot" />
<child id="2060885462441433843" name="allowElementsBelowRequiredSize" index="2F3Mqr" />
<child id="8637411062076630380" name="connectionTypes" index="1xLlFP" />
<child id="7858611447550199305" name="syncWithModelOnlyOnOpening" index="3y0MdK" />
<child id="8637411062062914773" name="paletteFolder" index="1y_2dc" />
Expand All @@ -219,7 +228,7 @@
<child id="6554619383004026644" name="editorComponent" index="23bJyd" />
</concept>
<concept id="3462102746004176270" name="de.itemis.mps.editor.diagram.structure.DeleteHandler" flags="ig" index="2fs66k" />
<concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ngI" index="ljJFv">
<concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ng" index="ljJFv">
<child id="5725606875425248008" name="delete" index="1ide8m" />
<child id="2044706694575458564" name="labelCell" index="3kqczz" />
<child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
Expand All @@ -231,7 +240,7 @@
</concept>
<concept id="5490129062795541784" name="de.itemis.mps.editor.diagram.structure.PaletteSource_Query" flags="ig" index="yMipj" />
<concept id="5490129062795632136" name="de.itemis.mps.editor.diagram.structure.Parameter_SubstituteInfoFactory" flags="ng" index="yMSl3" />
<concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ngI" index="HB_m5">
<concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ng" index="HB_m5">
<child id="3155126767688717334" name="contentList" index="aCds2" />
</concept>
<concept id="7890587897031726207" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery" flags="ng" index="2M4AIt">
Expand Down Expand Up @@ -282,6 +291,7 @@
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
</concept>
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
Expand All @@ -302,7 +312,7 @@
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
Expand Down Expand Up @@ -412,6 +422,15 @@
</node>
<node concept="2iRfu4" id="4_qW8fWLeFi" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="4B5Ce8Kz3aX" role="3EZMnx">
<node concept="2iRfu4" id="4B5Ce8Kz3aY" role="2iSdaV" />
<node concept="3F0ifn" id="4B5Ce8Kz3aW" role="3EZMnx">
<property role="3F0ifm" value="additional description" />
</node>
<node concept="3F1sOY" id="4B5Ce8Kz3b0" role="3EZMnx">
<ref role="1NtTu8" to="g93z:4B5Ce8Kz36j" resolve="additionalDescription" />
</node>
</node>
<node concept="3F0ifn" id="4_qW8fWLeFT" role="3EZMnx">
<property role="3F0ifm" value="}" />
</node>
Expand Down Expand Up @@ -479,6 +498,27 @@
</node>
</node>
<node concept="2iRkQZ" id="30bR1EZs_2A" role="2iSdaV" />
<node concept="3F1sOY" id="4B5Ce8Kz4$3" role="3EZMnx">
<ref role="1NtTu8" to="g93z:4B5Ce8Kz36j" resolve="additionalDescription" />
<node concept="pkWqt" id="4B5Ce8Kz4$5" role="pqm2j">
<node concept="3clFbS" id="4B5Ce8Kz4$6" role="2VODD2">
<node concept="3clFbF" id="4B5Ce8Kz4$z" role="3cqZAp">
<node concept="2OqwBi" id="4B5Ce8Kz5EV" role="3clFbG">
<node concept="2OqwBi" id="4B5Ce8Kz4LP" role="2Oq$k0">
<node concept="pncrf" id="4B5Ce8Kz4$y" role="2Oq$k0" />
<node concept="3TrEf2" id="4B5Ce8Kz5cU" role="2OqNvi">
<ref role="3Tt5mk" to="g93z:4B5Ce8Kz36j" resolve="additionalDescription" />
</node>
</node>
<node concept="3x8VRR" id="4B5Ce8Kz6E3" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="VSNWy" id="2PdRDsXzFgU" role="3F10Kt">
<property role="1lJzqX" value="10" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="30bR1EZsyJW" role="2M4AHM">
Expand Down Expand Up @@ -831,6 +871,15 @@
</node>
</node>
</node>
<node concept="pkWqt" id="1MpJ6ySoyzK" role="2F3Mqr">
<node concept="3clFbS" id="1MpJ6ySoyzL" role="2VODD2">
<node concept="3clFbF" id="1MpJ6ySoyON" role="3cqZAp">
<node concept="3clFbT" id="1MpJ6ySoyOM" role="3clFbG">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2ABfQD" id="4_qW8fWM_gV">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
</languages>
<imports>
<import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -49,7 +50,7 @@
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
Expand Down Expand Up @@ -80,6 +81,12 @@
<node concept="PrWs8" id="4_qW8fWLenZ" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="1TJgyj" id="4B5Ce8Kz36j" role="1TKVEi">
<property role="IQ2ns" value="5315831828518285715" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="additionalDescription" />
<ref role="20lvS9" to="87nw:2dWzqxEB$Tx" resolve="Text" />
</node>
</node>
<node concept="1TIwiD" id="4_qW8fWLecy">
<property role="TrG5h" value="Attribute" />
Expand Down
Loading

0 comments on commit 8950f29

Please sign in to comment.