Skip to content

Commit 2670528

Browse files
author
Alexander Pann
authored
Merge pull request #305 from mbeddr/merge/MPS-2024.3
Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3
2 parents 3445069 + adf82aa commit 2670528

File tree

5 files changed

+263
-2
lines changed

5 files changed

+263
-2
lines changed

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps‎

Lines changed: 186 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
66
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
77
<use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
8+
<use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
89
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
910
</languages>
1011
<imports>
@@ -14,6 +15,7 @@
1415
<import index="25zl" ref="r:7bd127a5-e641-4c13-b150-b9c9b96f76ae(jetbrains.mps.lang.modelapi.editor)" />
1516
<import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
1617
<import index="ryx8" ref="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
18+
<import index="a7xb" ref="r:27556261-c392-413e-ba2a-21ab61a1bc6b(org.mpsqa.arch.pluginSolution.plugin)" />
1719
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1820
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
1921
<import index="lm2w" ref="r:f5e4041f-398d-420c-a501-c76be3c82f70(org.mpsqa.arch.behavior)" implicit="true" />
@@ -189,6 +191,7 @@
189191
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
190192
<child id="1068580123156" name="expression" index="3clFbG" />
191193
</concept>
194+
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
192195
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
193196
<child id="1068580123160" name="condition" index="3clFbw" />
194197
<child id="1068580123161" name="ifTrue" index="3clFbx" />
@@ -233,6 +236,12 @@
233236
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
234237
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
235238
</language>
239+
<language id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension">
240+
<concept id="6626851894249711936" name="jetbrains.mps.lang.extension.structure.ExtensionPointExpression" flags="nn" index="2O5UvJ">
241+
<reference id="6626851894249712469" name="extensionPoint" index="2O5UnU" />
242+
</concept>
243+
<concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
244+
</language>
236245
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
237246
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
238247
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -801,7 +810,6 @@
801810
<node concept="PMmxH" id="2p0G1uTtm2z" role="3EZMnx">
802811
<ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
803812
</node>
804-
<node concept="2iRkQZ" id="6MUZd5Uj9wK" role="2iSdaV" />
805813
<node concept="3EZMnI" id="5gfdDUfJ$A2" role="3EZMnx">
806814
<property role="S$Qs1" value="true" />
807815
<node concept="2iRkQZ" id="5gfdDUfJ$A3" role="2iSdaV" />
@@ -886,6 +894,7 @@
886894
</node>
887895
</node>
888896
</node>
897+
<node concept="2iRkQZ" id="6MUZd5Uj9wK" role="2iSdaV" />
889898
</node>
890899
<node concept="3EZMnI" id="SYt8UYwnix" role="6VMZX">
891900
<node concept="2iRkQZ" id="SYt8UYwniy" role="2iSdaV" />
@@ -1015,6 +1024,85 @@
10151024
</node>
10161025
</node>
10171026
</node>
1027+
<node concept="3cpWs8" id="nTlxy2FN_Z" role="3cqZAp">
1028+
<node concept="3cpWsn" id="nTlxy2FNA0" role="3cpWs9">
1029+
<property role="TrG5h" value="info" />
1030+
<node concept="3uibUv" id="nTlxy2FNA1" role="1tU5fm">
1031+
<ref role="3uigEE" to="a7xb:1B$$sapkXr_" resolve="AdditionalInfo" />
1032+
</node>
1033+
<node concept="2OqwBi" id="nTlxy2FNA2" role="33vP2m">
1034+
<node concept="2OqwBi" id="nTlxy2FNA3" role="2Oq$k0">
1035+
<node concept="2O5UvJ" id="nTlxy2FNA4" role="2Oq$k0">
1036+
<ref role="2O5UnU" to="a7xb:1B$$sapkXrr" resolve="ArchAdditionalInfo" />
1037+
</node>
1038+
<node concept="SfwO_" id="nTlxy2FNA5" role="2OqNvi" />
1039+
</node>
1040+
<node concept="1uHKPH" id="nTlxy2FNA6" role="2OqNvi" />
1041+
</node>
1042+
</node>
1043+
</node>
1044+
<node concept="3clFbJ" id="nTlxy2FNA7" role="3cqZAp">
1045+
<node concept="3clFbS" id="nTlxy2FNA8" role="3clFbx">
1046+
<node concept="3cpWs8" id="nTlxy2FNA9" role="3cqZAp">
1047+
<node concept="3cpWsn" id="nTlxy2FNAa" role="3cpWs9">
1048+
<property role="TrG5h" value="additionaInfo" />
1049+
<node concept="17QB3L" id="nTlxy2FNAb" role="1tU5fm" />
1050+
<node concept="2OqwBi" id="nTlxy2FNAc" role="33vP2m">
1051+
<node concept="37vLTw" id="nTlxy2FNAd" role="2Oq$k0">
1052+
<ref role="3cqZAo" node="nTlxy2FNA0" resolve="info" />
1053+
</node>
1054+
<node concept="liA8E" id="nTlxy2FNAe" role="2OqNvi">
1055+
<ref role="37wK5l" to="a7xb:nTlxy2Eyqk" resolve="getAdditionalComponentDefinitionInfo" />
1056+
<node concept="pncrf" id="nTlxy2FNAg" role="37wK5m" />
1057+
</node>
1058+
</node>
1059+
</node>
1060+
</node>
1061+
<node concept="3clFbJ" id="nTlxy2FNAi" role="3cqZAp">
1062+
<node concept="3clFbS" id="nTlxy2FNAj" role="3clFbx">
1063+
<node concept="3clFbF" id="nTlxy2FNAk" role="3cqZAp">
1064+
<node concept="2OqwBi" id="nTlxy2FNAl" role="3clFbG">
1065+
<node concept="37vLTw" id="nTlxy2FNAm" role="2Oq$k0">
1066+
<ref role="3cqZAo" node="SYt8UYwo3X" resolve="sb" />
1067+
</node>
1068+
<node concept="liA8E" id="nTlxy2FNAn" role="2OqNvi">
1069+
<ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
1070+
<node concept="Xl_RD" id="nTlxy2FNAo" role="37wK5m">
1071+
<property role="Xl_RC" value="&lt;br&gt;" />
1072+
</node>
1073+
</node>
1074+
</node>
1075+
</node>
1076+
<node concept="3clFbF" id="nTlxy2FNAp" role="3cqZAp">
1077+
<node concept="2OqwBi" id="nTlxy2FNAq" role="3clFbG">
1078+
<node concept="37vLTw" id="nTlxy2FNAr" role="2Oq$k0">
1079+
<ref role="3cqZAo" node="SYt8UYwo3X" resolve="sb" />
1080+
</node>
1081+
<node concept="liA8E" id="nTlxy2FNAs" role="2OqNvi">
1082+
<ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
1083+
<node concept="37vLTw" id="nTlxy2FNAt" role="37wK5m">
1084+
<ref role="3cqZAo" node="nTlxy2FNAa" resolve="additionaInfo" />
1085+
</node>
1086+
</node>
1087+
</node>
1088+
</node>
1089+
</node>
1090+
<node concept="3y3z36" id="nTlxy2FNAz" role="3clFbw">
1091+
<node concept="10Nm6u" id="nTlxy2FNA$" role="3uHU7w" />
1092+
<node concept="37vLTw" id="nTlxy2FNA_" role="3uHU7B">
1093+
<ref role="3cqZAo" node="nTlxy2FNAa" resolve="additionaInfo" />
1094+
</node>
1095+
</node>
1096+
</node>
1097+
</node>
1098+
<node concept="3y3z36" id="nTlxy2FNAA" role="3clFbw">
1099+
<node concept="37vLTw" id="nTlxy2FNAB" role="3uHU7B">
1100+
<ref role="3cqZAo" node="nTlxy2FNA0" resolve="info" />
1101+
</node>
1102+
<node concept="10Nm6u" id="nTlxy2FNAC" role="3uHU7w" />
1103+
</node>
1104+
</node>
1105+
<node concept="3clFbH" id="nTlxy2FN_X" role="3cqZAp" />
10181106
<node concept="3clFbF" id="SYt8UYwtWN" role="3cqZAp">
10191107
<node concept="2OqwBi" id="SYt8UYwtWO" role="3clFbG">
10201108
<node concept="37vLTw" id="SYt8UYwtWP" role="2Oq$k0">
@@ -1059,10 +1147,10 @@
10591147
<ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
10601148
</node>
10611149
<node concept="3EZMnI" id="6MUZd5Uje4m" role="3EZMnx">
1062-
<node concept="2iRfu4" id="6MUZd5Uje4p" role="2iSdaV" />
10631150
<node concept="PMmxH" id="7sVKx_$PtuA" role="3EZMnx">
10641151
<ref role="PMmxG" node="7sVKx_$PddL" resolve="ComponentMarker" />
10651152
</node>
1153+
<node concept="2iRfu4" id="6MUZd5Uje4p" role="2iSdaV" />
10661154
<node concept="3F0ifn" id="7_XHz4_yDdU" role="3EZMnx">
10671155
<property role="3F0ifm" value="mps-module:" />
10681156
</node>
@@ -1457,6 +1545,102 @@
14571545
</node>
14581546
</node>
14591547
</node>
1548+
<node concept="3cpWs8" id="1B$$saplSxT" role="3cqZAp">
1549+
<node concept="3cpWsn" id="1B$$saplSxU" role="3cpWs9">
1550+
<property role="TrG5h" value="info" />
1551+
<node concept="3uibUv" id="1B$$saplSmD" role="1tU5fm">
1552+
<ref role="3uigEE" to="a7xb:1B$$sapkXr_" resolve="AdditionalInfo" />
1553+
</node>
1554+
<node concept="2OqwBi" id="1B$$saplSxV" role="33vP2m">
1555+
<node concept="2OqwBi" id="1B$$saplSxW" role="2Oq$k0">
1556+
<node concept="2O5UvJ" id="1B$$saplSxX" role="2Oq$k0">
1557+
<ref role="2O5UnU" to="a7xb:1B$$sapkXrr" resolve="ArchAdditionalInfo" />
1558+
</node>
1559+
<node concept="SfwO_" id="1B$$saplSxY" role="2OqNvi" />
1560+
</node>
1561+
<node concept="1uHKPH" id="1B$$saplSxZ" role="2OqNvi" />
1562+
</node>
1563+
</node>
1564+
</node>
1565+
<node concept="3clFbJ" id="1B$$saplTxT" role="3cqZAp">
1566+
<node concept="3clFbS" id="1B$$saplTxV" role="3clFbx">
1567+
<node concept="3cpWs8" id="nTlxy2_Wp2" role="3cqZAp">
1568+
<node concept="3cpWsn" id="nTlxy2_Wp3" role="3cpWs9">
1569+
<property role="TrG5h" value="additionaInfo" />
1570+
<node concept="17QB3L" id="nTlxy2_WbC" role="1tU5fm" />
1571+
<node concept="2OqwBi" id="nTlxy2_Wp4" role="33vP2m">
1572+
<node concept="37vLTw" id="nTlxy2_Wp5" role="2Oq$k0">
1573+
<ref role="3cqZAo" node="1B$$saplSxU" resolve="info" />
1574+
</node>
1575+
<node concept="liA8E" id="nTlxy2_Wp6" role="2OqNvi">
1576+
<ref role="37wK5l" to="a7xb:1B$$saplrg7" resolve="getAdditionalModuleComponentInfo" />
1577+
<node concept="2OqwBi" id="nTlxy2_Wp7" role="37wK5m">
1578+
<node concept="pncrf" id="nTlxy2_Wp8" role="2Oq$k0" />
1579+
<node concept="2qgKlT" id="nTlxy2_Wp9" role="2OqNvi">
1580+
<ref role="37wK5l" to="lm2w:fm3v0WXaPS" resolve="sourceModule" />
1581+
</node>
1582+
</node>
1583+
</node>
1584+
</node>
1585+
</node>
1586+
</node>
1587+
<node concept="3clFbJ" id="nTlxy2A04h" role="3cqZAp">
1588+
<node concept="3clFbS" id="nTlxy2A04j" role="3clFbx">
1589+
<node concept="3clFbF" id="nTlxy2CuVI" role="3cqZAp">
1590+
<node concept="2OqwBi" id="nTlxy2CwTN" role="3clFbG">
1591+
<node concept="37vLTw" id="nTlxy2CuVG" role="2Oq$k0">
1592+
<ref role="3cqZAo" node="SYt8UYq4Td" resolve="sb" />
1593+
</node>
1594+
<node concept="liA8E" id="nTlxy2CyJH" role="2OqNvi">
1595+
<ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
1596+
<node concept="Xl_RD" id="nTlxy2C$sU" role="37wK5m">
1597+
<property role="Xl_RC" value="&lt;br&gt;" />
1598+
</node>
1599+
</node>
1600+
</node>
1601+
</node>
1602+
<node concept="3clFbF" id="1B$$saplZwp" role="3cqZAp">
1603+
<node concept="2OqwBi" id="1B$$sapm050" role="3clFbG">
1604+
<node concept="37vLTw" id="1B$$saplZwn" role="2Oq$k0">
1605+
<ref role="3cqZAo" node="SYt8UYq4Td" resolve="sb" />
1606+
</node>
1607+
<node concept="liA8E" id="1B$$sapm39V" role="2OqNvi">
1608+
<ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
1609+
<node concept="37vLTw" id="nTlxy2_Wpa" role="37wK5m">
1610+
<ref role="3cqZAo" node="nTlxy2_Wp3" resolve="additionaInfo" />
1611+
</node>
1612+
</node>
1613+
</node>
1614+
</node>
1615+
<node concept="3clFbF" id="1B$$sapm7qI" role="3cqZAp">
1616+
<node concept="2OqwBi" id="1B$$sapmayd" role="3clFbG">
1617+
<node concept="37vLTw" id="1B$$sapm7qG" role="2Oq$k0">
1618+
<ref role="3cqZAo" node="SYt8UYq4Td" resolve="sb" />
1619+
</node>
1620+
<node concept="liA8E" id="1B$$sapmdlD" role="2OqNvi">
1621+
<ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
1622+
<node concept="Xl_RD" id="1B$$sapmdIH" role="37wK5m">
1623+
<property role="Xl_RC" value="&lt;br&gt;" />
1624+
</node>
1625+
</node>
1626+
</node>
1627+
</node>
1628+
</node>
1629+
<node concept="3y3z36" id="nTlxy2A25V" role="3clFbw">
1630+
<node concept="10Nm6u" id="nTlxy2A3dT" role="3uHU7w" />
1631+
<node concept="37vLTw" id="nTlxy2A0tO" role="3uHU7B">
1632+
<ref role="3cqZAo" node="nTlxy2_Wp3" resolve="additionaInfo" />
1633+
</node>
1634+
</node>
1635+
</node>
1636+
</node>
1637+
<node concept="3y3z36" id="1B$$saplXai" role="3clFbw">
1638+
<node concept="37vLTw" id="1B$$saplU0S" role="3uHU7B">
1639+
<ref role="3cqZAo" node="1B$$saplSxU" resolve="info" />
1640+
</node>
1641+
<node concept="10Nm6u" id="1B$$saplXwH" role="3uHU7w" />
1642+
</node>
1643+
</node>
14601644
<node concept="3clFbF" id="SYt8UYsz5q" role="3cqZAp">
14611645
<node concept="2OqwBi" id="SYt8UYs$zu" role="3clFbG">
14621646
<node concept="37vLTw" id="SYt8UYsz5o" role="2Oq$k0">

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
2121
<dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
2222
<dependency reexport="false">3867cfe1-8589-4ef1-9b3c-48b17d473edf(org.mpsqa.base.utils)</dependency>
23+
<dependency reexport="false">96212ac2-423f-4cfb-b211-b58d0546b6bf(org.mpsqa.arch.pluginSolution)</dependency>
2324
</dependencies>
2425
<languageVersions>
2526
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -44,6 +45,7 @@
4445
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
4546
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
4647
<language slang="l:b1ab8c10-c118-4755-bf2a-cebab35cf533:jetbrains.mps.lang.editor.tooltips" version="0" />
48+
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
4749
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
4850
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
4951
<language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
@@ -85,6 +87,7 @@
8587
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
8688
<module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
8789
<module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="1" />
90+
<module reference="96212ac2-423f-4cfb-b211-b58d0546b6bf(org.mpsqa.arch.pluginSolution)" version="0" />
8891
<module reference="3867cfe1-8589-4ef1-9b3c-48b17d473edf(org.mpsqa.base.utils)" version="0" />
8992
</dependencyVersions>
9093
<extendedLanguages />

0 commit comments

Comments
 (0)