Skip to content

Commit 3aa34aa

Browse files
danielratiuAlexander Pannratiud
authored
merge/mps 2023.2 to 2024.1 (#287)
* mpsqa.arch: collapse cells by default * mpsqa.arch: create a new interface ICommentable * mpsqa.arch: add support for commenting single component dependencies * architecture checking enhancements (#276) * arch: fix ModuleComponent_Behavior.getAllModels by considering also models of generators owned by a language * arch: mini cleanup and improvements * lint: added linter "no_alias_defined_for_non_abstract_non_smart_reference_concept" * arch: detect redundantly declared dependencies --------- Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> * arch: support for change impact analysis (#279) * arch: initial implementation for impact analysis * arch: mark impacted regions based on impact analysis results * improve arch editor and linters (#283) * arch: add possibility to set-unset the default collapsing of component definitions * lint: improvements and fixes in the performance linters on the typesystem aspect * lint: added a linter for detecting slow scopes computation * lint,arch: enhance linters and architecture (#285) * lint: make the linter "slow_scope_computation" more robust * arch: implemented simple timed caching to speedup checks of large architectures * ran migration * build.gradle: added 'mps-testing' to the plugins on which migration task depends * lint: File -> Force Save All --------- Co-authored-by: Alexander Pann <apann@itemis.com> Co-authored-by: Daniel Ratiu <ratiud@mail.google.com>
1 parent 5609a81 commit 3aa34aa

18 files changed

+3969
-383
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ ext.allProjectDirectoriesInDependencyOrder = [
324324
'org.mpsqa.testing',
325325
'org.mpsqa.unused'
326326
].collect { file("code/languages/$it") }
327-
ext.mpsPluginRoots = ['mps-build', 'mps-console', 'mps-trove', 'mps-modelchecker', 'mps-tooltips']
327+
ext.mpsPluginRoots = ['mps-build', 'mps-console', 'mps-trove', 'mps-modelchecker', 'mps-tooltips', 'mps-testing']
328328
.collect { new File(mpsHomeDir, "plugins/$it") }
329329
ext.jbrJavaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
330330

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

Lines changed: 554 additions & 57 deletions
Large diffs are not rendered by default.

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

Lines changed: 190 additions & 55 deletions
Large diffs are not rendered by default.

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

Lines changed: 882 additions & 8 deletions
Large diffs are not rendered by default.

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

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:05551064-8349-4600-953f-80c29a849ef4(org.mpsqa.arch.migration)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
6+
<use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
7+
</languages>
8+
<imports />
9+
<registry>
10+
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
11+
<concept id="6911370362349121511" name="jetbrains.mps.lang.smodel.structure.ConceptId" flags="nn" index="2x4n5u">
12+
<property id="6911370362349122519" name="conceptName" index="2x4mPI" />
13+
<property id="6911370362349121516" name="conceptId" index="2x4n5l" />
14+
<property id="6911370362349133804" name="isInterface" index="2x4o5l" />
15+
<child id="6911370362349121514" name="languageIdentity" index="2x4n5j" />
16+
</concept>
17+
<concept id="8415841354032330471" name="jetbrains.mps.lang.smodel.structure.ContainmentLinkId" flags="ng" index="HUanS">
18+
<property id="8415841354032330474" name="linkName" index="HUanP" />
19+
<property id="8415841354032330473" name="linkId" index="HUanQ" />
20+
<child id="8415841354032330472" name="conceptIdentity" index="HUanR" />
21+
</concept>
22+
<concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
23+
<property id="3542851458883439831" name="namespace" index="2V$B1Q" />
24+
<property id="3542851458883439832" name="languageId" index="2V$B1T" />
25+
</concept>
26+
</language>
27+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
28+
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
29+
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
30+
</concept>
31+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
32+
<property id="1169194664001" name="name" index="TrG5h" />
33+
</concept>
34+
</language>
35+
<language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
36+
<concept id="3116305438947623354" name="jetbrains.mps.lang.migration.structure.MoveContainmentLink" flags="ng" index="7a1rN">
37+
<child id="8415841354033040054" name="targetId" index="HTpAD" />
38+
<child id="8415841354033040053" name="sourceId" index="HTpAE" />
39+
</concept>
40+
<concept id="3116305438947553624" name="jetbrains.mps.lang.migration.structure.RefactoringPart" flags="ng" index="7amoh">
41+
<property id="3628660716136424362" name="participant" index="hSBgo" />
42+
<child id="3628660716136424366" name="finalState" index="hSBgs" />
43+
<child id="3628660716136424364" name="initialState" index="hSBgu" />
44+
</concept>
45+
<concept id="2864063292004102367" name="jetbrains.mps.lang.migration.structure.ReflectionNodeReference" flags="ng" index="2pBcaW">
46+
<property id="2864063292004102809" name="nodeName" index="2pBc3U" />
47+
<property id="2864063292004103235" name="modelRef" index="2pBcow" />
48+
<property id="2864063292004103247" name="nodeId" index="2pBcoG" />
49+
</concept>
50+
<concept id="2015900981881695631" name="jetbrains.mps.lang.migration.structure.RefactoringLog" flags="ng" index="W$Crc">
51+
<property id="2015900981881695633" name="fromVersion" index="W$Cri" />
52+
<child id="2015900981881695634" name="part" index="W$Crh" />
53+
<child id="3597905718825595708" name="options" index="1w76sc" />
54+
</concept>
55+
<concept id="7431903976166007326" name="jetbrains.mps.lang.migration.structure.MoveNodeMigrationPart" flags="ng" index="Z4OXk">
56+
<child id="3116305438947564633" name="specialization" index="7agGg" />
57+
<child id="7431903976166276375" name="toNode" index="Z5P1t" />
58+
<child id="7431903976166276373" name="fromNode" index="Z5P1v" />
59+
</concept>
60+
<concept id="7431903976166443707" name="jetbrains.mps.lang.migration.structure.PureMigrationScript" flags="ng" index="Z5qvL">
61+
<property id="7431903976166443708" name="fromVersion" index="Z5qvQ" />
62+
<property id="2151301691306162408" name="description" index="1AQGQl" />
63+
<child id="7431903976166447091" name="part" index="Z5rET" />
64+
</concept>
65+
<concept id="3597905718825595712" name="jetbrains.mps.lang.migration.structure.RefactoringOptions" flags="ng" index="1w76tK">
66+
<child id="3597905718825595718" name="options" index="1w76tQ" />
67+
</concept>
68+
<concept id="3597905718825595715" name="jetbrains.mps.lang.migration.structure.RefactoringOption" flags="ng" index="1w76tN">
69+
<property id="3597905718825595716" name="optionId" index="1w76tO" />
70+
<property id="3597905718825650036" name="description" index="1w7ld4" />
71+
</concept>
72+
</language>
73+
</registry>
74+
<node concept="W$Crc" id="5gfdDUfN4cx">
75+
<property role="3GE5qa" value="refactoring" />
76+
<property role="W$Cri" value="0" />
77+
<property role="TrG5h" value="Update References: comment-&gt;comment" />
78+
<node concept="1w76tK" id="5gfdDUfN4cy" role="1w76sc">
79+
<node concept="1w76tN" id="5gfdDUfN4cz" role="1w76tQ">
80+
<property role="1w76tO" value="moveNode.options.updateLocalInstances" />
81+
<property role="1w7ld4" value="Update instances in current project" />
82+
</node>
83+
<node concept="1w76tN" id="5gfdDUfN4c$" role="1w76tQ">
84+
<property role="1w76tO" value="moveNode.options.updateModelImports" />
85+
<property role="1w7ld4" value="Update model imports" />
86+
</node>
87+
<node concept="1w76tN" id="5gfdDUfN4c_" role="1w76tQ">
88+
<property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
89+
<property role="1w7ld4" value="Update references" />
90+
</node>
91+
<node concept="1w76tN" id="5gfdDUfN4cA" role="1w76tQ">
92+
<property role="1w76tO" value="moveNode.options.writeMigrationScript" />
93+
<property role="1w7ld4" value="Write migration script" />
94+
</node>
95+
<node concept="1w76tN" id="5gfdDUfN4cB" role="1w76tQ">
96+
<property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
97+
<property role="1w7ld4" value="Write refactoring log" />
98+
</node>
99+
</node>
100+
<node concept="7amoh" id="5gfdDUfN4cD" role="W$Crh">
101+
<property role="hSBgo" value="moveNode.updateReferences" />
102+
<node concept="2pBcaW" id="5gfdDUfN4cu" role="hSBgu">
103+
<property role="2pBcoG" value="2756396587892930227" />
104+
<property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
105+
<property role="2pBc3U" value="comment" />
106+
</node>
107+
<node concept="2pBcaW" id="5gfdDUfN4cC" role="hSBgs">
108+
<property role="2pBcoG" value="6057120078481867552" />
109+
<property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
110+
<property role="2pBc3U" value="comment" />
111+
</node>
112+
</node>
113+
</node>
114+
<node concept="Z5qvL" id="5gfdDUfN4cE">
115+
<property role="Z5qvQ" value="0" />
116+
<property role="TrG5h" value="Migrate_MoveLinkUp_0" />
117+
<property role="1AQGQl" value="Move link `comment` to concept `ICommentable`" />
118+
<node concept="Z4OXk" id="5gfdDUfN4cP" role="Z5rET">
119+
<node concept="2pBcaW" id="5gfdDUfN4cN" role="Z5P1v">
120+
<property role="2pBcoG" value="2756396587892930227" />
121+
<property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
122+
<property role="2pBc3U" value="comment_old" />
123+
</node>
124+
<node concept="2pBcaW" id="5gfdDUfN4cO" role="Z5P1t">
125+
<property role="2pBcoG" value="6057120078481867552" />
126+
<property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
127+
<property role="2pBc3U" value="comment" />
128+
</node>
129+
<node concept="7a1rN" id="5gfdDUfN4cM" role="7agGg">
130+
<node concept="HUanS" id="5gfdDUfN4cG" role="HTpAE">
131+
<property role="HUanP" value="comment_old" />
132+
<property role="HUanQ" value="kxwl1jekjmwj" />
133+
<node concept="2x4n5u" id="5gfdDUfN4cH" role="HUanR">
134+
<property role="2x4mPI" value="IComponentLike" />
135+
<property role="2x4o5l" value="true" />
136+
<property role="2x4n5l" value="1nix3erx7wem4" />
137+
<node concept="2V$Bhx" id="5gfdDUfN4cI" role="2x4n5j">
138+
<property role="2V$B1T" value="6c101563-ba1f-458d-b298-a75634941e0c" />
139+
<property role="2V$B1Q" value="org.mpsqa.arch" />
140+
</node>
141+
</node>
142+
</node>
143+
<node concept="HUanS" id="5gfdDUfN4cJ" role="HTpAD">
144+
<property role="HUanP" value="comment" />
145+
<property role="HUanQ" value="1a0otv9sa589s" />
146+
<node concept="2x4n5u" id="5gfdDUfN4cK" role="HUanR">
147+
<property role="2x4mPI" value="ICommentable" />
148+
<property role="2x4o5l" value="true" />
149+
<property role="2x4n5l" value="1a0otv9sa554k" />
150+
<node concept="2V$Bhx" id="5gfdDUfN4cL" role="2x4n5j">
151+
<property role="2V$B1T" value="6c101563-ba1f-458d-b298-a75634941e0c" />
152+
<property role="2V$B1Q" value="org.mpsqa.arch" />
153+
</node>
154+
</node>
155+
</node>
156+
</node>
157+
</node>
158+
</node>
159+
</model>
160+

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclaration" flags="ng" index="25R3W">
2020
<child id="3348158742936976577" name="members" index="25R1y" />
2121
</concept>
22+
<concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
23+
<property id="1225118933224" name="comment" index="YLQ7P" />
24+
</concept>
2225
<concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
2326
<property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
2427
</concept>
@@ -55,6 +58,7 @@
5558
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
5659
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
5760
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
61+
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
5862
</concept>
5963
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
6064
<property id="1169194664001" name="name" index="TrG5h" />
@@ -95,6 +99,11 @@
9599
<property role="TrG5h" value="regexForModulesNamesToWhitelist" />
96100
<ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
97101
</node>
102+
<node concept="1TJgyi" id="5yQ9IyuJEHF" role="1TKVEl">
103+
<property role="IQ2nx" value="6392339501636561771" />
104+
<property role="TrG5h" value="collapseComponentDefinitions" />
105+
<ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
106+
</node>
98107
</node>
99108
<node concept="1TIwiD" id="6MUZd5Uj9vB">
100109
<property role="EcuMT" value="7834852478394603495" />
@@ -148,6 +157,9 @@
148157
<property role="20lbJX" value="fLJekj5/_0__n" />
149158
<ref role="20lvS9" node="Te1zv$_lA2" resolve="SingleComponentDependencyWhitelistEntry" />
150159
</node>
160+
<node concept="PrWs8" id="5gfdDUfRu3S" role="PzmwI">
161+
<ref role="PrY4T" node="5gfdDUfN3cO" resolve="ICommentable" />
162+
</node>
151163
</node>
152164
<node concept="PlHQZ" id="6MUZd5Uj9MP">
153165
<property role="EcuMT" value="7834852478394604725" />
@@ -219,12 +231,18 @@
219231
<node concept="1TJgyj" id="2p0G1uTtfqN" role="1TKVEi">
220232
<property role="IQ2ns" value="2756396587892930227" />
221233
<property role="20lmBu" value="fLJjDmT/aggregation" />
222-
<property role="20kJfa" value="comment" />
234+
<property role="20kJfa" value="comment_old" />
223235
<ref role="20lvS9" to="zqge:2cLqkTm6vgh" resolve="Text" />
236+
<node concept="asaX9" id="5gfdDUfN4cF" role="lGtFl">
237+
<property role="YLQ7P" value="The link was moved to concept &quot;org.mpsqa.arch.structure.ICommentable&quot;" />
238+
</node>
224239
</node>
225240
<node concept="PrWs8" id="6MUZd5UjGNX" role="PrDN$">
226241
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
227242
</node>
243+
<node concept="PrWs8" id="5gfdDUfN3cP" role="PrDN$">
244+
<ref role="PrY4T" node="5gfdDUfN3cO" resolve="ICommentable" />
245+
</node>
228246
</node>
229247
<node concept="1TIwiD" id="fm3v0WWntE">
230248
<property role="EcuMT" value="276423752595634026" />
@@ -277,5 +295,15 @@
277295
<property role="R4oN_" value="a dependency which is forbidden" />
278296
<ref role="1TJDcQ" node="6MUZd5Uj9MQ" resolve="ComponentDependency" />
279297
</node>
298+
<node concept="PlHQZ" id="5gfdDUfN3cO">
299+
<property role="EcuMT" value="6057120078481863476" />
300+
<property role="TrG5h" value="ICommentable" />
301+
<node concept="1TJgyj" id="5gfdDUfN4cw" role="1TKVEi">
302+
<property role="IQ2ns" value="6057120078481867552" />
303+
<property role="20lmBu" value="fLJjDmT/aggregation" />
304+
<property role="20kJfa" value="comment" />
305+
<ref role="20lvS9" to="zqge:2cLqkTm6vgh" resolve="Text" />
306+
</node>
307+
</node>
280308
</model>
281309

0 commit comments

Comments
 (0)