Skip to content

Commit fe0fe89

Browse files
author
Alexander Pann
committed
fix: correct spell checking dependencies
1 parent 4b53710 commit fe0fe89

File tree

6 files changed

+16
-44
lines changed

6 files changed

+16
-44
lines changed

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

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9986,21 +9986,11 @@
99869986
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
99879987
</node>
99889988
</node>
9989-
<node concept="1SiIV0" id="5Jv8_iJO19f" role="3bR37C">
9990-
<node concept="3bR9La" id="5Jv8_iJO19g" role="1SiIV1">
9991-
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
9992-
</node>
9993-
</node>
99949989
<node concept="1SiIV0" id="Guk09KIEVR" role="3bR37C">
99959990
<node concept="3bR9La" id="Guk09KIEVS" role="1SiIV1">
99969991
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
99979992
</node>
99989993
</node>
9999-
<node concept="1SiIV0" id="BlBNLZwmLB" role="3bR37C">
10000-
<node concept="3bR9La" id="BlBNLZwmLC" role="1SiIV1">
10001-
<ref role="3bR37D" to="ffeo:6k1uIrxXxBO" resolve="jetbrains.mps.spellchecker.idea.stubs" />
10002-
</node>
10003-
</node>
100049994
</node>
100059995
<node concept="1E0d5M" id="5Jv8_iJNYsV" role="1E1XAP">
100069996
<ref role="1E0d5P" node="5Jv8_iJNYt2" resolve="de.itemis.mps.spellcheck.runtime" />
@@ -10010,26 +10000,22 @@
1001010000
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
1001110001
</node>
1001210002
</node>
10013-
<node concept="1SiIV0" id="5Jv8_iJO199" role="3bR37C">
10014-
<node concept="Rbm2T" id="5Jv8_iJO19a" role="1SiIV1">
10015-
<ref role="1E1Vl2" to="ffeo:7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
10016-
</node>
10017-
</node>
1001810003
<node concept="1SiIV0" id="5Jv8_iJO19b" role="3bR37C">
1001910004
<node concept="Rbm2T" id="5Jv8_iJO19c" role="1SiIV1">
1002010005
<ref role="1E1Vl2" to="ffeo:2eDSGe9d1pJ" resolve="jetbrains.mps.lang.plugin.standalone" />
1002110006
</node>
1002210007
</node>
10008+
<node concept="1SiIV0" id="6zQhlqNEZYE" role="3bR37C">
10009+
<node concept="3bR9La" id="6zQhlqNEZYF" role="1SiIV1">
10010+
<property role="3bR36h" value="true" />
10011+
<ref role="3bR37D" to="ffeo:3SKb_4JujfJ" resolve="jetbrains.mps.editor.spellcheck" />
10012+
</node>
10013+
</node>
1002310014
<node concept="1SiIV0" id="Guk09KIEVE" role="3bR37C">
1002410015
<node concept="3bR9La" id="Guk09KIEVF" role="1SiIV1">
1002510016
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
1002610017
</node>
1002710018
</node>
10028-
<node concept="1SiIV0" id="BlBNLZwmLq" role="3bR37C">
10029-
<node concept="3bR9La" id="BlBNLZwmLr" role="1SiIV1">
10030-
<ref role="3bR37D" to="ffeo:6k1uIrxXxBO" resolve="jetbrains.mps.spellchecker.idea.stubs" />
10031-
</node>
10032-
</node>
1003310019
</node>
1003410020
<node concept="1E1JtA" id="5Jv8_iJNYt2" role="2G$12L">
1003510021
<property role="BnDLt" value="true" />
@@ -10124,11 +10110,6 @@
1012410110
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
1012510111
</node>
1012610112
</node>
10127-
<node concept="1SiIV0" id="7gY7BQcwjPt" role="3bR37C">
10128-
<node concept="3bR9La" id="7gY7BQcwjPu" role="1SiIV1">
10129-
<ref role="3bR37D" to="ffeo:6k1uIrxXxBO" resolve="jetbrains.mps.spellchecker.idea.stubs" />
10130-
</node>
10131-
</node>
1013210113
</node>
1013310114
</node>
1013410115
<node concept="m$_wf" id="2NTGYE$JTH6" role="3989C9">

