Skip to content

Commit fef1a1d

Browse files
wsafonovwsafonov
committed
exclude commented elements from the visible elements scope
1 parent 2e37961 commit fef1a1d

File tree

7 files changed

+562
-50
lines changed

7 files changed

+562
-50
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps‎

Lines changed: 49 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
6565
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
6666
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
67+
<import index="wcxw" ref="r:b9f36c08-4a75-4513-9277-a390d3426e0f(jetbrains.mps.editor.runtime.impl.cellActions)" />
6768
<import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" implicit="true" />
6869
</imports>
6970
<registry>
@@ -419,6 +420,9 @@
419420
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
420421
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
421422
</concept>
423+
<concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
424+
<child id="6750920497477143623" name="conceptArgument" index="3MHPCF" />
425+
</concept>
422426
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
423427
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
424428
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -2033,41 +2037,24 @@
20332037
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
20342038
</node>
20352039
<node concept="X8dFx" id="1KPsfaLJujm" role="2OqNvi">
2036-
<node concept="2OqwBi" id="5$JCxfbTwjt" role="25WWJ7">
2037-
<node concept="2OqwBi" id="5$JCxfbTwju" role="2Oq$k0">
2040+
<node concept="2OqwBi" id="230lIJUbgs" role="25WWJ7">
2041+
<node concept="2OqwBi" id="4QQXQNDecuu" role="2Oq$k0">
2042+
<node concept="13iPFW" id="5$JCxfbTwjv" role="2Oq$k0" />
20382043
<node concept="2Rf3mk" id="2c2AzQdhomR" role="2OqNvi">
20392044
<node concept="1xMEDy" id="2c2AzQdhomT" role="1xVPHs">
20402045
<node concept="chp4Y" id="2c2AzQdhoCp" role="ri$Ld">
20412046
<ref role="cht4Q" to="yv47:2uR5X5ayM7T" resolve="IToplevelExprContent" />
20422047
</node>
20432048
</node>
20442049
</node>
2045-
<node concept="13iPFW" id="5$JCxfbTwjv" role="2Oq$k0" />
20462050
</node>
2047-
<node concept="3zZkjj" id="5$JCxfbTwjx" role="2OqNvi">
2048-
<node concept="1bVj0M" id="5$JCxfbTwjy" role="23t8la">
2049-
<node concept="3clFbS" id="5$JCxfbTwjz" role="1bW5cS">
2050-
<node concept="3clFbF" id="5$JCxfbTwj$" role="3cqZAp">
2051-
<node concept="2OqwBi" id="5$JCxfbTwj_" role="3clFbG">
2052-
<node concept="37vLTw" id="5$JCxfbTwjA" role="2Oq$k0">
2053-
<ref role="3cqZAo" node="5$JCxfbTwjE" resolve="it" />
2054-
</node>
2055-
<node concept="1mIQ4w" id="5$JCxfbTwjB" role="2OqNvi">
2056-
<node concept="25Kdxt" id="5$JCxfbTwjC" role="cj9EA">
2057-
<node concept="2OqwBi" id="1mDdTGHnpv" role="25KhWn">
2058-
<node concept="37vLTw" id="5$JCxfbTwjD" role="2Oq$k0">
2059-
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
2060-
</node>
2061-
<node concept="1rGIog" id="1mDdTGHnMK" role="2OqNvi" />
2062-
</node>
2063-
</node>
2064-
</node>
2065-
</node>
2051+
<node concept="v3k3i" id="230lIJUfBi" role="2OqNvi">
2052+
<node concept="25Kdxt" id="230lIJUhGN" role="v3oSu">
2053+
<node concept="2OqwBi" id="230lIJUlC6" role="25KhWn">
2054+
<node concept="37vLTw" id="230lIJUjQS" role="2Oq$k0">
2055+
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
20662056
</node>
2067-
</node>
2068-
<node concept="Rh6nW" id="5$JCxfbTwjE" role="1bW2Oz">
2069-
<property role="TrG5h" value="it" />
2070-
<node concept="2jxLKc" id="5$JCxfbTwjF" role="1tU5fm" />
2057+
<node concept="1rGIog" id="230lIJUo4M" role="2OqNvi" />
20712058
</node>
20722059
</node>
20732060
</node>
@@ -2079,24 +2066,26 @@
20792066
<node concept="9aQIb" id="5$JCxfbTixX" role="9aQIa">
20802067
<node concept="3clFbS" id="5$JCxfbTixY" role="9aQI4">
20812068
<node concept="3clFbF" id="5m_JEEZZMav" role="3cqZAp">
2082-
<node concept="2OqwBi" id="5m_JEEZZOeu" role="3clFbG">
2069+
<node concept="2OqwBi" id="4QQXQNDig7j" role="3clFbG">
20832070
<node concept="37vLTw" id="5m_JEEZZMat" role="2Oq$k0">
20842071
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
20852072
</node>
20862073
<node concept="liA8E" id="5m_JEEZZP$o" role="2OqNvi">
20872074
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
2088-
<node concept="2YIFZM" id="5m_JEEZZlEm" role="37wK5m">
2089-
<ref role="1Pybhc" to="i8bi:5IkW5anFaW6" resolve="SModelOperations" />
2090-
<ref role="37wK5l" to="i8bi:6cG5ul0xAxx" resolve="nodesIncludingImported" />
2091-
<node concept="2OqwBi" id="5m_JEEZZm93" role="37wK5m">
2075+
<node concept="2OqwBi" id="230lIJTTtd" role="37wK5m">
2076+
<node concept="2OqwBi" id="5m_JEEZZm93" role="2Oq$k0">
20922077
<node concept="13iPFW" id="5m_JEEZZlID" role="2Oq$k0" />
20932078
<node concept="I4A8Y" id="5m_JEEZZmPd" role="2OqNvi" />
20942079
</node>
2095-
<node concept="2OqwBi" id="5m_JEEZZKze" role="37wK5m">
2096-
<node concept="37vLTw" id="5m_JEEZZKjw" role="2Oq$k0">
2097-
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
2080+
<node concept="1j9C0f" id="230lIJTVBo" role="2OqNvi">
2081+
<node concept="25Kdxt" id="230lIJTXRs" role="3MHPCF">
2082+
<node concept="2OqwBi" id="230lIJU1LH" role="25KhWn">
2083+
<node concept="37vLTw" id="230lIJTZd6" role="2Oq$k0">
2084+
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
2085+
</node>
2086+
<node concept="1rGIog" id="230lIJU2UF" role="2OqNvi" />
2087+
</node>
20982088
</node>
2099-
<node concept="1rGIog" id="5m_JEEZZKQC" role="2OqNvi" />
21002089
</node>
21012090
</node>
21022091
</node>
@@ -2143,8 +2132,31 @@
21432132
</node>
21442133
</node>
21452134
<node concept="3clFbF" id="1KPsfaLJH5h" role="3cqZAp">
2146-
<node concept="37vLTw" id="1KPsfaLJH5f" role="3clFbG">
2147-
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
2135+
<node concept="2OqwBi" id="230lIJTLgN" role="3clFbG">
2136+
<node concept="37vLTw" id="1KPsfaLJH5f" role="2Oq$k0">
2137+
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
2138+
</node>
2139+
<node concept="3zZkjj" id="230lIJTFuU" role="2OqNvi">
2140+
<node concept="1bVj0M" id="230lIJTFuW" role="23t8la">
2141+
<node concept="3clFbS" id="230lIJTFuX" role="1bW5cS">
2142+
<node concept="3clFbF" id="230lIJTF$c" role="3cqZAp">
2143+
<node concept="3fqX7Q" id="230lIJTGhW" role="3clFbG">
2144+
<node concept="2YIFZM" id="230lIJTGhY" role="3fr31v">
2145+
<ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
2146+
<ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
2147+
<node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
2148+
<ref role="3cqZAo" node="230lIJTFuY" resolve="it" />
2149+
</node>
2150+
</node>
2151+
</node>
2152+
</node>
2153+
</node>
2154+
<node concept="Rh6nW" id="230lIJTFuY" role="1bW2Oz">
2155+
<property role="TrG5h" value="it" />
2156+
<node concept="2jxLKc" id="230lIJTFuZ" role="1tU5fm" />
2157+
</node>
2158+
</node>
2159+
</node>
21482160
</node>
21492161
</node>
21502162
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
163163
<dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
164164
<dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
165+
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
165166
</dependencies>
166167
<languageVersions>
167168
<language slang="l:f3b3dc28-fee3-49e1-a46e-685e96389094:com.mbeddr.mpsutil.bldoc" version="0" />
@@ -265,6 +266,7 @@
265266
<module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
266267
<module reference="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" version="0" />
267268
<module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
269+
<module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
268270
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
269271
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
270272
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

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

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" />
4040
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
4141
<import index="pq1l" ref="r:93cd1fe8-b296-405c-a6e6-040c940ccfa1(org.iets3.core.expr.toplevel.plugin)" />
42+
<import index="wcxw" ref="r:b9f36c08-4a75-4513-9277-a390d3426e0f(jetbrains.mps.editor.runtime.impl.cellActions)" />
4243
</imports>
4344
<registry>
4445
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -7206,12 +7207,35 @@
72067207
<node concept="3Tm1VV" id="5VEHrQcW_FX" role="1B3o_S" />
72077208
<node concept="3clFbS" id="5VEHrQcW_G1" role="3clF47">
72087209
<node concept="3clFbF" id="5VEHrQcWBW6" role="3cqZAp">
7209-
<node concept="2OqwBi" id="1sudaVNnj0y" role="3clFbG">
7210-
<node concept="13iPFW" id="1sudaVNniFF" role="2Oq$k0" />
7211-
<node concept="2Rf3mk" id="1sudaVNnjqU" role="2OqNvi">
7212-
<node concept="1xMEDy" id="1sudaVNnjqW" role="1xVPHs">
7213-
<node concept="chp4Y" id="1sudaVNnjsk" role="ri$Ld">
7214-
<ref role="cht4Q" to="yv47:2uR5X5ayM7T" resolve="IToplevelExprContent" />
7210+
<node concept="2OqwBi" id="230lIJTCqL" role="3clFbG">
7211+
<node concept="2OqwBi" id="4QQXQNDjvKv" role="2Oq$k0">
7212+
<node concept="13iPFW" id="1sudaVNniFF" role="2Oq$k0" />
7213+
<node concept="2Rf3mk" id="1sudaVNnjqU" role="2OqNvi">
7214+
<node concept="1xMEDy" id="1sudaVNnjqW" role="1xVPHs">
7215+
<node concept="chp4Y" id="1sudaVNnjsk" role="ri$Ld">
7216+
<ref role="cht4Q" to="yv47:2uR5X5ayM7T" resolve="IToplevelExprContent" />
7217+
</node>
7218+
</node>
7219+
</node>
7220+
</node>
7221+
<node concept="3zZkjj" id="230lIJTFuU" role="2OqNvi">
7222+
<node concept="1bVj0M" id="230lIJTFuW" role="23t8la">
7223+
<node concept="3clFbS" id="230lIJTFuX" role="1bW5cS">
7224+
<node concept="3clFbF" id="230lIJTF$c" role="3cqZAp">
7225+
<node concept="3fqX7Q" id="230lIJTGhW" role="3clFbG">
7226+
<node concept="2YIFZM" id="230lIJTGhY" role="3fr31v">
7227+
<ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
7228+
<ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
7229+
<node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
7230+
<ref role="3cqZAo" node="230lIJTFuY" resolve="it" />
7231+
</node>
7232+
</node>
7233+
</node>
7234+
</node>
7235+
</node>
7236+
<node concept="Rh6nW" id="230lIJTFuY" role="1bW2Oz">
7237+
<property role="TrG5h" value="it" />
7238+
<node concept="2jxLKc" id="230lIJTFuZ" role="1tU5fm" />
72157239
</node>
72167240
</node>
72177241
</node>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,13 +1996,6 @@
19961996
<property role="VOm3f" value="true" />
19971997
</node>
19981998
</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>
20061999
</node>
20072000
<node concept="l2Vlx" id="3WWvqarUGzE" role="2iSdaV" />
20082001
<node concept="3F0ifn" id="3WWvqarUGzF" role="3EZMnx">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<dependency reexport="false">726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)</dependency>
3030
<dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
3131
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
32+
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
3233
</dependencies>
3334
<languageVersions>
3435
<language slang="l:677f00fb-4488-405e-9885-abb75d472fd1:com.mbeddr.mpsutil.contextactions" version="0" />
@@ -117,6 +118,7 @@
117118
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
118119
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
119120
<module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
121+
<module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
120122
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
121123
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
122124
<module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />

0 commit comments

Comments
 (0)