Skip to content

Commit 8ef68c4

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1092 from JetBrains/merge/mps20243
Merge maintenance/mps20241 into maintenance/mps20243
2 parents 38b19d2 + 74934c0 commit 8ef68c4

File tree

2 files changed

+147
-38
lines changed
  • code/querylist
    • com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist
    • com.mbeddr.mpsutil.editor.querylist/generator/template

2 files changed

+147
-38
lines changed

‎code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps‎

Lines changed: 101 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
<import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
5858
<import index="e5kc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.invoke(JDK/)" />
5959
<import index="ycmz" ref="r:af3e1a90-527b-4262-8066-857208a4f4fb(de.slisson.mps.reflection.runtime)" />
60+
<import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
61+
<import index="y49u" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.util(MPS.OpenAPI/)" />
62+
<import index="c84v" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells.collections(MPS.Editor/)" />
63+
<import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
64+
<import index="j0b4" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.keyboard(MPS.Editor/)" />
65+
<import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
66+
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
6067
</imports>
6168
<registry>
6269
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -384,6 +391,18 @@
384391
<node concept="10P_77" id="T_6DrmD7d7" role="1tU5fm" />
385392
<node concept="3clFbT" id="T_6DrmD8Fh" role="33vP2m" />
386393
</node>
394+
<node concept="312cEg" id="7vDkgomUWu3" role="jymVt">
395+
<property role="TrG5h" value="targetConcept" />
396+
<node concept="3Tm6S6" id="7vDkgomUVu8" role="1B3o_S" />
397+
<node concept="3bZ5Sz" id="7vDkgomUX7l" role="1tU5fm" />
398+
<node concept="10Nm6u" id="7vDkgomV3yM" role="33vP2m" />
399+
</node>
400+
<node concept="312cEg" id="7vDkgomYHx5" role="jymVt">
401+
<property role="TrG5h" value="owner" />
402+
<node concept="3Tm6S6" id="7vDkgomYHx6" role="1B3o_S" />
403+
<node concept="3bZ5Sz" id="7vDkgomYHx7" role="1tU5fm" />
404+
<node concept="10Nm6u" id="7vDkgomYHx8" role="33vP2m" />
405+
</node>
387406
<node concept="2tJIrI" id="T_6DrmD699" role="jymVt" />
388407
<node concept="3clFbW" id="5oklODahdFh" role="jymVt">
389408
<node concept="3cqZAl" id="5oklODahdFj" role="3clF45" />
@@ -421,17 +440,7 @@
421440
<property role="DiZV1" value="false" />
422441
<property role="od$2w" value="false" />
423442
<node concept="3Tm1VV" id="1GpxVmA6Bn7" role="1B3o_S" />
424-
<node concept="2AHcQZ" id="1GpxVmA6Bn9" role="2AJF6D">
425-
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
426-
</node>
427443
<node concept="P$JXv" id="1GpxVmA6Bna" role="lGtFl">
428-
<node concept="TZ5HI" id="1GpxVmA6Bnb" role="3nqlJM">
429-
<node concept="TZ5HA" id="1GpxVmA6Bnc" role="3HnX3l">
430-
<node concept="1dT_AC" id="1GpxVmA6CMP" role="1dT_Ay">
431-
<property role="1dT_AB" value="" />
432-
</node>
433-
</node>
434-
</node>
435444
<node concept="TZ5HA" id="1GpxVmA6CPn" role="TZ5H$">
436445
<node concept="1dT_AC" id="1GpxVmA6CPo" role="1dT_Ay">
437446
<property role="1dT_AB" value="Important for " />
@@ -485,18 +494,17 @@
485494
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
486495
</node>
487496
<node concept="3clFbS" id="1GpxVmA6URZ" role="3clF47">
488-
<node concept="YS8fn" id="3kkgokhwfpC" role="3cqZAp">
489-
<node concept="2ShNRf" id="3kkgokhwfpD" role="YScLw">
490-
<node concept="1pGfFk" id="3kkgokhwfpE" role="2ShVmc">
491-
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
492-
</node>
497+
<node concept="3clFbF" id="7vDkgomV9Cn" role="3cqZAp">
498+
<node concept="37vLTw" id="7vDkgomV9Cm" role="3clFbG">
499+
<ref role="3cqZAo" node="7vDkgomUWu3" resolve="targetConcept" />
493500
</node>
494501
</node>
495502
</node>
496503
<node concept="2AHcQZ" id="1GpxVmA6US0" role="2AJF6D">
497504
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
498505
</node>
499506
</node>
507+
<node concept="2tJIrI" id="7vDkgomV4a7" role="jymVt" />
500508
<node concept="3clFb_" id="1GpxVmA6US3" role="jymVt">
501509
<property role="1EzhhJ" value="false" />
502510
<property role="TrG5h" value="getName" />
@@ -518,6 +526,7 @@
518526
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
519527
</node>
520528
</node>
529+
<node concept="2tJIrI" id="7vDkgomV4Js" role="jymVt" />
521530
<node concept="3clFb_" id="1GpxVmA6USg" role="jymVt">
522531
<property role="1EzhhJ" value="false" />
523532
<property role="TrG5h" value="isValid" />
@@ -526,18 +535,15 @@
526535
<node concept="3Tm1VV" id="1GpxVmA6USh" role="1B3o_S" />
527536
<node concept="10P_77" id="1GpxVmA6USj" role="3clF45" />
528537
<node concept="3clFbS" id="1GpxVmA6USn" role="3clF47">
529-
<node concept="YS8fn" id="3kkgokhweDF" role="3cqZAp">
530-
<node concept="2ShNRf" id="3kkgokhweDG" role="YScLw">
531-
<node concept="1pGfFk" id="3kkgokhweDH" role="2ShVmc">
532-
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
533-
</node>
534-
</node>
538+
<node concept="3clFbF" id="7vDkgomY8wU" role="3cqZAp">
539+
<node concept="3clFbT" id="7vDkgomY8wT" role="3clFbG" />
535540
</node>
536541
</node>
537542
<node concept="2AHcQZ" id="1GpxVmA6USo" role="2AJF6D">
538543
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
539544
</node>
540545
</node>
546+
<node concept="2tJIrI" id="7vDkgomV5kL" role="jymVt" />
541547
<node concept="3clFb_" id="1GpxVmA6USr" role="jymVt">
542548
<property role="1EzhhJ" value="false" />
543549
<property role="TrG5h" value="getRole" />
@@ -559,6 +565,7 @@
559565
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
560566
</node>
561567
</node>
568+
<node concept="2tJIrI" id="7vDkgomV5U6" role="jymVt" />
562569
<node concept="3clFb_" id="1GpxVmA6USD" role="jymVt">
563570
<property role="1EzhhJ" value="false" />
564571
<property role="TrG5h" value="isOptional" />
@@ -577,6 +584,7 @@
577584
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
578585
</node>
579586
</node>
587+
<node concept="2tJIrI" id="7vDkgomV6vr" role="jymVt" />
580588
<node concept="3clFb_" id="1GpxVmA6USN" role="jymVt">
581589
<property role="1EzhhJ" value="false" />
582590
<property role="TrG5h" value="getOwner" />
@@ -590,18 +598,17 @@
590598
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
591599
</node>
592600
<node concept="3clFbS" id="1GpxVmA6USV" role="3clF47">
593-
<node concept="YS8fn" id="3kkgokhwdEZ" role="3cqZAp">
594-
<node concept="2ShNRf" id="3kkgokhwdF0" role="YScLw">
595-
<node concept="1pGfFk" id="3kkgokhwdF1" role="2ShVmc">
596-
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
597-
</node>
601+
<node concept="3clFbF" id="7vDkgomYM7H" role="3cqZAp">
602+
<node concept="37vLTw" id="7vDkgomYM7G" role="3clFbG">
603+
<ref role="3cqZAo" node="7vDkgomYHx5" resolve="owner" />
598604
</node>
599605
</node>
600606
</node>
601607
<node concept="2AHcQZ" id="1GpxVmA6USW" role="2AJF6D">
602608
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
603609
</node>
604610
</node>
611+
<node concept="2tJIrI" id="7vDkgomV74K" role="jymVt" />
605612
<node concept="3clFb_" id="1GpxVmA6USZ" role="jymVt">
606613
<property role="1EzhhJ" value="false" />
607614
<property role="TrG5h" value="isReference" />
@@ -621,6 +628,7 @@
621628
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
622629
</node>
623630
</node>
631+
<node concept="2tJIrI" id="7vDkgomYKEX" role="jymVt" />
624632
<node concept="3clFb_" id="3kkgokhvYx5" role="jymVt">
625633
<property role="TrG5h" value="getDeclarationNode" />
626634
<node concept="3Tm1VV" id="3kkgokhvYx6" role="1B3o_S" />
@@ -634,18 +642,15 @@
634642
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
635643
</node>
636644
<node concept="3clFbS" id="3kkgokhvYxi" role="3clF47">
637-
<node concept="YS8fn" id="3kkgokhwdxR" role="3cqZAp">
638-
<node concept="2ShNRf" id="3kkgokhwdxS" role="YScLw">
639-
<node concept="1pGfFk" id="3kkgokhwdxT" role="2ShVmc">
640-
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
641-
</node>
642-
</node>
645+
<node concept="3clFbF" id="7vDkgomYNvX" role="3cqZAp">
646+
<node concept="10Nm6u" id="7vDkgomYNvW" role="3clFbG" />
643647
</node>
644648
</node>
645649
<node concept="2AHcQZ" id="3kkgokhvYxj" role="2AJF6D">
646650
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
647651
</node>
648652
</node>
653+
<node concept="2tJIrI" id="7vDkgomV7E5" role="jymVt" />
649654
<node concept="3clFb_" id="3kkgokhvYxm" role="jymVt">
650655
<property role="TrG5h" value="getRoleName" />
651656
<node concept="3Tm1VV" id="3kkgokhvYxn" role="1B3o_S" />
@@ -664,23 +669,36 @@
664669
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
665670
</node>
666671
</node>
672+
<node concept="2tJIrI" id="7vDkgomV8fq" role="jymVt" />
667673
<node concept="3clFb_" id="3kkgokhvYxz" role="jymVt">
668674
<property role="TrG5h" value="isUnordered" />
669675
<node concept="3Tm1VV" id="3kkgokhvYx$" role="1B3o_S" />
670676
<node concept="10P_77" id="3kkgokhvYxA" role="3clF45" />
671677
<node concept="3clFbS" id="3kkgokhvYxC" role="3clF47">
672-
<node concept="YS8fn" id="3kkgokhwdul" role="3cqZAp">
673-
<node concept="2ShNRf" id="3kkgokhwdum" role="YScLw">
674-
<node concept="1pGfFk" id="3kkgokhwdun" role="2ShVmc">
675-
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
676-
</node>
677-
</node>
678+
<node concept="3clFbF" id="7vDkgomZwU8" role="3cqZAp">
679+
<node concept="3clFbT" id="7vDkgomZwU7" role="3clFbG" />
678680
</node>
679681
</node>
680682
<node concept="2AHcQZ" id="3kkgokhvYxD" role="2AJF6D">
681683
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
682684
</node>
683685
</node>
686+
<node concept="2tJIrI" id="14DpnPom0_H" role="jymVt" />
687+
<node concept="3clFb_" id="14DpnPom1eN" role="jymVt">
688+
<property role="TrG5h" value="isTransient" />
689+
<node concept="3Tm1VV" id="14DpnPom1eP" role="1B3o_S" />
690+
<node concept="10P_77" id="14DpnPom1eR" role="3clF45" />
691+
<node concept="3clFbS" id="14DpnPom1f2" role="3clF47">
692+
<node concept="3clFbF" id="14DpnPom4h5" role="3cqZAp">
693+
<node concept="3clFbT" id="14DpnPom4h4" role="3clFbG">
694+
<property role="3clFbU" value="true" />
695+
</node>
696+
</node>
697+
</node>
698+
<node concept="2AHcQZ" id="14DpnPom1f3" role="2AJF6D">
699+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
700+
</node>
701+
</node>
684702
</node>
685703
</node>
686704
</node>
@@ -745,6 +763,51 @@
745763
<node concept="3Tm1VV" id="T_6DrmDg8K" role="1B3o_S" />
746764
<node concept="10P_77" id="T_6DrmDh4R" role="3clF45" />
747765
</node>
766+
<node concept="2tJIrI" id="7vDkgomUXdq" role="jymVt" />
767+
<node concept="3clFb_" id="7vDkgomUY9j" role="jymVt">
768+
<property role="TrG5h" value="setTargeConcept" />
769+
<node concept="3clFbS" id="7vDkgomUY9m" role="3clF47">
770+
<node concept="3clFbF" id="7vDkgomUZHe" role="3cqZAp">
771+
<node concept="37vLTI" id="7vDkgomV15y" role="3clFbG">
772+
<node concept="37vLTw" id="7vDkgomV1SJ" role="37vLTx">
773+
<ref role="3cqZAo" node="7vDkgomUZ1n" resolve="concept" />
774+
</node>
775+
<node concept="37vLTw" id="7vDkgomUZHd" role="37vLTJ">
776+
<ref role="3cqZAo" node="7vDkgomUWu3" resolve="targetConcept" />
777+
</node>
778+
</node>
779+
</node>
780+
</node>
781+
<node concept="3Tm1VV" id="7vDkgomUXpO" role="1B3o_S" />
782+
<node concept="3cqZAl" id="7vDkgomUXy7" role="3clF45" />
783+
<node concept="37vLTG" id="7vDkgomUZ1n" role="3clF46">
784+
<property role="TrG5h" value="concept" />
785+
<node concept="3bZ5Sz" id="7vDkgomUZ1m" role="1tU5fm" />
786+
</node>
787+
</node>
788+
<node concept="2tJIrI" id="7vDkgomYIqp" role="jymVt" />
789+
<node concept="3clFb_" id="7vDkgomYIqr" role="jymVt">
790+
<property role="TrG5h" value="setOwner" />
791+
<node concept="3clFbS" id="7vDkgomYIqs" role="3clF47">
792+
<node concept="3clFbF" id="7vDkgomYIqt" role="3cqZAp">
793+
<node concept="37vLTI" id="7vDkgomYIqu" role="3clFbG">
794+
<node concept="37vLTw" id="7vDkgomYIqv" role="37vLTx">
795+
<ref role="3cqZAo" node="7vDkgomYIqz" resolve="concept" />
796+
</node>
797+
<node concept="37vLTw" id="7vDkgomYIqw" role="37vLTJ">
798+
<ref role="3cqZAo" node="7vDkgomYHx5" resolve="owner" />
799+
</node>
800+
</node>
801+
</node>
802+
</node>
803+
<node concept="3Tm1VV" id="7vDkgomYIqx" role="1B3o_S" />
804+
<node concept="3cqZAl" id="7vDkgomYIqy" role="3clF45" />
805+
<node concept="37vLTG" id="7vDkgomYIqz" role="3clF46">
806+
<property role="TrG5h" value="concept" />
807+
<node concept="3bZ5Sz" id="7vDkgomYIq$" role="1tU5fm" />
808+
</node>
809+
</node>
810+
<node concept="2tJIrI" id="7vDkgomYIqq" role="jymVt" />
748811
<node concept="3Tm1VV" id="5oklODahdyR" role="1B3o_S" />
749812
<node concept="3uibUv" id="5oklODahe60" role="1zkMxy">
750813
<ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />

