Skip to content

Commit e79326c

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1146 from JetBrains/merge/mps20243
Merge maintenance/mps20241 into maintenance/mps20243
2 parents c9c6255 + daf7fd7 commit e79326c

File tree

1 file changed

+144
-2
lines changed

1 file changed

+144
-2
lines changed

‎code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/models/de.itemis.mps.editor.enumeration.runtime.mps‎

Lines changed: 144 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
77
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
88
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
9+
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
910
</languages>
1011
<imports>
1112
<import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
@@ -31,8 +32,8 @@
3132
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
3233
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
3334
<import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
34-
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" implicit="true" />
35-
<import index="w827" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs.openapi(MPS.Core/)" implicit="true" />
35+
<import index="w827" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs.openapi(MPS.Core/)" />
36+
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
3637
</imports>
3738
<registry>
3839
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -222,6 +223,9 @@
222223
<child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
223224
<child id="8276990574886367508" name="body" index="1zxBo7" />
224225
</concept>
226+
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
227+
<child id="8356039341262087992" name="line" index="1aUNEU" />
228+
</concept>
225229
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
226230
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
227231
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
@@ -256,6 +260,14 @@
256260
<property id="1169194664001" name="name" index="TrG5h" />
257261
</concept>
258262
</language>
263+
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
264+
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
265+
<property id="155656958578482949" name="value" index="3oM_SC" />
266+
</concept>
267+
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
268+
<child id="2535923850359271783" name="elements" index="1PaTwD" />
269+
</concept>
270+
</language>
259271
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
260272
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
261273
<child id="1153944400369" name="variable" index="2Gsz3X" />
@@ -2981,6 +2993,136 @@
29812993
</node>
29822994
</node>
29832995
</node>
2996+
<node concept="3clFbJ" id="2dyk275XwSt" role="3cqZAp">
2997+
<node concept="3clFbS" id="2dyk275XwSv" role="3clFbx">
2998+
<node concept="3SKdUt" id="2dyk275Xvxf" role="3cqZAp">
2999+
<node concept="1PaTwC" id="2dyk275Xvxg" role="1aUNEU">
3000+
<node concept="3oM_SD" id="2dyk275Xvxh" role="1PaTwD">
3001+
<property role="3oM_SC" value="hotfix:" />
3002+
</node>
3003+
<node concept="3oM_SD" id="2dyk275Xw3s" role="1PaTwD">
3004+
<property role="3oM_SC" value="in" />
3005+
</node>
3006+
<node concept="3oM_SD" id="2dyk275XGtz" role="1PaTwD">
3007+
<property role="3oM_SC" value="case" />
3008+
</node>
3009+
<node concept="3oM_SD" id="2dyk275XGtW" role="1PaTwD">
3010+
<property role="3oM_SC" value="of" />
3011+
</node>
3012+
<node concept="3oM_SD" id="2dyk275XGul" role="1PaTwD">
3013+
<property role="3oM_SC" value="attempt" />
3014+
</node>
3015+
<node concept="3oM_SD" id="2dyk275Xw4Y" role="1PaTwD">
3016+
<property role="3oM_SC" value="to" />
3017+
</node>
3018+
<node concept="3oM_SD" id="2dyk275Xw5n" role="1PaTwD">
3019+
<property role="3oM_SC" value="load" />
3020+
</node>
3021+
<node concept="3oM_SD" id="2dyk275Xw68" role="1PaTwD">
3022+
<property role="3oM_SC" value="image" />
3023+
</node>
3024+
<node concept="3oM_SD" id="2dyk275Xw6x" role="1PaTwD">
3025+
<property role="3oM_SC" value="from" />
3026+
</node>
3027+
<node concept="3oM_SD" id="2dyk275Xw7i" role="1PaTwD">
3028+
<property role="3oM_SC" value="src" />
3029+
</node>
3030+
<node concept="3oM_SD" id="2dyk275Xw83" role="1PaTwD">
3031+
<property role="3oM_SC" value="jar," />
3032+
</node>
3033+
<node concept="3oM_SD" id="2dyk275XGv6" role="1PaTwD">
3034+
<property role="3oM_SC" value="change" />
3035+
</node>
3036+
<node concept="3oM_SD" id="2dyk275XGvv" role="1PaTwD">
3037+
<property role="3oM_SC" value="the" />
3038+
</node>
3039+
<node concept="3oM_SD" id="2dyk275XGvw" role="1PaTwD">
3040+
<property role="3oM_SC" value="path" />
3041+
</node>
3042+
<node concept="3oM_SD" id="2dyk275Xw8s" role="1PaTwD">
3043+
<property role="3oM_SC" value="to" />
3044+
</node>
3045+
<node concept="3oM_SD" id="2dyk275XGwF" role="1PaTwD">
3046+
<property role="3oM_SC" value="bin" />
3047+
</node>
3048+
<node concept="3oM_SD" id="2dyk275XwaJ" role="1PaTwD">
3049+
<property role="3oM_SC" value="jar" />
3050+
</node>
3051+
<node concept="3oM_SD" id="2dyk275XGyc" role="1PaTwD">
3052+
<property role="3oM_SC" value="instead" />
3053+
</node>
3054+
<node concept="3oM_SD" id="2dyk275XGyX" role="1PaTwD">
3055+
<property role="3oM_SC" value="(previous" />
3056+
</node>
3057+
<node concept="3oM_SD" id="2dyk275XG$6" role="1PaTwD">
3058+
<property role="3oM_SC" value="MPS" />
3059+
</node>
3060+
<node concept="3oM_SD" id="2dyk275XG_h" role="1PaTwD">
3061+
<property role="3oM_SC" value="behaviour," />
3062+
</node>
3063+
<node concept="3oM_SD" id="2dyk275XG_E" role="1PaTwD">
3064+
<property role="3oM_SC" value="since" />
3065+
</node>
3066+
<node concept="3oM_SD" id="2dyk275XGA3" role="1PaTwD">
3067+
<property role="3oM_SC" value="resources" />
3068+
</node>
3069+
<node concept="3oM_SD" id="2dyk275XGAs" role="1PaTwD">
3070+
<property role="3oM_SC" value="are" />
3071+
</node>
3072+
<node concept="3oM_SD" id="2dyk275XGBd" role="1PaTwD">
3073+
<property role="3oM_SC" value="still" />
3074+
</node>
3075+
<node concept="3oM_SD" id="2dyk275XGBY" role="1PaTwD">
3076+
<property role="3oM_SC" value="packaged" />
3077+
</node>
3078+
<node concept="3oM_SD" id="2dyk275XGBZ" role="1PaTwD">
3079+
<property role="3oM_SC" value="in" />
3080+
</node>
3081+
<node concept="3oM_SD" id="2dyk275XGCM" role="1PaTwD">
3082+
<property role="3oM_SC" value="bin" />
3083+
</node>
3084+
<node concept="3oM_SD" id="2dyk275XGDb" role="1PaTwD">
3085+
<property role="3oM_SC" value="jars" />
3086+
</node>
3087+
<node concept="3oM_SD" id="2dyk275XGEk" role="1PaTwD">
3088+
<property role="3oM_SC" value="only)" />
3089+
</node>
3090+
</node>
3091+
</node>
3092+
<node concept="3clFbF" id="2dyk275XBtz" role="3cqZAp">
3093+
<node concept="37vLTI" id="2dyk275XD3i" role="3clFbG">
3094+
<node concept="37vLTw" id="2dyk275XBtx" role="37vLTJ">
3095+
<ref role="3cqZAo" node="7bBLNlFJBbS" resolve="fileName" />
3096+
</node>
3097+
<node concept="2OqwBi" id="2dyk275XtJa" role="37vLTx">
3098+
<node concept="37vLTw" id="2dyk275XtJb" role="2Oq$k0">
3099+
<ref role="3cqZAo" node="7bBLNlFJBbS" resolve="fileName" />
3100+
</node>
3101+
<node concept="liA8E" id="2dyk275XtJc" role="2OqNvi">
3102+
<ref role="37wK5l" to="wyt6:~String.replace(java.lang.CharSequence,java.lang.CharSequence)" resolve="replace" />
3103+
<node concept="Xl_RD" id="2dyk275XtJd" role="37wK5m">
3104+
<property role="Xl_RC" value="-src.jar!/module" />
3105+
</node>
3106+
<node concept="Xl_RD" id="2dyk275XtJe" role="37wK5m">
3107+
<property role="Xl_RC" value=".jar!" />
3108+
</node>
3109+
</node>
3110+
</node>
3111+
</node>
3112+
</node>
3113+
</node>
3114+
<node concept="2OqwBi" id="2dyk275Xy_$" role="3clFbw">
3115+
<node concept="37vLTw" id="2dyk275XxkX" role="2Oq$k0">
3116+
<ref role="3cqZAo" node="7bBLNlFJBbS" resolve="fileName" />
3117+
</node>
3118+
<node concept="liA8E" id="2dyk275X$rq" role="2OqNvi">
3119+
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
3120+
<node concept="Xl_RD" id="2dyk275X$H4" role="37wK5m">
3121+
<property role="Xl_RC" value="-src.jar!/module" />
3122+
</node>
3123+
</node>
3124+
</node>
3125+
</node>
29843126
<node concept="3cpWs8" id="HtNrEHBaby" role="3cqZAp">
29853127
<node concept="3cpWsn" id="HtNrEHBabz" role="3cpWs9">
29863128
<property role="TrG5h" value="imageFile" />

0 commit comments

Comments
 (0)