Skip to content

Commit 109e713

Browse files
markusvoeltermarkusvoelter
committed
* code/languages/org.iets3.opensource/.mps/libraries.xml is back to PROJECT_DOIR
* For the menu priorisation, I now use JBColors to be compatible with Darcula * added a generator for EmptyValue * made Table.lookup null-safe
1 parent e92a792 commit 109e713

File tree

5 files changed

+109
-30
lines changed

5 files changed

+109
-30
lines changed

‎code/languages/org.iets3.opensource/.mps/libraries.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<value>
88
<Library>
99
<option name="name" value="mbeddr.plattform" />
10-
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/com.mbeddr.platform" />
11-
</Library>
10+
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />
11+
</Library>
1212
</value>
1313
</entry>
1414
</map>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<import index="q4oi" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellActions(MPS.Editor/)" />
3939
<import index="av1m" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.style(MPS.Editor/)" />
4040
<import index="fulz" ref="r:6f792c44-2a5d-40e8-9f05-33f7d4ae26ec(jetbrains.mps.editor.runtime.completion)" />
41+
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
4142
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
4243
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
4344
</imports>
@@ -381,6 +382,9 @@
381382
<property id="1176718929932" name="isFinal" index="3TUv4t" />
382383
<child id="1068431790190" name="initializer" index="33vP2m" />
383384
</concept>
385+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
386+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
387+
</concept>
384388
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
385389
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
386390
</concept>
@@ -6956,11 +6960,24 @@
69566960
</node>
69576961
<node concept="liA8E" id="6wzrxL3aZXi" role="2OqNvi">
69586962
<ref role="37wK5l" to="av1m:~EditorMenuItemStyle.setBackgroundColor(java.awt.Color)" resolve="setBackgroundColor" />
6959-
<node concept="2YIFZM" id="6wzrxL3b0wN" role="37wK5m">
6960-
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
6961-
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
6962-
<node concept="Xl_RD" id="6wzrxL3b0Em" role="37wK5m">
6963-
<property role="Xl_RC" value="#eeeeee" />
6963+
<node concept="2ShNRf" id="5s1lueTE6tG" role="37wK5m">
6964+
<node concept="1pGfFk" id="5s1lueTEFuR" role="2ShVmc">
6965+
<property role="373rjd" value="true" />
6966+
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
6967+
<node concept="2YIFZM" id="6wzrxL3b0wN" role="37wK5m">
6968+
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
6969+
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
6970+
<node concept="Xl_RD" id="6wzrxL3b0Em" role="37wK5m">
6971+
<property role="Xl_RC" value="#eeeeee" />
6972+
</node>
6973+
</node>
6974+
<node concept="2YIFZM" id="5s1lueTEL79" role="37wK5m">
6975+
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
6976+
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
6977+
<node concept="Xl_RD" id="5s1lueTEL7a" role="37wK5m">
6978+
<property role="Xl_RC" value="#eeeeee" />
6979+
</node>
6980+
</node>
69646981
</node>
69656982
</node>
69666983
</node>
@@ -7063,18 +7080,31 @@
70637080
</node>
70647081
</node>
70657082
</node>
7066-
<node concept="3clFbF" id="jqB9UdvOmj" role="3cqZAp">
7067-
<node concept="2OqwBi" id="jqB9UdvOmk" role="3clFbG">
7068-
<node concept="37vLTw" id="jqB9UdvOml" role="2Oq$k0">
7083+
<node concept="3clFbF" id="5s1lueTELea" role="3cqZAp">
7084+
<node concept="2OqwBi" id="5s1lueTELeb" role="3clFbG">
7085+
<node concept="37vLTw" id="5s1lueTELec" role="2Oq$k0">
70697086
<ref role="3cqZAo" node="jqB9UdvOmD" resolve="style" />
70707087
</node>
7071-
<node concept="liA8E" id="jqB9UdvOmm" role="2OqNvi">
7088+
<node concept="liA8E" id="5s1lueTELed" role="2OqNvi">
70727089
<ref role="37wK5l" to="av1m:~EditorMenuItemStyle.setBackgroundColor(java.awt.Color)" resolve="setBackgroundColor" />
7073-
<node concept="2YIFZM" id="jqB9UdvOmn" role="37wK5m">
7074-
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
7075-
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
7076-
<node concept="Xl_RD" id="jqB9UdvOmo" role="37wK5m">
7077-
<property role="Xl_RC" value="#eeeeee" />
7090+
<node concept="2ShNRf" id="5s1lueTELee" role="37wK5m">
7091+
<node concept="1pGfFk" id="5s1lueTELef" role="2ShVmc">
7092+
<property role="373rjd" value="true" />
7093+
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
7094+
<node concept="2YIFZM" id="5s1lueTELeg" role="37wK5m">
7095+
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
7096+
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
7097+
<node concept="Xl_RD" id="5s1lueTELeh" role="37wK5m">
7098+
<property role="Xl_RC" value="#eeeeee" />
7099+
</node>
7100+
</node>
7101+
<node concept="2YIFZM" id="5s1lueTELei" role="37wK5m">
7102+
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
7103+
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
7104+
<node concept="Xl_RD" id="5s1lueTELej" role="37wK5m">
7105+
<property role="Xl_RC" value="#eeeeee" />
7106+
</node>
7107+
</node>
70787108
</node>
70797109
</node>
70807110
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/[email protected]‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,6 +2131,13 @@
21312131
</node>
21322132
<node concept="jVnub" id="7bZFIimgIJh">
21332133
<property role="TrG5h" value="Expression2Expression" />
2134+
<node concept="3aamgX" id="5s1lueTGJVC" role="3aUrZf">
2135+
<property role="36QftV" value="true" />
2136+
<ref role="30HIoZ" to="hm2y:3nVyItrZBN9" resolve="EmptyValue" />
2137+
<node concept="gft3U" id="5s1lueTIq6c" role="1lVwrX">
2138+
<node concept="10Nm6u" id="5s1lueTIq6i" role="gfFT$" />
2139+
</node>
2140+
</node>
21342141
<node concept="3aamgX" id="6IxV2nSbW0R" role="3aUrZf">
21352142
<property role="36QftV" value="true" />
21362143
<ref role="30HIoZ" to="hm2y:4rZeNQ6OJ4v" resolve="ParensExpression" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
121121
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
122122
</concept>
123+
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
123124
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
124125
<child id="1178549979242" name="visibility" index="1B3o_S" />
125126
</concept>
@@ -810,6 +811,25 @@
810811
<ref role="3cqZAo" node="6wzrxL2ZM$U" resolve="entries" />
811812
</node>
812813
<node concept="3clFbS" id="6wzrxL2ZQQy" role="2LFqv$">
814+
<node concept="3cpWs8" id="48Q4_iT7kjK" role="3cqZAp">
815+
<node concept="3cpWsn" id="48Q4_iT7kjL" role="3cpWs9">
816+
<property role="TrG5h" value="row" />
817+
<node concept="3uibUv" id="48Q4_iT7khG" role="1tU5fm">
818+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
819+
</node>
820+
<node concept="2OqwBi" id="48Q4_iT7kjM" role="33vP2m">
821+
<node concept="2GrUjf" id="48Q4_iT7kjN" role="2Oq$k0">
822+
<ref role="2Gs0qQ" node="6wzrxL2ZQQw" resolve="e" />
823+
</node>
824+
<node concept="liA8E" id="48Q4_iT7kjO" role="2OqNvi">
825+
<ref role="37wK5l" node="6wzrxL2ZSAF" resolve="get" />
826+
<node concept="37vLTw" id="48Q4_iT7kjP" role="37wK5m">
827+
<ref role="3cqZAo" node="6wzrxL2ZQ_L" resolve="col" />
828+
</node>
829+
</node>
830+
</node>
831+
</node>
832+
</node>
813833
<node concept="3clFbJ" id="6wzrxL30dYM" role="3cqZAp">
814834
<node concept="3clFbS" id="6wzrxL30dYO" role="3clFbx">
815835
<node concept="3cpWs6" id="6wzrxL30gcX" role="3cqZAp">
@@ -818,22 +838,22 @@
818838
</node>
819839
</node>
820840
</node>
821-
<node concept="2OqwBi" id="6wzrxL30nRs" role="3clFbw">
822-
<node concept="2OqwBi" id="6wzrxL30ncr" role="2Oq$k0">
823-
<node concept="2GrUjf" id="6wzrxL30n3N" role="2Oq$k0">
824-
<ref role="2Gs0qQ" node="6wzrxL2ZQQw" resolve="e" />
841+
<node concept="1Wc70l" id="48Q4_iT7kIq" role="3clFbw">
842+
<node concept="3y3z36" id="48Q4_iT7l1T" role="3uHU7B">
843+
<node concept="10Nm6u" id="48Q4_iT7ll4" role="3uHU7w" />
844+
<node concept="37vLTw" id="48Q4_iT7kMA" role="3uHU7B">
845+
<ref role="3cqZAo" node="48Q4_iT7kjL" resolve="row" />
825846
</node>
826-
<node concept="liA8E" id="6wzrxL30nsK" role="2OqNvi">
827-
<ref role="37wK5l" node="6wzrxL2ZSAF" resolve="get" />
828-
<node concept="37vLTw" id="6wzrxL30nt1" role="37wK5m">
829-
<ref role="3cqZAo" node="6wzrxL2ZQ_L" resolve="col" />
847+
</node>
848+
<node concept="2OqwBi" id="6wzrxL30nRs" role="3uHU7w">
849+
<node concept="liA8E" id="6wzrxL30oq7" role="2OqNvi">
850+
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
851+
<node concept="37vLTw" id="6wzrxL30oBA" role="37wK5m">
852+
<ref role="3cqZAo" node="6wzrxL2ZQl$" resolve="value" />
830853
</node>
831854
</node>
832-
</node>
833-
<node concept="liA8E" id="6wzrxL30oq7" role="2OqNvi">
834-
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
835-
<node concept="37vLTw" id="6wzrxL30oBA" role="37wK5m">
836-
<ref role="3cqZAo" node="6wzrxL2ZQl$" resolve="value" />
855+
<node concept="37vLTw" id="48Q4_iT7kF1" role="2Oq$k0">
856+
<ref role="3cqZAo" node="48Q4_iT7kjL" resolve="row" />
837857
</node>
838858
</node>
839859
</node>

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@
260260
</node>
261261
</node>
262262
<node concept="_ixoA" id="cPLa7Ft_v$" role="_iOnB" />
263-
<node concept="_ixoA" id="jqB9UaL7$E" role="_iOnB" />
264263
<node concept="_ixoA" id="jqB9UaL6pJ" role="_iOnB" />
265264
<node concept="2zPypq" id="cPLa7Ft_zE" role="_iOnB">
266265
<property role="TrG5h" value="aNumber" />
@@ -523,6 +522,29 @@
523522
</node>
524523
<node concept="1I1voI" id="2KRUNf1rIyP" role="_fkuS" />
525524
</node>
525+
<node concept="_fkuZ" id="5s1lueTJ6vn" role="_fkp5">
526+
<node concept="_fku$" id="5s1lueTJ6vo" role="_fkur" />
527+
<node concept="1QScDb" id="5s1lueTJ716" role="_fkuY">
528+
<node concept="3Cgsri" id="5s1lueTJ76F" role="1QScD9">
529+
<ref role="3Cgs9T" node="7F9023_N8EA" resolve="val2" />
530+
</node>
531+
<node concept="wdKpt" id="5s1lueTJ6VF" role="30czhm">
532+
<node concept="1QScDb" id="5s1lueTJ6vp" role="30czhm">
533+
<node concept="3AhkFE" id="5s1lueTJ6vq" role="1QScD9">
534+
<node concept="30bXRB" id="5s1lueTJ6vr" role="3AhkFJ">
535+
<property role="30bXRw" value="30" />
536+
</node>
537+
</node>
538+
<node concept="3Ch18X" id="5s1lueTJ6vs" role="30czhm">
539+
<ref role="3Ch1V_" node="7F9023_N8Ey" resolve="WithDefault" />
540+
</node>
541+
</node>
542+
</node>
543+
</node>
544+
<node concept="30bXRB" id="5s1lueTJ6QU" role="_fkuS">
545+
<property role="30bXRw" value="4" />
546+
</node>
547+
</node>
526548
</node>
527549
<node concept="_ixoA" id="7MYpJaZ9rp7" role="_iOnB" />
528550
<node concept="3CkkTf" id="7MYpJaZ9rE9" role="_iOnB">

0 commit comments

Comments
 (0)