‎code/spellcheck/languages/de.itemis.mps.spellcheck/de.itemis.mps.spellcheck.mpl‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<external-templates />
2727
<dependencies>
2828
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
29-
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
3029
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
31-
<dependency reexport="false">9979803b-18d3-440b-8a74-99cec41fc78e(jetbrains.mps.spellchecker.idea.stubs)</dependency>
3230
</dependencies>
3331
<languageVersions>
3432
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -55,15 +53,14 @@
5553
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
5654
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
5755
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
58-
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
5956
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
6057
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
61-
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
6258
<module reference="82194f31-b6f9-4f39-bf3d-bad4ce201c4e(de.itemis.mps.spellcheck)" version="0" />
6359
<module reference="78c362fc-f1ba-42b1-8379-5947d1b08cd4(de.itemis.mps.spellcheck.generator)" version="0" />
6460
<module reference="00725c5b-2d9a-48dc-8a5a-4d4d567a16c9(de.itemis.mps.spellcheck.runtime)" version="0" />
6561
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
6662
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
63+
<module reference="8df3c35e-ad4c-4481-b54b-da424bcb0bc0(jetbrains.mps.editor.spellcheck)" version="0" />
6764
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
6865
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
6966
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
@@ -73,11 +70,10 @@
7370
</generator>
7471
</generators>
7572
<dependencies>
76-
<dependency reexport="false" scope="generate-into">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
7773
<dependency reexport="false" scope="generate-into">ef7bf5ac-d06c-4342-b11d-e42104eb9343(jetbrains.mps.lang.plugin.standalone)</dependency>
7874
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
7975
<dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
80-
<dependency reexport="false">9979803b-18d3-440b-8a74-99cec41fc78e(jetbrains.mps.spellchecker.idea.stubs)</dependency>
76+
<dependency reexport="true">8df3c35e-ad4c-4481-b54b-da424bcb0bc0(jetbrains.mps.editor.spellcheck)</dependency>
8177
</dependencies>
8278
<languageVersions>
8379
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -124,6 +120,7 @@
124120
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
125121
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
126122
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
123+
<module reference="8df3c35e-ad4c-4481-b54b-da424bcb0bc0(jetbrains.mps.editor.spellcheck)" version="0" />
127124
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
128125
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
129126
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />

