Skip to content

Commit e136108

Browse files
alexanderpannalexanderpann
authored
Merge branch 'master' into bugfix/untilOpReverseArgs#261
2 parents 1689bc2 + f381c83 commit e136108

File tree

19 files changed

+7409
-348
lines changed

19 files changed

+7409
-348
lines changed

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ We take care of porting changes done in older supported MPS versions to the newe
2222
For details see [wiki](https://github.com/IETS3/iets3.opensource/wiki/Supported-MPS-Versions).
2323

2424
### What MPS versions are currently supported?
25-
- MPS 2020.3 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master))
25+
- MPS 2021.1 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master))
26+
- MPS 2020.3 (branch: [maintenance/mps20203](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20203))
2627
- MPS 2020.2 (branch: [maintenance/mps20202](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20202))
2728
- MPS 2020.1 (branch: [maintenance/mps20201](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20201))
28-
- MPS 2019.3 (branch: [maintenance/mps20193](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20193))
29+
30+
## Community
31+
32+
### Slack
33+
Ask your questions about KernelF and talk to other users and authors of the IETS3 language library on the public [Slack channel](https://jetbrains-mps.slack.com/archives/CBM449YG5)

‎code/languages/org.iets3.opensource/_spreferences/PlatformTemplates/module.msd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<language slang="l:3bf5377a-e904-4ded-9754-5a516023bfaa:com.mbeddr.core.pointers" version="0" />
1717
<language slang="l:a9d69647-0840-491e-bf39-2eb0805d2011:com.mbeddr.core.statements" version="1" />
1818
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
19-
<language slang="l:a482b416-d0c9-473f-8f67-725ed642b3f3:com.mbeddr.mpsutil.breadcrumb" version="0" />
2019
<language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
2120
<language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
2221
<language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />

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

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
2929
<child id="1080736633877" name="cellModel" index="2wV5jI" />
3030
</concept>
31+
<concept id="3547227755871693971" name="jetbrains.mps.lang.editor.structure.PredefinedSelector" flags="ng" index="2B6iha" />
3132
<concept id="1235728439575" name="jetbrains.mps.lang.editor.structure.BaseLineCell" flags="ln" index="2R9Tw8" />
3233
<concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
3334
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
@@ -72,6 +73,11 @@
7273
<child id="1219418656006" name="styleItem" index="3F10Kt" />
7374
</concept>
7475
<concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
76+
<concept id="3647146066980922272" name="jetbrains.mps.lang.editor.structure.SelectInEditorOperation" flags="nn" index="1OKiuA">
77+
<child id="1948540814633499358" name="editorContext" index="lBI5i" />
78+
<child id="1948540814635895774" name="cellSelector" index="lGT1i" />
79+
</concept>
80+
<concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
7581
<concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
7682
<reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
7783
</concept>
@@ -88,9 +94,19 @@
8894
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
8995
<child id="1137022507850" name="body" index="2VODD2" />
9096
</concept>
97+
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
98+
<child id="1068431790190" name="initializer" index="33vP2m" />
99+
</concept>
100+
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
101+
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
102+
</concept>
103+
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
104+
<child id="5680397130376446158" name="type" index="1tU5fm" />
105+
</concept>
91106
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
92107
<child id="1068580123156" name="expression" index="3clFbG" />
93108
</concept>
109+
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
94110
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
95111
<child id="1068581517665" name="statement" index="3cqZAp" />
96112
</concept>
@@ -100,6 +116,10 @@
100116
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
101117
<child id="1068581517676" name="expression" index="3cqZAk" />
102118
</concept>
119+
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
120+
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
121+
</concept>
122+
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
103123
<concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
104124
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
105125
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
@@ -112,6 +132,8 @@
112132
</concept>
113133
</language>
114134
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
135+
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
136+
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
115137
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
116138
<reference id="1138056395725" name="property" index="3TsBF5" />
117139
</concept>
@@ -151,6 +173,7 @@
151173
</node>
152174
</node>
153175
<node concept="3EZMnI" id="2GQBRFCFw0y" role="3EZMnx">
176+
<ref role="1ERwB7" node="7zJMcSxj$uX" resolve="preventDeletion" />
154177
<node concept="3F0ifn" id="2GQBRFCFw12" role="3EZMnx">
155178
<property role="3F0ifm" value="with timeout" />
156179
<node concept="VechU" id="2ZalWa8HPVn" role="3F10Kt">
@@ -184,15 +207,15 @@
184207
<node concept="3clFbS" id="2ZalWa8IziC" role="2VODD2">
185208
<node concept="3clFbF" id="2ZalWa8IzpN" role="3cqZAp">
186209
<node concept="3eOSWO" id="2ZalWa8IAb0" role="3clFbG">
187-
<node concept="3cmrfG" id="2ZalWa8IAom" role="3uHU7w">
188-
<property role="3cmrfH" value="0" />
189-
</node>
190210
<node concept="2OqwBi" id="2ZalWa8IzFd" role="3uHU7B">
191211
<node concept="pncrf" id="2ZalWa8IzpM" role="2Oq$k0" />
192212
<node concept="3TrcHB" id="2ZalWa8I$e6" role="2OqNvi">
193213
<ref role="3TsBF5" to="l80j:2GQBRFCFk_3" resolve="timeout" />
194214
</node>
195215
</node>
216+
<node concept="3cmrfG" id="2ZalWa8IAom" role="3uHU7w">
217+
<property role="3cmrfH" value="0" />
218+
</node>
196219
</node>
197220
</node>
198221
</node>
@@ -214,10 +237,31 @@
214237
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
215238
<node concept="1hAIg9" id="3DYDRw0XrNh" role="1hA7z_">
216239
<node concept="3clFbS" id="3DYDRw0XrNi" role="2VODD2">
217-
<node concept="3clFbF" id="3DYDRw0XrNj" role="3cqZAp">
218-
<node concept="2OqwBi" id="3DYDRw0XrNk" role="3clFbG">
219-
<node concept="0IXxy" id="3DYDRw0XrNl" role="2Oq$k0" />
220-
<node concept="3YRAZt" id="3DYDRw0XrNm" role="2OqNvi" />
240+
<node concept="3cpWs8" id="6PYNGEsYwS4" role="3cqZAp">
241+
<node concept="3cpWsn" id="6PYNGEsYwS5" role="3cpWs9">
242+
<property role="TrG5h" value="p" />
243+
<node concept="3Tqbb2" id="6PYNGEsYwS3" role="1tU5fm" />
244+
<node concept="2OqwBi" id="6PYNGEsYwS6" role="33vP2m">
245+
<node concept="0IXxy" id="6PYNGEsYwS7" role="2Oq$k0" />
246+
<node concept="1mfA1w" id="6PYNGEsYwS8" role="2OqNvi" />
247+
</node>
248+
</node>
249+
</node>
250+
<node concept="3clFbF" id="8$8RMQUMIr" role="3cqZAp">
251+
<node concept="2OqwBi" id="8$8RMQUMIL" role="3clFbG">
252+
<node concept="0IXxy" id="8$8RMQUMIs" role="2Oq$k0" />
253+
<node concept="3YRAZt" id="8$8RMQUMIR" role="2OqNvi" />
254+
</node>
255+
</node>
256+
<node concept="3clFbF" id="6PYNGEsYx0e" role="3cqZAp">
257+
<node concept="2OqwBi" id="6PYNGEsYx6g" role="3clFbG">
258+
<node concept="37vLTw" id="6PYNGEsYx0d" role="2Oq$k0">
259+
<ref role="3cqZAo" node="6PYNGEsYwS5" resolve="p" />
260+
</node>
261+
<node concept="1OKiuA" id="6PYNGEsYxV_" role="2OqNvi">
262+
<node concept="1Q80Hx" id="6PYNGEsYxW9" role="lBI5i" />
263+
<node concept="2B6iha" id="k$AQtABI5G" role="lGT1i" />
264+
</node>
221265
</node>
222266
</node>
223267
</node>
@@ -267,5 +311,29 @@
267311
<ref role="1NtTu8" to="l80j:XhdFKvXSNs" resolve="msg" />
268312
</node>
269313
</node>
314+
<node concept="1h_SRR" id="7zJMcSxj$uX">
315+
<property role="3GE5qa" value="control" />
316+
<property role="TrG5h" value="preventDeletion" />
317+
<node concept="1hA7zw" id="7zJMcSxj$v2" role="1h_SK8">
318+
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
319+
<node concept="1hAIg9" id="7zJMcSxj$v3" role="1hA7z_">
320+
<node concept="3clFbS" id="7zJMcSxj$v4" role="2VODD2" />
321+
</node>
322+
</node>
323+
<node concept="1hA7zw" id="7zJMcSxjEEE" role="1h_SK8">
324+
<property role="1hAc7j" value="7P1WhNABBii/cut_action_id" />
325+
<node concept="1hAIg9" id="7zJMcSxjEEF" role="1hA7z_">
326+
<node concept="3clFbS" id="7zJMcSxjEEG" role="2VODD2" />
327+
</node>
328+
</node>
329+
<node concept="1hA7zw" id="7zJMcSxj$uY" role="1h_SK8">
330+
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
331+
<node concept="1hAIg9" id="7zJMcSxj$uZ" role="1hA7z_">
332+
<node concept="3clFbS" id="7zJMcSxj$v0" role="2VODD2">
333+
<node concept="3clFbH" id="7zJMcSxj$v1" role="3cqZAp" />
334+
</node>
335+
</node>
336+
</node>
337+
</node>
270338
</model>
271339

0 commit comments

Comments
 (0)