Skip to content

Commit

Permalink
Merge pull request #1170 from JetBrains/feature/querylist_editor_expr…
Browse files Browse the repository at this point in the history 
…essions_improvements

querylist: inline editor expressions improvements
  • Loading branch information
@wsafonov
wsafonov authored Mar 4, 2025
2 parents e7a4da9 + 3e8c417 commit c8b9f18
Show file tree
Hide file tree
Showing 10 changed files with 1,827 additions and 936 deletions.
5 changes: 5 additions & 0 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23628,6 +23628,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="4EGFz66TUtk" role="3bR37C">
<node concept="3bR9La" id="4EGFz66TUtl" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
</node>
<node concept="1E1JtD" id="4zIvKyxCri3" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down
1 change: 1 addition & 0 deletions ...mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
</dependencies>
<languageVersions>
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
Expand Down
111 changes: 87 additions & 24 deletions code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@
<child id="1080736633877" name="cellModel" index="2wV5jI" />
</concept>
<concept id="795210086017940429" name="jetbrains.mps.lang.editor.structure.ReadOnlyStyleClassItem" flags="lg" index="xShMh" />
<concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
<concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
<concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
<property id="1186414551515" name="flag" index="VOm3f" />
</concept>
<concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
<concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
<concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
<concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
<concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
</concept>
Expand Down Expand Up @@ -246,7 +249,7 @@
<concept id="5820306262933734929" name="com.mbeddr.mpsutil.editor.querylist.structure.Parameter_AnchorNode" flags="ng" index="AS6u$" />
<concept id="5820306262933951366" name="com.mbeddr.mpsutil.editor.querylist.structure.Paramter_insertBefore" flags="ng" index="AVj8N" />
<concept id="5820306262934114343" name="com.mbeddr.mpsutil.editor.querylist.structure.Function_DeleteElement" flags="ig" index="AVF6i" />
<concept id="2239254897981410197" name="com.mbeddr.mpsutil.editor.querylist.structure.QueryListNodeExpression" flags="ng" index="GFMny" />
<concept id="2239254897981410197" name="com.mbeddr.mpsutil.editor.querylist.structure.QueryListInputExpression" flags="ng" index="GFMny" />
<concept id="7238779735251712681" name="com.mbeddr.mpsutil.editor.querylist.structure.QueryListInlineEditorComponent" flags="ig" index="1yz3lS" />
</language>
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
Expand All @@ -260,6 +263,9 @@
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
<child id="1204834868751" name="expression" index="25KhWn" />
</concept>
<concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
Expand All @@ -268,6 +274,7 @@
<child id="1144104376918" name="parameter" index="1xVPHs" />
</concept>
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
Expand Down Expand Up @@ -614,37 +621,46 @@
<node concept="1HfYo3" id="6QZo_pQb4Bb" role="1HlULh">
<node concept="3TQlhw" id="6QZo_pQb4Bc" role="1Hhtcw">
<node concept="3clFbS" id="6QZo_pQb4Bd" role="2VODD2">
<node concept="3clFbH" id="3$DkTBDaaDm" role="3cqZAp" />
<node concept="3clFbF" id="6QZo_pQb76V" role="3cqZAp">
<node concept="3cpWs3" id="6QZo_pQgYhV" role="3clFbG">
<node concept="Xl_RD" id="6QZo_pQgYi0" role="3uHU7w">
<property role="Xl_RC" value=": " />
</node>
<node concept="3cpWs3" id="6QZo_pQb7sr" role="3uHU7B">
<node concept="3cpWs3" id="1WjrBsNIVX7" role="3uHU7B">
<node concept="2OqwBi" id="1WjrBsNIZqG" role="3uHU7B">
<node concept="2JrnkZ" id="1WjrBsNIZmj" role="2Oq$k0">
<node concept="GFMny" id="1WjrBsNJotP" role="2JrQYb" />
</node>
<node concept="liA8E" id="1WjrBsNIZwA" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
<node concept="Xl_RD" id="6QZo_pQb76U" role="3uHU7w">
<property role="Xl_RC" value=" # " />
<node concept="3cpWs3" id="4EGFz66WtYw" role="3uHU7B">
<node concept="2tpSsP" id="4EGFz66WuF3" role="3uHU7w" />
<node concept="3cpWs3" id="4EGFz66WsAh" role="3uHU7B">
<node concept="Xl_RD" id="4EGFz66WtiE" role="3uHU7w">
<property role="Xl_RC" value=" / " />
</node>
</node>
<node concept="2OqwBi" id="6QZo_pQbiOh" role="3uHU7w">
<node concept="2OqwBi" id="6QZo_pQb7Hz" role="2Oq$k0">
<node concept="pncrf" id="6QZo_pQb7B9" role="2Oq$k0" />
<node concept="2Xjw5R" id="6QZo_pQbiki" role="2OqNvi">
<node concept="1xMEDy" id="6QZo_pQbikk" role="1xVPHs">
<node concept="chp4Y" id="6QZo_pQbivE" role="ri$Ld">
<ref role="cht4Q" to="tpee:fzclF8l" resolve="Statement" />
<node concept="3cpWs3" id="6QZo_pQb7sr" role="3uHU7B">
<node concept="3cpWs3" id="1WjrBsNIVX7" role="3uHU7B">
<node concept="2OqwBi" id="1WjrBsNIZqG" role="3uHU7B">
<node concept="2JrnkZ" id="1WjrBsNIZmj" role="2Oq$k0">
<node concept="GFMny" id="1WjrBsNJotP" role="2JrQYb" />
</node>
<node concept="liA8E" id="1WjrBsNIZwA" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
<node concept="Xl_RD" id="6QZo_pQb76U" role="3uHU7w">
<property role="Xl_RC" value=" # " />
</node>
</node>
<node concept="2OqwBi" id="6QZo_pQbiOh" role="3uHU7w">
<node concept="2OqwBi" id="6QZo_pQb7Hz" role="2Oq$k0">
<node concept="pncrf" id="6QZo_pQb7B9" role="2Oq$k0" />
<node concept="2Xjw5R" id="6QZo_pQbiki" role="2OqNvi">
<node concept="1xMEDy" id="6QZo_pQbikk" role="1xVPHs">
<node concept="chp4Y" id="6QZo_pQbivE" role="ri$Ld">
<ref role="cht4Q" to="tpee:fzclF8l" resolve="Statement" />
</node>
</node>
</node>
</node>
<node concept="2bSWHS" id="6QZo_pQbj8R" role="2OqNvi" />
</node>
</node>
<node concept="2bSWHS" id="6QZo_pQbj8R" role="2OqNvi" />
</node>
</node>
</node>
Expand All @@ -654,16 +670,63 @@
</node>
</node>
<node concept="r$x8Z" id="6QZo_pQeCRI" role="3EZMnx" />
<node concept="l2Vlx" id="6QZo_pQgDIs" role="2iSdaV" />
<node concept="2iRfu4" id="4EGFz66XWB$" role="2iSdaV" />
<node concept="VPM3Z" id="6QZo_pQbms0" role="3F10Kt">
<property role="VOm3f" value="false" />
</node>
<node concept="3F0ifn" id="1ji15Rhgnku" role="3EZMnx">
<property role="3F0ifm" value="(" />
<node concept="11LMrY" id="1ji15RhgnkW" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="1ji15Rhgnkx" role="3EZMnx">
<property role="3F0ifm" value="other expressions of the same concept:" />
</node>
<node concept="s8t4o" id="1ji15RhfF4E" role="3EZMnx">
<property role="28Zw97" value="true" />
<ref role="28F8cf" to="tpee:f$Xl_Og" resolve="StringLiteral" />
<node concept="xShMh" id="1ji15RhfF4G" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="s8sZD" id="1ji15RhfF4H" role="sbcd9">
<node concept="3clFbS" id="1ji15RhfF4I" role="2VODD2">
<node concept="3clFbF" id="4EGFz66H_5K" role="3cqZAp">
<node concept="2OqwBi" id="4EGFz66Kqkt" role="3clFbG">
<node concept="2OqwBi" id="4EGFz66K2RZ" role="2Oq$k0">
<node concept="GFMny" id="4EGFz66H_5I" role="2Oq$k0" />
<node concept="3TrEf2" id="4EGFz66Ko9U" role="2OqNvi">
<ref role="3Tt5mk" to="gei:5oklODae9FX" resolve="statementList" />
</node>
</node>
<node concept="2Rf3mk" id="4EGFz66KsKP" role="2OqNvi">
<node concept="1xMEDy" id="4EGFz66KsKR" role="1xVPHs">
<node concept="25Kdxt" id="4EGFz66Ldjx" role="ri$Ld">
<node concept="2OqwBi" id="4EGFz66Lgf1" role="25KhWn">
<node concept="pncrf" id="4EGFz66LfdH" role="2Oq$k0" />
<node concept="2yIwOk" id="4EGFz66Liwx" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2iRkQZ" id="4EGFz66M2S9" role="2czzBy" />
</node>
<node concept="3F0ifn" id="1ji15RhgnkL" role="3EZMnx">
<property role="3F0ifm" value=")" />
<node concept="11L4FC" id="1ji15RhgnkX" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
</node>
<node concept="3F0ifn" id="57wonSLX3DT" role="3EmGlc">
<property role="3F0ifm" value="folded" />
</node>
<node concept="2iRkQZ" id="535SrlQ5QBg" role="2czzBy" />
<node concept="2EHx9g" id="4EGFz66XVP6" role="2czzBy" />
</node>
<node concept="l2Vlx" id="535SrlQ5QBh" role="2iSdaV" />
<node concept="VPM3Z" id="535SrlQ5QBi" role="3F10Kt">
Expand Down
42 changes: 25 additions & 17 deletions ...r.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
<child id="1199542457201" name="resultType" index="1ajl9A" />
</concept>
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
<property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
<child id="1199569906740" name="parameter" index="1bW2Oz" />
<child id="1199569916463" name="body" index="1bW5cS" />
</concept>
Expand Down Expand Up @@ -365,10 +366,10 @@
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
<concept id="1227026094155" name="jetbrains.mps.baseLanguage.collections.structure.RemoveLastElementOperation" flags="nn" index="2Kt5_m" />
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
<child id="1225711182005" name="list" index="1y566C" />
Expand Down Expand Up @@ -1455,9 +1456,28 @@
</node>
</node>
</node>
<node concept="3clFbF" id="4DLCSzVGTmO" role="3cqZAp">
<node concept="1rXfSq" id="4DLCSzVGTmP" role="3clFbG">
<ref role="37wK5l" to="emqf:~AbstractCellListHandler.createInnerCells()" resolve="createInnerCells" />
<node concept="3clFbF" id="4EGFz66Zeh9" role="3cqZAp">
<node concept="2YIFZM" id="4EGFz66Zj8U" role="3clFbG">
<ref role="37wK5l" node="1WjrBsNI2hk" resolve="runWithContext" />
<ref role="1Pybhc" node="1WjrBsNHO$4" resolve="QueryListContext" />
<node concept="2ShNRf" id="4EGFz66Zj8V" role="37wK5m">
<node concept="1pGfFk" id="4EGFz66Zj8W" role="2ShVmc">
<ref role="37wK5l" node="1WjrBsNI9Ji" resolve="QueryListContext" />
<node concept="37vLTw" id="4EGFz66ZCR1" role="37wK5m">
<ref role="3cqZAo" node="1SwultAiTIH" resolve="myOwner" />
</node>
</node>
</node>
<node concept="1bVj0M" id="4EGFz66Zj8Y" role="37wK5m">
<property role="3yWfEV" value="true" />
<node concept="3clFbS" id="4EGFz66Zj8Z" role="1bW5cS">
<node concept="3clFbF" id="4DLCSzVGTmO" role="3cqZAp">
<node concept="1rXfSq" id="4DLCSzVGTmP" role="3clFbG">
<ref role="37wK5l" to="emqf:~AbstractCellListHandler.createInnerCells()" resolve="createInnerCells" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="4DLCSzVGTmQ" role="3cqZAp" />
Expand Down Expand Up @@ -3718,19 +3738,7 @@
<node concept="37vLTw" id="1WjrBsNHZaI" role="2Oq$k0">
<ref role="3cqZAo" node="1WjrBsNI1Jv" resolve="ourContextStack" />
</node>
<node concept="34jXtK" id="1WjrBsNHZAl" role="2OqNvi">
<node concept="3cpWsd" id="1WjrBsNI0xG" role="25WWJ7">
<node concept="3cmrfG" id="1WjrBsNI0xX" role="3uHU7w">
<property role="3cmrfH" value="1" />
</node>
<node concept="2OqwBi" id="1WjrBsNHZOf" role="3uHU7B">
<node concept="37vLTw" id="1WjrBsNHZDE" role="2Oq$k0">
<ref role="3cqZAo" node="1WjrBsNI1Jv" resolve="ourContextStack" />
</node>
<node concept="34oBXx" id="1WjrBsNI091" role="2OqNvi" />
</node>
</node>
</node>
<node concept="2Kt5_m" id="4EGFz669eCA" role="2OqNvi" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit c8b9f18

Please sign in to comment.