‎code/spellcheck/languages/de.itemis.mps.spellcheck/generator/templates/[email protected]‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
<languages>
66
<use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
77
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
8-
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
98
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
109
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
1110
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
1211
</languages>
1312
<imports>
1413
<import index="i9z2" ref="r:86608401-3c72-4a8c-a023-f7cfd3cc5fbc(de.itemis.mps.spellcheck.structure)" />
15-
<import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
16-
<import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
1714
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
1815
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
1916
<import index="3oml" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.spellchecker.dictionary(MPS.IDEA/)" />
@@ -27,9 +24,7 @@
2724
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
2825
<import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" />
2926
<import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
30-
<import index="v6uv" ref="9979803b-18d3-440b-8a74-99cec41fc78e/java:com.intellij.spellchecker(jetbrains.mps.spellchecker.idea.stubs/)" />
31-
<import index="hltm" ref="9979803b-18d3-440b-8a74-99cec41fc78e/java:com.intellij.spellchecker.settings(jetbrains.mps.spellchecker.idea.stubs/)" />
32-
<import index="v6uw" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.spellchecker(MPS.IDEA/)" implicit="true" />
27+
<import index="v6uv" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.spellchecker(MPS.IDEA/)" />
3328
</imports>
3429
<registry>
3530
<language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
@@ -326,14 +321,14 @@
326321
<property role="TrG5h" value="provider" />
327322
<node concept="3Tm6S6" id="6v0_VEAE4kl" role="1B3o_S" />
328323
<node concept="3uibUv" id="6v0_VEAE4km" role="1tU5fm">
329-
<ref role="3uigEE" to="v6uw:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
324+
<ref role="3uigEE" to="v6uv:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
330325
</node>
331326
<node concept="2ShNRf" id="6v0_VEAE4kn" role="33vP2m">
332327
<node concept="YeOm9" id="6v0_VEAE4ko" role="2ShVmc">
333328
<node concept="1Y3b0j" id="6v0_VEAE4kp" role="YeSDq">
334329
<property role="2bfB8j" value="true" />
335330
<property role="373rjd" value="true" />
336-
<ref role="1Y3XeK" to="v6uw:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
331+
<ref role="1Y3XeK" to="v6uv:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
337332
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
338333
<node concept="3Tm1VV" id="6v0_VEAE4kq" role="1B3o_S" />
339334
<node concept="2tJIrI" id="6v0_VEAEcuk" role="jymVt" />
@@ -411,7 +406,7 @@
411406
<node concept="3uibUv" id="6v0_VEAEHMR" role="1tU5fm">
412407
<ref role="3uigEE" to="9ti4:~ExtensionPoint" resolve="ExtensionPoint" />
413408
<node concept="3uibUv" id="6v0_VEAEHMU" role="11_B2D">
414-
<ref role="3uigEE" to="v6uw:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
409+
<ref role="3uigEE" to="v6uv:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
415410
</node>
416411
</node>
417412
<node concept="2OqwBi" id="6v0_VEAEHPE" role="33vP2m">
@@ -463,7 +458,7 @@
463458
<node concept="3uibUv" id="6v0_VEAELaX" role="1tU5fm">
464459
<ref role="3uigEE" to="9ti4:~ExtensionPoint" resolve="ExtensionPoint" />
465460
<node concept="3uibUv" id="6v0_VEAELaY" role="11_B2D">
466-
<ref role="3uigEE" to="v6uw:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
461+
<ref role="3uigEE" to="v6uv:~BundledDictionaryProvider" resolve="BundledDictionaryProvider" />
467462
</node>
468463
</node>
469464
<node concept="2OqwBi" id="6v0_VEAELaZ" role="33vP2m">

‎code/spellcheck/languages/de.itemis.mps.spellcheck/models/de.itemis.mps.spellcheck.typesystem.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<imports>
99
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
1010
<import index="snbe" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util.io(MPS.IDEA/)" />
11-
<import index="5wk9" ref="9979803b-18d3-440b-8a74-99cec41fc78e/java:com.intellij.spellchecker.util(jetbrains.mps.spellchecker.idea.stubs/)" />
11+
<import index="5wk9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.spellchecker.util(MPS.IDEA/)" />
1212
<import index="i9z2" ref="r:86608401-3c72-4a8c-a023-f7cfd3cc5fbc(de.itemis.mps.spellcheck.structure)" implicit="true" />
1313
<import index="v6og" ref="r:211706a0-1f54-4f22-a8d7-19e98f4484fb(de.itemis.mps.spellcheck.behavior)" implicit="true" />
1414
</imports>

‎code/spellcheck/solutions/de.itemis.mps.spellcheck.runtime/de.itemis.mps.spellcheck.runtime.msd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<dependency reexport="false">8df3c35e-ad4c-4481-b54b-da424bcb0bc0(jetbrains.mps.editor.spellcheck)</dependency>
1818
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
1919
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
20-
<dependency reexport="false">9979803b-18d3-440b-8a74-99cec41fc78e(jetbrains.mps.spellchecker.idea.stubs)</dependency>
2120
</dependencies>
2221
<languageVersions>
2322
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />

‎code/spellcheck/solutions/de.itemis.mps.spellcheck.runtime/models/de.itemis.mps.spellcheck.runtime.plugin.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
2121
<import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
2222
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
23-
<import index="v6uv" ref="9979803b-18d3-440b-8a74-99cec41fc78e/java:com.intellij.spellchecker(jetbrains.mps.spellchecker.idea.stubs/)" />
23+
<import index="v6uv" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.spellchecker(MPS.IDEA/)" />
2424
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
2525
</imports>
2626
<registry>

0 commit comments

Comments
 (0)