Skip to content

Commit

Permalink
Merge pull request #770 from JetBrains/bugfix/querylist_without_model
Browse files Browse the repository at this point in the history
com.mbeddr.mpsutil.editor.querylist: Add support for dynamic content in querylists
  • Loading branch information
alexanderpann authored Feb 19, 2024
2 parents 7d37ec5 + 2004f06 commit 87f878c
Show file tree
Hide file tree
Showing 24 changed files with 574 additions and 180 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## Feburary 2024

### Changed

- com.mbeddr.mpsutil.editor.querylist: Dynamic generated nodes (without a model) can now be used in query lists if `read-only` is set to true.

## January 2024

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15292,7 +15292,7 @@
</node>
</node>
<node concept="2AHcQZ" id="7EPprGLkpaN" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" />
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="raruj" id="7EPprGLktkj" role="lGtFl" />
<node concept="1W57fq" id="7EPprGLktkl" role="lGtFl">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@
<property role="34LRSv" value="DemoOptionalCellsCapability" />
<property role="R4oN_" value="A demo concept to show off the capabilities of the optional cell" />
<property role="3GE5qa" value="CapabilitiesDemo" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyi" id="67iSu2wewjc" role="1TKVEl">
<property role="IQ2nx" value="7048944721665328332" />
<property role="TrG5h" value="property1" />
Expand Down Expand Up @@ -879,7 +879,7 @@
<property role="TrG5h" value="StmtContainerParent" />
<property role="19KtqR" value="true" />
<property role="3GE5qa" value="grammarWrapTest" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="3Lzx5Pf0jnO" role="1TKVEi">
<property role="IQ2ns" value="4351467201262335476" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand All @@ -894,7 +894,7 @@
<property role="TrG5h" value="DemoRoot" />
<property role="34LRSv" value="DemoRoot" />
<property role="19KtqR" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="67iSu2w1UsD" role="1TKVEi">
<property role="IQ2ns" value="7048944721662027561" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand Down Expand Up @@ -942,7 +942,7 @@
<property role="3GE5qa" value="grammarWrapTest" />
<property role="TrG5h" value="StmtContainerParentWhitelisting" />
<property role="19KtqR" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="1045PmWki1E" role="1TKVEi">
<property role="IQ2ns" value="1154073061512781930" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand Down Expand Up @@ -971,7 +971,7 @@
<property role="3GE5qa" value="grammarWrapTest" />
<property role="TrG5h" value="WrapStmtParent" />
<property role="34LRSv" value="wrapStmt" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="3Lzx5Pf0kj2" role="1TKVEi">
<property role="IQ2ns" value="4351467201262339266" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand All @@ -995,7 +995,7 @@
<property role="3GE5qa" value="grammarWrapTest" />
<property role="TrG5h" value="WrapStmtParentWhitelisting" />
<property role="34LRSv" value="wrapStmt" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="1045PmWkiyF" role="1TKVEi">
<property role="IQ2ns" value="1154073061512784043" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand All @@ -1012,7 +1012,7 @@
<property role="3GE5qa" value="grammarWrapTest" />
<property role="TrG5h" value="StmtContainerAncestorWhitelisting" />
<property role="19KtqR" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="6sxj0_UzcGb" role="1TKVEi">
<property role="IQ2ns" value="7431304463732493067" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand All @@ -1026,7 +1026,7 @@
<property role="3GE5qa" value="grammarWrapTest" />
<property role="TrG5h" value="WrapStmtAncestorWhitelisting" />
<property role="34LRSv" value="wrapStmt" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="6sxj0_Uzble" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
Expand All @@ -1043,7 +1043,7 @@
<property role="3GE5qa" value="grammarWrapTest" />
<property role="TrG5h" value="WrapType" />
<property role="R5$K7" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
</node>
<node concept="1TIwiD" id="3aFJVZlqur9">
<property role="EcuMT" value="3651222753554065097" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -544,14 +544,14 @@
</concept>
</language>
<language id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells">
<concept id="7272510943426055326" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Factory" flags="ng" index="2kS2EP" />
<concept id="7272510943426055326" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Factory" flags="ig" index="2kS2EP" />
<concept id="7272510943426093121" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_SideTransformActionsBuilderContext" flags="ng" index="2kS8pE" />
<concept id="7272510943425988699" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="2kSiTK">
<property id="7272510943425988883" name="side" index="2kSiWS" />
<child id="7272510943426097631" name="factory" index="2kS9vO" />
<child id="7272510943425989076" name="wrapped" index="2kSiZZ" />
</concept>
<concept id="7272510943426635554" name="com.mbeddr.mpsutil.grammarcells.structure.NodeSubstituteCell_Factory" flags="ng" index="2kYc49" />
<concept id="7272510943426635554" name="com.mbeddr.mpsutil.grammarcells.structure.NodeSubstituteCell_Factory" flags="ig" index="2kYc49" />
<concept id="7272510943426635523" name="com.mbeddr.mpsutil.grammarcells.structure.NodeSubstituteCell" flags="ng" index="2kYc4C">
<child id="7272510943426635586" name="factory" index="2kYc5D" />
<child id="7272510943426635585" name="wrapped" index="2kYc5E" />
Expand All @@ -567,11 +567,11 @@
<property id="745148820908747612" name="description" index="2thAuV" />
<child id="745148820874363426" name="section" index="2vkWV5" />
</concept>
<concept id="9041925471455857605" name="com.mbeddr.mpsutil.grammarcells.structure.Cell_DescriptionText" flags="ng" index="uPpia" />
<concept id="9041925471455857605" name="com.mbeddr.mpsutil.grammarcells.structure.Cell_DescriptionText" flags="ig" index="uPpia" />
<concept id="745148820879066261" name="com.mbeddr.mpsutil.grammarcells.structure.TransformationLocation_SideTransformationCell" flags="ng" index="2v6KxM" />
<concept id="1997572252229165641" name="com.mbeddr.mpsutil.grammarcells.structure.TransformationLocation_Before" flags="ng" index="wWMWC" />
<concept id="1997572252229165700" name="com.mbeddr.mpsutil.grammarcells.structure.TransformationLocation_After" flags="ng" index="wWMZ_" />
<concept id="7416540197334827155" name="com.mbeddr.mpsutil.grammarcells.structure.LowLevelMenuPart_Function" flags="ng" index="2Mo9yg" />
<concept id="7416540197334827155" name="com.mbeddr.mpsutil.grammarcells.structure.LowLevelMenuPart_Function" flags="ig" index="2Mo9yg" />
<concept id="7416540197334827182" name="com.mbeddr.mpsutil.grammarcells.structure.LowLevelMenuPart_parameter" flags="ng" index="2Mo9yH" />
<concept id="7416540197333137586" name="com.mbeddr.mpsutil.grammarcells.structure.GenericMenuPart" flags="ng" index="2MBE2L">
<child id="7416540197335105457" name="implementation" index="2MvauM" />
Expand All @@ -583,27 +583,27 @@
<child id="6856661361479798753" name="execute" index="130oVf" />
<child id="6856661361479798749" name="canExecute" index="130oVN" />
</concept>
<concept id="6856661361479784541" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_CanExecuteFunction" flags="ng" index="130t_N" />
<concept id="6856661361479784534" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_ExecuteFunction" flags="ng" index="130t_S" />
<concept id="6856661361479784541" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_CanExecuteFunction" flags="ig" index="130t_N" />
<concept id="6856661361479784534" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_ExecuteFunction" flags="ig" index="130t_S" />
<concept id="6856661361479732075" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapCell" flags="ng" index="130CD5">
<child id="6856661361479798957" name="actions" index="130p63" />
<child id="6856661361479732085" name="cell" index="130CDr" />
</concept>
<concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
<child id="848437706375087729" name="descriptionText" index="1djCvC" />
</concept>
<concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ng" index="1eYwpX" />
<concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ng" index="1eYxTg" />
<concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
<concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
<concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
<child id="4874944647490523335" name="matchingText" index="1eYxyj" />
<child id="4874944647490523330" name="isApplicable" index="1eYxym" />
<child id="4874944647490524677" name="execute" index="1eYxTh" />
</concept>
<concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ng" index="1eYWSL" />
<concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
</language>
<language id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell">
<concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="ng" index="1Q80Hy" />
<concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="ng" index="3VJUX4" />
<concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="nn" index="1Q80Hy" />
<concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX4" />
<concept id="2490242408670732052" name="de.slisson.mps.richtext.customcell.structure.CellModel_CustomFactory" flags="ng" index="3ZSo5i">
<child id="1073389446424" name="childCellModel" index="3EZMny" />
<child id="2490242408670937967" name="factoryMethod" index="3ZZHOD" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3044,7 +3044,7 @@
<ref role="37wK5l" to="i8bi:Det6sRbgD5" resolve="asInstanceConcept" />
<ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
<node concept="37vLTw" id="4_3mV3JSKOq" role="37wK5m">
<ref role="3cqZAo" node="4_3mV3JAVzT" resolve="childConcept" />
<ref role="3cqZAo" node="4_3mV3JAVzT" resolve="parentConcept" />
</node>
</node>
</node>
Expand Down Expand Up @@ -3099,7 +3099,7 @@
<node concept="2OqwBi" id="6ogDZtA2c7K" role="2Oq$k0">
<node concept="2ShNRf" id="6ogDZtA2c7L" role="2Oq$k0">
<node concept="1pGfFk" id="6ogDZtA2c7M" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="Builder" />
<ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="ContainmentContext.Builder" />
</node>
</node>
<node concept="liA8E" id="6ogDZtA2c7N" role="2OqNvi">
Expand All @@ -3126,7 +3126,7 @@
<node concept="liA8E" id="6ogDZtA2c7V" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.link(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="link" />
<node concept="37vLTw" id="6ogDZtA2c7W" role="37wK5m">
<ref role="3cqZAo" node="6ogDZt_iRYF" resolve="dummyLink" />
<ref role="3cqZAo" node="6ogDZt_iRYF" resolve="conceptLink" />
</node>
</node>
</node>
Expand Down Expand Up @@ -3185,7 +3185,7 @@
<ref role="3cqZAo" node="4_3mV3K5MCz" resolve="dummyChild" />
</node>
<node concept="37vLTw" id="6ogDZt_UyxB" role="37wK5m">
<ref role="3cqZAo" node="6ogDZt_iRYF" resolve="dummyLink" />
<ref role="3cqZAo" node="6ogDZt_iRYF" resolve="conceptLink" />
</node>
</node>
</node>
Expand Down Expand Up @@ -3274,7 +3274,7 @@
<node concept="2OqwBi" id="1iGw5Cbiv4k" role="2Oq$k0">
<node concept="2ShNRf" id="1iGw5Cbiv4l" role="2Oq$k0">
<node concept="1pGfFk" id="1iGw5Cbiv4m" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="Builder" />
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
</node>
</node>
<node concept="liA8E" id="1iGw5Cbiv4n" role="2OqNvi">
Expand Down Expand Up @@ -3411,7 +3411,7 @@
<node concept="2OqwBi" id="3Lzx5PeGbia" role="2Oq$k0">
<node concept="2ShNRf" id="3Lzx5PeGbib" role="2Oq$k0">
<node concept="1pGfFk" id="3Lzx5PeGbic" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="Builder" />
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
</node>
</node>
<node concept="liA8E" id="3Lzx5PeGbid" role="2OqNvi">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3417,7 +3417,7 @@
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="3Lzx5Pfuvu1" role="37wK5m">
<node concept="35c_gC" id="3Lzx5Pfu9Gc" role="2Oq$k0">
<ref role="35c_gD" to="ibwz:3Lzx5Pf0jk5" resolve="WrapStmt" />
<ref role="35c_gD" to="ibwz:3Lzx5Pf0jk5" resolve="WrapStmtParent" />
</node>
<node concept="liA8E" id="3Lzx5Pfwuva" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SAbstractConcept.getConceptAlias()" resolve="getConceptAlias" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4472,7 +4472,7 @@
</node>
</node>
<node concept="1Z6Ecs" id="2iZPrFZnMN8" role="33vP2m">
<ref role="1Z6EpT" to="zddv:5qf1oe_$9mw" resolve="intentionsInReadOnlyCell" />
<ref role="1Z6EpT" to="zddv:5qf1oe_$9mw" resolve="intentions-in-read-only-cell" />
</node>
</node>
<node concept="2tJIrI" id="5qf1oe_$8xF" role="jymVt" />
Expand Down Expand Up @@ -4516,7 +4516,7 @@
<node concept="10Nm6u" id="5qf1oe_zNwG" role="3uHU7w" />
</node>
<node concept="1rXfSq" id="5qf1oe_zZ7k" role="3uHU7w">
<ref role="37wK5l" node="5qf1oe_zXNE" resolve="isCellsReadOnlyInEditor" />
<ref role="37wK5l" node="5qf1oe_zXNE" resolve="allowIntentionsInReadOnlyCells" />
<node concept="37vLTw" id="5qf1oe_$h66" role="37wK5m">
<ref role="3cqZAo" node="5qf1oe_zNwt" resolve="editorComponent" />
</node>
Expand Down Expand Up @@ -4574,7 +4574,7 @@
<node concept="10Nm6u" id="5qf1oe_zXO1" role="3uHU7w" />
</node>
<node concept="1rXfSq" id="5qf1oe_zXO2" role="3uHU7w">
<ref role="37wK5l" node="5qf1oe_zyw2" resolve="isCellReadOnly" />
<ref role="37wK5l" node="5qf1oe_zyw2" resolve="isAllowIntentionsInReadOnlyCell" />
<node concept="37vLTw" id="5qf1oe_zXO3" role="37wK5m">
<ref role="3cqZAo" node="5qf1oe_zXNU" resolve="cell" />
</node>
Expand Down Expand Up @@ -4607,7 +4607,7 @@
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
</node>
<node concept="3uibUv" id="5qf1oe_zyw5" role="1tU5fm">
<ref role="3uigEE" to="f4zo:~EditorCell" resolve="jetbrains.mps.openapi.editor.cells.EditorCell" />
<ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
</node>
</node>
<node concept="3clFbS" id="5qf1oe_zyw6" role="3clF47">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<property role="EcuMT" value="6237210071910106918" />
<property role="TrG5h" value="Root" />
<property role="19KtqR" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="5qf1oe_GcsC" role="1TKVEi">
<property role="IQ2ns" value="6237210071910106920" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
Expand All @@ -64,7 +64,7 @@
<node concept="1TIwiD" id="5qf1oe_GcsB">
<property role="EcuMT" value="6237210071910106919" />
<property role="TrG5h" value="ReadOnlyChild" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="5qf1oe_GcsG" role="PzmwI">
<ref role="PrY4T" node="5qf1oe_GcsF" resolve="IChild" />
</node>
Expand All @@ -84,7 +84,7 @@
<node concept="1TIwiD" id="5qf1oe_GdOj">
<property role="EcuMT" value="6237210071910112531" />
<property role="TrG5h" value="ReadOnlyChildAllowed" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="5qf1oe_GdOk" role="PzmwI">
<ref role="PrY4T" node="5qf1oe_GcsF" resolve="IChild" />
</node>
Expand Down
Loading

0 comments on commit 87f878c

Please sign in to comment.