Skip to content

Commit

Permalink
Merge pull request #1085 from IETS3/bugfix/tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Oct 14, 2024
2 parents c005522 + ac39b8a commit 1a9c338
Show file tree
Hide file tree
Showing 6 changed files with 1,078 additions and 20 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
Format of the log 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.

## October 2024

### Fixed

- The end cells of table rows of all tables where improved and now all support delete and insert actions.

## August 2024

### Added
Expand Down
50 changes: 35 additions & 15 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
<import index="6dpw" ref="r:ea653f2d-c829-4182-b311-a544ef1f4c1f(de.slisson.mps.tables.runtime.gridmodel)" />
<import index="sse1" ref="r:caea7020-da0a-4ba8-aff6-69334bbc9e02(de.slisson.mps.tables.runtime.simplegrid)" />
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="6dpw" ref="r:ea653f2d-c829-4182-b311-a544ef1f4c1f(de.slisson.mps.tables.runtime.gridmodel)" implicit="true" />
</imports>
<registry>
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
Expand Down Expand Up @@ -92,6 +93,9 @@
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
<child id="1145553007750" name="creator" index="2ShVmc" />
</concept>
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
<child id="1137022507850" name="body" index="2VODD2" />
</concept>
Expand Down Expand Up @@ -269,6 +273,9 @@
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
<concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
<child id="1180636770616" name="createdType" index="3zrR0E" />
</concept>
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
Expand Down Expand Up @@ -313,6 +320,10 @@
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1225621920911" name="jetbrains.mps.baseLanguage.collections.structure.InsertElementOperation" flags="nn" index="1sK_Qi">
<child id="1225621943565" name="element" index="1sKFgg" />
<child id="1225621960341" name="index" index="1sKJu8" />
</concept>
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
Expand Down Expand Up @@ -704,14 +715,23 @@
<node concept="3Tqbb2" id="55lPkJGKBxL" role="1tU5fm">
<ref role="ehGHo" to="8qwc:55lPkJGLB68" resolve="LookupTableHeader" />
</node>
<node concept="2OqwBi" id="55lPkJGKBxO" role="33vP2m">
<node concept="2OqwBi" id="55lPkJGKBxP" role="2Oq$k0">
<node concept="2r2w_c" id="55lPkJGKBxQ" role="2Oq$k0" />
<node concept="3Tsc0h" id="55lPkJGKBxR" role="2OqNvi">
<node concept="2OqwBi" id="74LepNSa0mK" role="33vP2m">
<node concept="2OqwBi" id="74LepNS9XMx" role="2Oq$k0">
<node concept="2r2w_c" id="74LepNS9X7m" role="2Oq$k0" />
<node concept="3Tsc0h" id="74LepNS9YqF" role="2OqNvi">
<ref role="3TtcxE" to="8qwc:55lPkJGHmp6" resolve="rows" />
</node>
</node>
<node concept="WFELt" id="55lPkJGKBxS" role="2OqNvi" />
<node concept="1sK_Qi" id="74LepNSa2$s" role="2OqNvi">
<node concept="10bopy" id="74LepNSa2Cq" role="1sKJu8" />
<node concept="2ShNRf" id="74LepNSapdF" role="1sKFgg">
<node concept="3zrR0B" id="74LepNSapZM" role="2ShVmc">
<node concept="3Tqbb2" id="74LepNSapZO" role="3zrR0E">
<ref role="ehGHo" to="8qwc:55lPkJGLB68" resolve="LookupTableHeader" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
Expand All @@ -729,10 +749,10 @@
<node concept="3clFbF" id="55lPkJGKFDJ" role="3cqZAp">
<node concept="2OqwBi" id="55lPkJGKIwk" role="3clFbG">
<node concept="2OqwBi" id="55lPkJGKFPT" role="2Oq$k0">
<node concept="2r2w_c" id="55lPkJGKFDI" role="2Oq$k0" />
<node concept="3Tsc0h" id="55lPkJGKLS7" role="2OqNvi">
<ref role="3TtcxE" to="8qwc:55lPkJGINeh" resolve="cells" />
</node>
<node concept="2r2w_c" id="55lPkJGKFDI" role="2Oq$k0" />
</node>
<node concept="TSZUe" id="55lPkJGKQA9" role="2OqNvi">
<node concept="2pJPEk" id="55lPkJGKR1H" role="25WWJ7">
Expand Down Expand Up @@ -906,10 +926,10 @@
<node concept="3clFbF" id="55lPkJGO3wG" role="3cqZAp">
<node concept="2OqwBi" id="55lPkJGO3wH" role="3clFbG">
<node concept="2OqwBi" id="55lPkJGO3wI" role="2Oq$k0">
<node concept="2r2w_c" id="55lPkJGO3wJ" role="2Oq$k0" />
<node concept="3Tsc0h" id="55lPkJGO3wK" role="2OqNvi">
<ref role="3TtcxE" to="8qwc:55lPkJGINeh" resolve="cells" />
</node>
<node concept="2r2w_c" id="55lPkJGO3wJ" role="2Oq$k0" />
</node>
<node concept="TSZUe" id="55lPkJGO3wL" role="2OqNvi">
<node concept="2pJPEk" id="55lPkJGO3wM" role="25WWJ7">
Expand Down Expand Up @@ -1049,17 +1069,17 @@
<node concept="liA8E" id="55lPkJGGEGb" role="2OqNvi">
<ref role="37wK5l" to="6dpw:DXnsYPPSef" resolve="setCell" />
<node concept="3cmrfG" id="55lPkJGGEIH" role="37wK5m">
<property role="3cmrfH" value="0" />
<property role="3cmrfH" value="1" />
</node>
<node concept="3cmrfG" id="55lPkJGGFvq" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
<node concept="2OqwBi" id="55lPkJGGFYN" role="37wK5m">
<node concept="1frAZD" id="55lPkJGGFCo" role="2Oq$k0" />
<node concept="2CJim2" id="55lPkJGGGei" role="2OqNvi">
<node concept="2r2w_c" id="55lPkJGGGlM" role="2CJshu" />
<node concept="2CJsh3" id="55lPkJGGGek" role="2CJshi">
<node concept="3F1sOY" id="55lPkJGGGpI" role="2wV5jI">
<node concept="2OqwBi" id="74LepNRJZ$V" role="37wK5m">
<node concept="1frAZD" id="74LepNRJZ$W" role="2Oq$k0" />
<node concept="2CJim2" id="74LepNRJZ$X" role="2OqNvi">
<node concept="2r2w_c" id="74LepNRJZ$Y" role="2CJshu" />
<node concept="2CJsh3" id="74LepNRJZ$Z" role="2CJshi">
<node concept="3F1sOY" id="74LepNRJZ_0" role="2wV5jI">
<ref role="1NtTu8" to="8qwc:55lPkJGFLTi" resolve="rowType" />
</node>
</node>
Expand Down
Loading

0 comments on commit 1a9c338

Please sign in to comment.