‎code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/[email protected]‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@
338338
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
339339
</concept>
340340
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
341+
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
341342
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
342343
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
343344
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -1242,6 +1243,51 @@
12421243
</node>
12431244
</node>
12441245
</node>
1246+
<node concept="3clFbF" id="7vDkgomVfmM" role="3cqZAp">
1247+
<node concept="2OqwBi" id="7vDkgomViaV" role="3clFbG">
1248+
<node concept="37vLTw" id="7vDkgomVfmK" role="2Oq$k0">
1249+
<ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
1250+
</node>
1251+
<node concept="liA8E" id="7vDkgomVqJ1" role="2OqNvi">
1252+
<ref role="37wK5l" to="d2zl:7vDkgomUY9j" resolve="setTargeConcept" />
1253+
<node concept="35c_gC" id="7vDkgomWFe8" role="37wK5m">
1254+
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
1255+
<node concept="1ZhdrF" id="7vDkgomWJov" role="lGtFl">
1256+
<property role="2qtEX8" value="conceptDeclaration" />
1257+
<property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
1258+
<node concept="3$xsQk" id="7vDkgomWJow" role="3$ytzL">
1259+
<node concept="3clFbS" id="7vDkgomWJox" role="2VODD2">
1260+
<node concept="3clFbF" id="7vDkgomWLHP" role="3cqZAp">
1261+
<node concept="2OqwBi" id="7vDkgomWNq2" role="3clFbG">
1262+
<node concept="30H73N" id="7vDkgomWLHO" role="2Oq$k0" />
1263+
<node concept="3TrEf2" id="7vDkgomWOZ7" role="2OqNvi">
1264+
<ref role="3Tt5mk" to="bbp5:C$q8A2yeI6" resolve="elementsConcept" />
1265+
</node>
1266+
</node>
1267+
</node>
1268+
</node>
1269+
</node>
1270+
</node>
1271+
</node>
1272+
</node>
1273+
</node>
1274+
</node>
1275+
<node concept="3clFbF" id="7vDkgomYQCT" role="3cqZAp">
1276+
<node concept="2OqwBi" id="7vDkgomYQCU" role="3clFbG">
1277+
<node concept="37vLTw" id="7vDkgomYQCV" role="2Oq$k0">
1278+
<ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
1279+
</node>
1280+
<node concept="liA8E" id="7vDkgomYQCW" role="2OqNvi">
1281+
<ref role="37wK5l" to="d2zl:7vDkgomYIqr" resolve="setOwner" />
1282+
<node concept="2OqwBi" id="7vDkgomYZkC" role="37wK5m">
1283+
<node concept="37vLTw" id="7vDkgomYXNx" role="2Oq$k0">
1284+
<ref role="3cqZAo" node="fYh_FQ7" resolve="node" />
1285+
</node>
1286+
<node concept="2yIwOk" id="7vDkgomZ1OU" role="2OqNvi" />
1287+
</node>
1288+
</node>
1289+
</node>
1290+
</node>
12451291
<node concept="3cpWs8" id="1WjrBsNI_pV" role="3cqZAp">
12461292
<node concept="5jKBG" id="76N1O$KguuA" role="lGtFl">
12471293
<ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />

0 commit comments

Comments
 (0)