Skip to content

Commit 6bd9f15

Browse files
AlexeiQAlexeiQ
authored
Merge pull request #506 from IETS3/bugfix/qualified-enums-duplicated-in-auto-completion
Remove duplicate node substitute action for EnumDeclaration
2 parents 1f6f240 + 97a90d4 commit 6bd9f15

File tree

1 file changed

+56
-7
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel

1 file changed

+56
-7
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps‎

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<model ref="r:1d6bd88a-7393-4b32-b0e6-2d8b3094776e(org.iets3.core.expr.toplevel.editor)">
33
<persistence version="9" />
44
<languages>
5-
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
6-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
7-
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
8-
<use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="1" />
9-
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
5+
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
6+
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
7+
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
8+
<use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="-1" />
9+
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
1010
<use id="3bdedd09-792a-4e15-a4db-83970df3ee86" name="de.itemis.mps.editor.collapsible" version="-1" />
1111
<use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="-1" />
12-
<use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
12+
<use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="-1" />
1313
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1414
</languages>
1515
<imports>
@@ -424,11 +424,15 @@
424424
<child id="8945098465480008160" name="transformationText" index="ZWbT9" />
425425
</concept>
426426
<concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
427-
<concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G" />
427+
<concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
428+
<property id="8224407690718723337" name="doNotGenerateNodeSubstituteAction" index="ZpkCL" />
429+
<child id="621193272061064649" name="sideTransformCondition" index="1m$hSO" />
430+
</concept>
428431
<concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
429432
<property id="484443907677193054" name="focusWrapped" index="3g2DhO" />
430433
<child id="7363578995839435358" name="wrapped" index="1kIj9b" />
431434
</concept>
435+
<concept id="621193272061064420" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell_SideTransformationCondition" flags="ig" index="1m$hWp" />
432436
</language>
433437
<language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
434438
<concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
@@ -1827,8 +1831,16 @@
18271831
<property role="VOm3f" value="false" />
18281832
</node>
18291833
<node concept="1kHk_G" id="3YhAT14YvN6" role="3EZMnx">
1834+
<property role="ZpkCL" value="true" />
18301835
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
18311836
<ref role="1NtTu8" to="yv47:67Y8mp$M9cx" resolve="qualified" />
1837+
<node concept="1m$hWp" id="6lyH5OSTcjc" role="1m$hSO">
1838+
<node concept="3clFbS" id="6lyH5OSTcjd" role="2VODD2">
1839+
<node concept="3clFbF" id="6lyH5OSTcjA" role="3cqZAp">
1840+
<node concept="3clFbT" id="6lyH5OSTcj_" role="3clFbG" />
1841+
</node>
1842+
</node>
1843+
</node>
18321844
</node>
18331845
<node concept="3F0ifn" id="3YhAT14YvN7" role="3EZMnx">
18341846
<property role="3F0ifm" value="enum" />
@@ -1887,6 +1899,13 @@
18871899
<property role="VOm3f" value="true" />
18881900
</node>
18891901
</node>
1902+
<node concept="ZYGn8" id="68WOIGeG1Ja" role="ZWbT9">
1903+
<node concept="3clFbS" id="68WOIGeG1Jb" role="2VODD2">
1904+
<node concept="3clFbF" id="68WOIGeG1Jl" role="3cqZAp">
1905+
<node concept="10Nm6u" id="68WOIGeG1Jk" role="3clFbG" />
1906+
</node>
1907+
</node>
1908+
</node>
18901909
</node>
18911910
<node concept="3F0ifn" id="3YhAT14YvNu" role="3EZMnx">
18921911
<property role="3F0ifm" value="{..}" />
@@ -1909,8 +1928,16 @@
19091928
<node concept="3EZMnI" id="3WWvqarUGzr" role="1QoVPY">
19101929
<property role="S$Qs1" value="true" />
19111930
<node concept="1kHk_G" id="3WWvqarUGzs" role="3EZMnx">
1931+
<property role="ZpkCL" value="true" />
19121932
<ref role="1NtTu8" to="yv47:67Y8mp$M9cx" resolve="qualified" />
19131933
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
1934+
<node concept="1m$hWp" id="6lyH5OSTcbn" role="1m$hSO">
1935+
<node concept="3clFbS" id="6lyH5OSTcbo" role="2VODD2">
1936+
<node concept="3clFbF" id="6lyH5OSTcbv" role="3cqZAp">
1937+
<node concept="3clFbT" id="6lyH5OSTcbu" role="3clFbG" />
1938+
</node>
1939+
</node>
1940+
</node>
19141941
</node>
19151942
<node concept="3F0ifn" id="3WWvqarUGzt" role="3EZMnx">
19161943
<property role="3F0ifm" value="enum" />
@@ -1969,6 +1996,13 @@
19691996
<property role="VOm3f" value="true" />
19701997
</node>
19711998
</node>
1999+
<node concept="ZYGn8" id="68WOIGeG1KK" role="ZWbT9">
2000+
<node concept="3clFbS" id="68WOIGeG1KL" role="2VODD2">
2001+
<node concept="3clFbF" id="68WOIGeG1KV" role="3cqZAp">
2002+
<node concept="10Nm6u" id="68WOIGeG1KU" role="3clFbG" />
2003+
</node>
2004+
</node>
2005+
</node>
19722006
</node>
19732007
<node concept="l2Vlx" id="3WWvqarUGzE" role="2iSdaV" />
19742008
<node concept="3F0ifn" id="3WWvqarUGzF" role="3EZMnx">
@@ -2122,8 +2156,16 @@
21222156
</node>
21232157
<node concept="3EZMnI" id="3YhAT14Yx9l" role="AHCbl">
21242158
<node concept="1kHk_G" id="3YhAT14YxUJ" role="3EZMnx">
2159+
<property role="ZpkCL" value="true" />
21252160
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
21262161
<ref role="1NtTu8" to="yv47:67Y8mp$M9cx" resolve="qualified" />
2162+
<node concept="1m$hWp" id="6lyH5OSQBw1" role="1m$hSO">
2163+
<node concept="3clFbS" id="6lyH5OSQBw2" role="2VODD2">
2164+
<node concept="3clFbF" id="6lyH5OSQI0T" role="3cqZAp">
2165+
<node concept="3clFbT" id="6lyH5OSQI0S" role="3clFbG" />
2166+
</node>
2167+
</node>
2168+
</node>
21272169
</node>
21282170
<node concept="3F0ifn" id="3YhAT14YxUK" role="3EZMnx">
21292171
<property role="3F0ifm" value="enum" />
@@ -2182,6 +2224,13 @@
21822224
<property role="VOm3f" value="true" />
21832225
</node>
21842226
</node>
2227+
<node concept="ZYGn8" id="68WOIGeKJyS" role="ZWbT9">
2228+
<node concept="3clFbS" id="68WOIGeKJyT" role="2VODD2">
2229+
<node concept="3clFbF" id="68WOIGeKJz$" role="3cqZAp">
2230+
<node concept="10Nm6u" id="68WOIGeKJzz" role="3clFbG" />
2231+
</node>
2232+
</node>
2233+
</node>
21852234
</node>
21862235
<node concept="2iRfu4" id="3YhAT14Yx9m" role="2iSdaV" />
21872236
<node concept="VPM3Z" id="3YhAT14Yx9n" role="3F10Kt">

0 commit comments

Comments
 (0)