Skip to content

Commit 0b12a60

Browse files
artem-tikhomirovsergej-koscejev
artem-tikhomirov
authored and
sergej-koscejev
committed
htmlcell.demolang: refactor uses of module// and ReloadableModule
1 parent f4fef13 commit 0b12a60

File tree

3 files changed

+280
-263
lines changed

3 files changed

+280
-263
lines changed

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 83 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -4175,6 +4175,9 @@
41754175
<node concept="m$_yC" id="6Y0V2RJk3uA" role="m$_yJ">
41764176
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
41774177
</node>
4178+
<node concept="m$_yC" id="61MeLv2qHeX" role="m$_yJ">
4179+
<ref role="m$_y1" node="2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
4180+
</node>
41784181
<node concept="3_J27D" id="6Y0V2RJk3uD" role="m_cZH">
41794182
<node concept="3Mxwew" id="6Y0V2RJk3uE" role="3MwsjC">
41804183
<property role="3MwjfP" value="de-itemis-mps-selection" />
@@ -4189,9 +4192,6 @@
41894192
<property role="3MwjfP" value="With this plugin you can select nodes in MPS using the mouse. It also allows invoking intentions over a selection of nodes." />
41904193
</node>
41914194
</node>
4192-
<node concept="m$_yC" id="61MeLv2qHeX" role="m$_yJ">
4193-
<ref role="m$_y1" node="2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
4194-
</node>
41954195
</node>
41964196
<node concept="2G$12M" id="6Y0V2RJk1jS" role="3989C9">
41974197
<property role="TrG5h" value="de.itemis.mps.selection" />
@@ -6321,13 +6321,13 @@
63216321
<node concept="m$_yC" id="6Fx0OSkEsAl" role="m$_yJ">
63226322
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
63236323
</node>
6324+
<node concept="m$_yC" id="61MeLv2vKoK" role="m$_yJ">
6325+
<ref role="m$_y1" node="2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
6326+
</node>
63246327
<node concept="2iUeEo" id="6Fx0OSkEsI8" role="2iVFfd">
63256328
<property role="2iUeEt" value="itemis AG" />
63266329
<property role="2iUeEu" value="https://www.itemis.com/en/it-services/methods-and-tools/mps" />
63276330
</node>
6328-
<node concept="m$_yC" id="61MeLv2vKoK" role="m$_yJ">
6329-
<ref role="m$_y1" node="2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
6330-
</node>
63316331
<node concept="m$_yC" id="52McgVhpQ08" role="m$_yJ">
63326332
<ref role="m$_y1" to="ffeo:16mx0EU4lyh" resolve="jetbrains.mps.ide" />
63336333
</node>
@@ -7748,6 +7748,9 @@
77487748
<node concept="m$_yC" id="6860Y5A054l" role="m$_yJ">
77497749
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
77507750
</node>
7751+
<node concept="m$_yC" id="61MeLv3a2r_" role="m$_yJ">
7752+
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
7753+
</node>
77517754
<node concept="2iUeEo" id="2QgPOUCDft6" role="2iVFfd">
77527755
<property role="2iUeEt" value="itemis AG" />
77537756
<property role="2iUeEu" value="https://www.itemis.com/en/it-services/methods-and-tools/mps" />
@@ -7757,9 +7760,6 @@
77577760
<property role="3MwjfP" value="Various MPS utilities, such as node versioning, serializer, and a model merger." />
77587761
</node>
77597762
</node>
7760-
<node concept="m$_yC" id="61MeLv3a2r_" role="m$_yJ">
7761-
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
7762-
</node>
77637763
<node concept="m$_yC" id="5zr7Q_1BGM8" role="m$_yJ">
77647764
<ref role="m$_y1" node="4p3FRivDLPy" resolve="org.apache.commons" />
77657765
</node>
@@ -13079,6 +13079,25 @@
1307913079
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
1308013080
</node>
1308113081
</node>
13082+
<node concept="3rtmxn" id="7ej5dvGAnw" role="3bR31x">
13083+
<node concept="3LXTmp" id="7ej5dvGAnx" role="3rtmxm">
13084+
<node concept="3qWCbU" id="7ej5dvGAny" role="3LXTna">
13085+
<property role="3qWCbO" value="icons/**, resources/**" />
13086+
</node>
13087+
<node concept="398BVA" id="7ej5dvGAnz" role="3LXTmr">
13088+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
13089+
<node concept="2Ry0Ak" id="7ej5dvGAn$" role="iGT6I">
13090+
<property role="2Ry0Am" value="shadowmodels" />
13091+
<node concept="2Ry0Ak" id="7ej5dvGAn_" role="2Ry0An">
13092+
<property role="2Ry0Am" value="solutions" />
13093+
<node concept="2Ry0Ak" id="7ej5dvGAnA" role="2Ry0An">
13094+
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
13095+
</node>
13096+
</node>
13097+
</node>
13098+
</node>
13099+
</node>
13100+
</node>
1308213101
<node concept="1SiIV0" id="3hnHJkNhRR_" role="3bR37C">
1308313102
<node concept="1BurEX" id="3hnHJkNhRRA" role="1SiIV1">
1308413103
<node concept="398BVA" id="3hnHJkNhRRo" role="1BurEY">
@@ -13167,25 +13186,6 @@
1316713186
</node>
1316813187
</node>
1316913188
</node>
13170-
<node concept="3rtmxn" id="7ej5dvGAnw" role="3bR31x">
13171-
<node concept="3LXTmp" id="7ej5dvGAnx" role="3rtmxm">
13172-
<node concept="3qWCbU" id="7ej5dvGAny" role="3LXTna">
13173-
<property role="3qWCbO" value="icons/**, resources/**" />
13174-
</node>
13175-
<node concept="398BVA" id="7ej5dvGAnz" role="3LXTmr">
13176-
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
13177-
<node concept="2Ry0Ak" id="7ej5dvGAn$" role="iGT6I">
13178-
<property role="2Ry0Am" value="shadowmodels" />
13179-
<node concept="2Ry0Ak" id="7ej5dvGAn_" role="2Ry0An">
13180-
<property role="2Ry0Am" value="solutions" />
13181-
<node concept="2Ry0Ak" id="7ej5dvGAnA" role="2Ry0An">
13182-
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
13183-
</node>
13184-
</node>
13185-
</node>
13186-
</node>
13187-
</node>
13188-
</node>
1318913189
</node>
1319013190
</node>
1319113191
<node concept="2G$12M" id="6bkzxtWPDx0" role="3989C9">
@@ -13230,6 +13230,22 @@
1323013230
</node>
1323113231
</node>
1323213232
</node>
13233+
<node concept="3rtmxn" id="7ej5dvGAnC" role="3bR31x">
13234+
<node concept="3LXTmp" id="7ej5dvGAnD" role="3rtmxm">
13235+
<node concept="3qWCbU" id="7ej5dvGAnE" role="3LXTna">
13236+
<property role="3qWCbO" value="icons/**, resources/**" />
13237+
</node>
13238+
<node concept="398BVA" id="7ej5dvGAnF" role="3LXTmr">
13239+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
13240+
<node concept="2Ry0Ak" id="7ej5dvGAnG" role="iGT6I">
13241+
<property role="2Ry0Am" value="batik" />
13242+
<node concept="2Ry0Ak" id="7ej5dvGAnH" role="2Ry0An">
13243+
<property role="2Ry0Am" value="solutions" />
13244+
</node>
13245+
</node>
13246+
</node>
13247+
</node>
13248+
</node>
1323313249
<node concept="1SiIV0" id="3uj04QfIluv" role="3bR37C">
1323413250
<node concept="1BurEX" id="3uj04QfIluw" role="1SiIV1">
1323513251
<node concept="398BVA" id="3uj04QfIluk" role="1BurEY">
@@ -13254,22 +13270,6 @@
1325413270
<ref role="3bR37D" node="2sSK94l$Dwp" resolve="de.itemis.stubs.xml" />
1325513271
</node>
1325613272
</node>
13257-
<node concept="3rtmxn" id="7ej5dvGAnC" role="3bR31x">
13258-
<node concept="3LXTmp" id="7ej5dvGAnD" role="3rtmxm">
13259-
<node concept="3qWCbU" id="7ej5dvGAnE" role="3LXTna">
13260-
<property role="3qWCbO" value="icons/**, resources/**" />
13261-
</node>
13262-
<node concept="398BVA" id="7ej5dvGAnF" role="3LXTmr">
13263-
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
13264-
<node concept="2Ry0Ak" id="7ej5dvGAnG" role="iGT6I">
13265-
<property role="2Ry0Am" value="batik" />
13266-
<node concept="2Ry0Ak" id="7ej5dvGAnH" role="2Ry0An">
13267-
<property role="2Ry0Am" value="solutions" />
13268-
</node>
13269-
</node>
13270-
</node>
13271-
</node>
13272-
</node>
1327313273
</node>
1327413274
</node>
1327513275
<node concept="2G$12M" id="2sSK94l$Dwo" role="3989C9">
@@ -14485,6 +14485,9 @@
1448514485
<node concept="m$_yC" id="TAJODzUZlz" role="m$_yJ">
1448614486
<ref role="m$_y1" node="2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
1448714487
</node>
14488+
<node concept="m$_yC" id="61MeLv2PUTc" role="m$_yJ">
14489+
<ref role="m$_y1" node="6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
14490+
</node>
1448814491
<node concept="3_J27D" id="TAJODzUQvv" role="m_cZH">
1448914492
<node concept="3Mxwew" id="TAJODzUQvw" role="3MwsjC">
1449014493
<property role="3MwjfP" value="com.mbeddr.mpsutil.intentions" />
@@ -14499,9 +14502,6 @@
1449914502
<property role="3MwjfP" value="Enables the grouping of different intentions under one label." />
1450014503
</node>
1450114504
</node>
14502-
<node concept="m$_yC" id="61MeLv2PUTc" role="m$_yJ">
14503-
<ref role="m$_y1" node="6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
14504-
</node>
1450514505
<node concept="m$_yC" id="4TTyUQxowCT" role="m$_yJ">
1450614506
<ref role="m$_y1" node="hCVXosGNJH" resolve="com.mbeddr.mpsutil.modellisteners" />
1450714507
</node>
@@ -16466,9 +16466,6 @@
1646616466
<node concept="m$_yC" id="77YfcvOMZ_x" role="m$_yJ">
1646716467
<ref role="m$_y1" to="ffeo:RJsmGEieyQ" resolve="jetbrains.mps.vcs" />
1646816468
</node>
16469-
<node concept="m$_yC" id="7xgxWxItROc" role="m$_yJ">
16470-
<ref role="m$_y1" node="1sO539bGQvt" resolve="de.slisson.mps.richtext" />
16471-
</node>
1647216469
<node concept="3_J27D" id="77YfcvOMg44" role="m$_yQ">
1647316470
<node concept="3Mxwew" id="77YfcvOMubk" role="3MwsjC">
1647416471
<property role="3MwjfP" value="de.itemis.mps.compare" />
@@ -16496,6 +16493,9 @@
1649616493
<property role="3MwjfP" value="This plugin allows you to compare two nodes programmatically. The comparison can be configured and some features of nodes can be ignored." />
1649716494
</node>
1649816495
</node>
16496+
<node concept="m$_yC" id="7xgxWxItROc" role="m$_yJ">
16497+
<ref role="m$_y1" node="1sO539bGQvt" resolve="de.slisson.mps.richtext" />
16498+
</node>
1649916499
<node concept="m$_yC" id="2$OhZnbv7vA" role="m$_yJ">
1650016500
<ref role="m$_y1" node="F1NWDqr5lJ" resolve="de.itemis.mps.grammarcells" />
1650116501
</node>
@@ -23962,6 +23962,31 @@
2396223962
</node>
2396323963
</node>
2396423964
</node>
23965+
<node concept="1SiIV0" id="naXaFmz4jd" role="3bR37C">
23966+
<node concept="3bR9La" id="naXaFmz4je" role="1SiIV1">
23967+
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
23968+
</node>
23969+
</node>
23970+
<node concept="1SiIV0" id="naXaFmz4jf" role="3bR37C">
23971+
<node concept="3bR9La" id="naXaFmz4jg" role="1SiIV1">
23972+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
23973+
</node>
23974+
</node>
23975+
<node concept="1SiIV0" id="naXaFmz4jh" role="3bR37C">
23976+
<node concept="3bR9La" id="naXaFmz4ji" role="1SiIV1">
23977+
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
23978+
</node>
23979+
</node>
23980+
<node concept="1SiIV0" id="naXaFmz4jl" role="3bR37C">
23981+
<node concept="3bR9La" id="naXaFmz4jm" role="1SiIV1">
23982+
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
23983+
</node>
23984+
</node>
23985+
<node concept="1SiIV0" id="naXaFmz4jn" role="3bR37C">
23986+
<node concept="3bR9La" id="naXaFmz4jo" role="1SiIV1">
23987+
<ref role="3bR37D" node="6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
23988+
</node>
23989+
</node>
2396523990
<node concept="1yeLz9" id="vVBnaOe2HD" role="1TViLv">
2396623991
<property role="TrG5h" value="de.itemis.mps.editor.diagram.demo.elk.generator" />
2396723992
<property role="3LESm3" value="48d94ad6-a113-4499-aacc-a4391725805d" />
@@ -23991,29 +24016,9 @@
2399124016
</node>
2399224017
</node>
2399324018
</node>
23994-
<node concept="1SiIV0" id="naXaFmz4jd" role="3bR37C">
23995-
<node concept="3bR9La" id="naXaFmz4je" role="1SiIV1">
23996-
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
23997-
</node>
23998-
</node>
23999-
<node concept="1SiIV0" id="naXaFmz4jf" role="3bR37C">
24000-
<node concept="3bR9La" id="naXaFmz4jg" role="1SiIV1">
24001-
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
24002-
</node>
24003-
</node>
24004-
<node concept="1SiIV0" id="naXaFmz4jh" role="3bR37C">
24005-
<node concept="3bR9La" id="naXaFmz4ji" role="1SiIV1">
24006-
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
24007-
</node>
24008-
</node>
24009-
<node concept="1SiIV0" id="naXaFmz4jl" role="3bR37C">
24010-
<node concept="3bR9La" id="naXaFmz4jm" role="1SiIV1">
24011-
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
24012-
</node>
24013-
</node>
24014-
<node concept="1SiIV0" id="naXaFmz4jn" role="3bR37C">
24015-
<node concept="3bR9La" id="naXaFmz4jo" role="1SiIV1">
24016-
<ref role="3bR37D" node="6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
24019+
<node concept="1SiIV0" id="naXaFmz4jL" role="3bR37C">
24020+
<node concept="1Busua" id="naXaFmz4jM" role="1SiIV1">
24021+
<ref role="1Busuk" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
2401724022
</node>
2401824023
</node>
2401924024
<node concept="1BupzO" id="naXaFmz4jI" role="3bR31x">
@@ -24038,11 +24043,6 @@
2403824043
</node>
2403924044
</node>
2404024045
</node>
24041-
<node concept="1SiIV0" id="naXaFmz4jL" role="3bR37C">
24042-
<node concept="1Busua" id="naXaFmz4jM" role="1SiIV1">
24043-
<ref role="1Busuk" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
24044-
</node>
24045-
</node>
2404624046
<node concept="3rtmxn" id="naXaFmzPtx" role="3bR31x">
2404724047
<node concept="3LXTmp" id="naXaFmzPty" role="3rtmxm">
2404824048
<node concept="398BVA" id="naXaFmzPtz" role="3LXTmr">
@@ -24996,6 +24996,11 @@
2499624996
</node>
2499724997
</node>
2499824998
</node>
24999+
<node concept="1SiIV0" id="4e238oV9_nN" role="3bR37C">
25000+
<node concept="3bR9La" id="4e238oV9_og" role="1SiIV1">
25001+
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
25002+
</node>
25003+
</node>
2499925004
</node>
2500025005
<node concept="1E1JtD" id="4zIvKyx$aSl" role="2G$12L">
2500125006
<property role="BnDLt" value="true" />

‎code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
</facet>
1313
</facets>
1414
<accessoryModels />
15+
<dependencies>
16+
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
17+
</dependencies>
1518
<languageVersions>
1619
<language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
1720
<language slang="l:a46e4f41-529c-4c2e-bf93-818590da160d:de.itemis.mps.editor.htmlcell" version="0" />
@@ -37,7 +40,10 @@
3740
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
3841
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
3942
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
43+
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
44+
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
4045
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
46+
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
4147
<module reference="4f348220-8c30-49ab-b23f-98fdc5c19b18(de.itemis.mps.editor.htmlcell.demolang)" version="0" />
4248
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
4349
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />

0 commit comments

Comments
 (0)