Skip to content

Commit 3fe859a

Browse files
Merge pull request #344 from mbeddr/merge/MPS-2024.3
Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3
2 parents 6830db9 + 3244a05 commit 3fe859a

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
<reference id="6592112598314499066" name="target" index="m$_y1" />
9393
</concept>
9494
<concept id="3570488090019868065" name="jetbrains.mps.build.mps.structure.BuildMpsLayout_AutoPluginLayoutType" flags="ng" index="pUk6x" />
95+
<concept id="7939233666839079194" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleRef" flags="ng" index="2EVzJI">
96+
<reference id="7939233666839079195" name="module" index="2EVzJJ" />
97+
</concept>
9598
<concept id="1500819558095907805" name="jetbrains.mps.build.mps.structure.BuildMps_Group" flags="ng" index="2G$12M">
9699
<child id="1500819558095907806" name="modules" index="2G$12L" />
97100
</concept>
@@ -125,6 +128,7 @@
125128
</concept>
126129
<concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
127130
<concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
131+
<child id="7939233666839079197" name="accessory" index="2EVzJD" />
128132
<child id="3189788309731917348" name="runtime" index="1E1XAP" />
129133
<child id="9200313594498201639" name="generator" index="1TViLv" />
130134
</concept>
@@ -254,6 +258,9 @@
254258
<node concept="m$_yC" id="72L9LYdx1cL" role="m$_yJ">
255259
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
256260
</node>
261+
<node concept="m$_yC" id="1n_6a3Gunqn" role="m$_yJ">
262+
<ref role="m$_y1" to="ffeo:4O0hKJpjIV3" resolve="jetbrains.mps.ide.devkit" />
263+
</node>
257264
</node>
258265
<node concept="2G$12M" id="3dqUbgQmcyz" role="3989C9">
259266
<property role="TrG5h" value="org.mpsqa.lint" />
@@ -448,6 +455,9 @@
448455
<ref role="3bR37D" to="2tou:zudvsqcgIl" resolve="org.mpsqa.base.utils" />
449456
</node>
450457
</node>
458+
<node concept="2EVzJI" id="1n_6a3Gunpt" role="2EVzJD">
459+
<ref role="2EVzJJ" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
460+
</node>
451461
</node>
452462
<node concept="1E1JtD" id="3ghOW5HWiKq" role="2G$12L">
453463
<property role="BnDLt" value="true" />
@@ -587,6 +597,7 @@
587597
<node concept="1E1JtA" id="3ywQ_KXEkYC" role="2G$12L">
588598
<property role="TrG5h" value="org.mpsqa.lint.generic.linters_library" />
589599
<property role="3LESm3" value="a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9" />
600+
<property role="BnDLt" value="true" />
590601
<node concept="398BVA" id="3ywQ_KXEkYG" role="3LF7KH">
591602
<ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
592603
<node concept="2Ry0Ak" id="3ywQ_KXEkYM" role="iGT6I">

code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<classes generated="true" path="${module}/classes_gen" />
1111
</facet>
1212
</facets>
13-
<accessoryModels />
13+
<accessoryModels>
14+
<model modelUID="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
15+
</accessoryModels>
1416
<generators>
1517
<generator alias="main" namespace="org.mpsqa.lint.generic.generator" uuid="63d1f8cf-e65e-4d00-bcfa-f196ad4419ca">
1618
<models>

0 commit comments

Comments
 (0)