Skip to content

Commit

Permalink
Improve CoordCellRef editor + add editor tests for optional finder
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann committed Jul 25, 2022
1 parent 0cd9e91 commit 59f5660
Show file tree
Hide file tree
Showing 4 changed files with 645 additions and 149 deletions.
281 changes: 132 additions & 149 deletions ....opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4992,162 +4992,160 @@
<node concept="24kQdi" id="5xEoEMrqNzH">
<property role="3GE5qa" value="sheet.ref" />
<ref role="1XX52x" to="wtll:5xEoEMrqNzj" resolve="CoordCellRef" />
<node concept="3EZMnI" id="5tXCpgboXH9" role="2wV5jI">
<node concept="2iRkQZ" id="5tXCpgboXHa" role="2iSdaV" />
<node concept="3EZMnI" id="5xEoEMrFDD9" role="3EZMnx">
<node concept="2iRfu4" id="5xEoEMrFDDa" role="2iSdaV" />
<node concept="3F0ifn" id="5xEoEMrqNzJ" role="3EZMnx">
<property role="3F0ifm" value="$" />
<node concept="11L4FC" id="3pIANU$W0tA" role="3F10Kt">
<property role="VOm3f" value="true" />
<node concept="3nzxsE" id="3pIANU$W0_L" role="3n$kyP">
<node concept="3clFbS" id="3pIANU$W0_M" role="2VODD2">
<node concept="3clFbF" id="3pIANU$W0GW" role="3cqZAp">
<node concept="3y3z36" id="3pIANU$W1Tq" role="3clFbG">
<node concept="10Nm6u" id="3pIANU$W23e" role="3uHU7w" />
<node concept="2OqwBi" id="3pIANU$W0Wh" role="3uHU7B">
<node concept="pncrf" id="3pIANU$W0GV" role="2Oq$k0" />
<node concept="3TrEf2" id="3pIANU$W1lx" role="2OqNvi">
<ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
</node>
<node concept="3EZMnI" id="5xEoEMrFDD9" role="2wV5jI">
<node concept="2iRfu4" id="5xEoEMrFDDa" role="2iSdaV" />
<node concept="3F0ifn" id="5xEoEMrqNzJ" role="3EZMnx">
<property role="3F0ifm" value="$" />
<node concept="11L4FC" id="3pIANU$W0tA" role="3F10Kt">
<property role="VOm3f" value="true" />
<node concept="3nzxsE" id="3pIANU$W0_L" role="3n$kyP">
<node concept="3clFbS" id="3pIANU$W0_M" role="2VODD2">
<node concept="3clFbF" id="3pIANU$W0GW" role="3cqZAp">
<node concept="3y3z36" id="3pIANU$W1Tq" role="3clFbG">
<node concept="10Nm6u" id="3pIANU$W23e" role="3uHU7w" />
<node concept="2OqwBi" id="3pIANU$W0Wh" role="3uHU7B">
<node concept="pncrf" id="3pIANU$W0GV" role="2Oq$k0" />
<node concept="3TrEf2" id="3pIANU$W1lx" role="2OqNvi">
<ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="11LMrY" id="5xEoEMrqN$M" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3k4GqR" id="5xEoEMruHWv" role="3F10Kt">
<node concept="3k4GqP" id="5xEoEMruHWw" role="3k4GqO">
<node concept="3clFbS" id="5xEoEMruHWx" role="2VODD2">
<node concept="3clFbF" id="5xEoEMruIVR" role="3cqZAp">
<node concept="2OqwBi" id="5xEoEMruIVT" role="3clFbG">
<node concept="pncrf" id="5xEoEMruIVU" role="2Oq$k0" />
<node concept="2qgKlT" id="5xEoEMrEFUC" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
</node>
</node>
<node concept="11LMrY" id="5xEoEMrqN$M" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3k4GqR" id="5xEoEMruHWv" role="3F10Kt">
<node concept="3k4GqP" id="5xEoEMruHWw" role="3k4GqO">
<node concept="3clFbS" id="5xEoEMruHWx" role="2VODD2">
<node concept="3clFbF" id="5xEoEMruIVR" role="3cqZAp">
<node concept="2OqwBi" id="5xEoEMruIVT" role="3clFbG">
<node concept="pncrf" id="5xEoEMruIVU" role="2Oq$k0" />
<node concept="2qgKlT" id="5xEoEMrEFUC" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3EZMnI" id="5tXCpgbyXWv" role="3EZMnx">
<node concept="2iRfu4" id="5tXCpgbyXWw" role="2iSdaV" />
<node concept="3F1sOY" id="5tXCpgbyXQV" role="3EZMnx">
<ref role="1NtTu8" to="wtll:3pIANU$T$6B" resolve="finder" />
</node>
<node concept="3EZMnI" id="5tXCpgbyXWv" role="3EZMnx">
<node concept="2iRfu4" id="5tXCpgbyXWw" role="2iSdaV" />
<node concept="3F1sOY" id="5tXCpgbyXQV" role="3EZMnx">
<ref role="1NtTu8" to="wtll:3pIANU$T$6B" resolve="finder" />
</node>
<node concept="3F0ifn" id="5tXCpgbyY29" role="3EZMnx">
<property role="3F0ifm" value="/" />
<node concept="11L4FC" id="5tXCpgbyY2d" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3F0ifn" id="5tXCpgbyY29" role="3EZMnx">
<property role="3F0ifm" value="/" />
<node concept="11L4FC" id="5tXCpgbyY2d" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="11LMrY" id="5tXCpgbyY2i" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="11LMrY" id="5tXCpgbyY2i" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pkWqt" id="5tXCpgbyY2m" role="pqm2j">
<node concept="3clFbS" id="5tXCpgbyY2n" role="2VODD2">
<node concept="3clFbF" id="5tXCpgbyY6i" role="3cqZAp">
<node concept="2OqwBi" id="5tXCpgbyYWu" role="3clFbG">
<node concept="2OqwBi" id="5tXCpgbyYn$" role="2Oq$k0">
<node concept="pncrf" id="5tXCpgbyY6h" role="2Oq$k0" />
<node concept="3TrEf2" id="5tXCpgbyYM5" role="2OqNvi">
<ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
</node>
</node>
<node concept="pkWqt" id="5tXCpgbyY2m" role="pqm2j">
<node concept="3clFbS" id="5tXCpgbyY2n" role="2VODD2">
<node concept="3clFbF" id="5tXCpgbyY6i" role="3cqZAp">
<node concept="2OqwBi" id="5tXCpgbyYWu" role="3clFbG">
<node concept="2OqwBi" id="5tXCpgbyYn$" role="2Oq$k0">
<node concept="pncrf" id="5tXCpgbyY6h" role="2Oq$k0" />
<node concept="3TrEf2" id="5tXCpgbyYM5" role="2OqNvi">
<ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
</node>
<node concept="3x8VRR" id="5tXCpgbyZgO" role="2OqNvi" />
</node>
<node concept="3x8VRR" id="5tXCpgbyZgO" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="3F0A7n" id="5avmkTFcXRb" role="3EZMnx">
<ref role="1NtTu8" to="wtll:5avmkTFcWo6" resolve="cell" />
<node concept="3k4GqR" id="5avmkTFeTnD" role="3F10Kt">
<node concept="3k4GqP" id="5avmkTFeTnE" role="3k4GqO">
<node concept="3clFbS" id="5avmkTFeTnF" role="2VODD2">
<node concept="3clFbF" id="5avmkTFeTCk" role="3cqZAp">
<node concept="2OqwBi" id="5avmkTFeTOD" role="3clFbG">
<node concept="pncrf" id="5avmkTFeTCj" role="2Oq$k0" />
<node concept="2qgKlT" id="5avmkTFeUgL" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
</node>
</node>
<node concept="3F0A7n" id="5avmkTFcXRb" role="3EZMnx">
<property role="1cu_pB" value="gtguBGO/firstEditableCell" />
<ref role="1NtTu8" to="wtll:5avmkTFcWo6" resolve="cell" />
<node concept="3k4GqR" id="5avmkTFeTnD" role="3F10Kt">
<node concept="3k4GqP" id="5avmkTFeTnE" role="3k4GqO">
<node concept="3clFbS" id="5avmkTFeTnF" role="2VODD2">
<node concept="3clFbF" id="5avmkTFeTCk" role="3cqZAp">
<node concept="2OqwBi" id="5avmkTFeTOD" role="3clFbG">
<node concept="pncrf" id="5avmkTFeTCj" role="2Oq$k0" />
<node concept="2qgKlT" id="5avmkTFeUgL" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
</node>
</node>
</node>
</node>
</node>
<node concept="11L4FC" id="5tXCpgbzTTD" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3CHQLq" id="5tXCpgbzU2s" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="A1WHu" id="5tXCpgb_Vg2" role="3vIgyS">
<ref role="A1WHt" node="5tXCpgbx60V" resolve="Finders" />
</node>
</node>
<node concept="PMmxH" id="5xEoEMrFEc$" role="3EZMnx">
<ref role="PMmxG" node="5xEoEMrFs7i" resolve="argList" />
<node concept="pkWqt" id="5xEoEMrFEc_" role="pqm2j">
<node concept="3clFbS" id="5xEoEMrFEcA" role="2VODD2">
<node concept="3clFbF" id="5xEoEMrFEcB" role="3cqZAp">
<node concept="2OqwBi" id="5xEoEMrFEcC" role="3clFbG">
<node concept="pncrf" id="5xEoEMrFEcD" role="2Oq$k0" />
<node concept="2qgKlT" id="5xEoEMrFEcE" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrFtHl" resolve="needsActuals" />
</node>
<node concept="11L4FC" id="5tXCpgbzTTD" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3CHQLq" id="5tXCpgbzU2s" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="A1WHu" id="5tXCpgb_Vg2" role="3vIgyS">
<ref role="A1WHt" node="5tXCpgbx60V" resolve="Finders" />
</node>
</node>
<node concept="PMmxH" id="5xEoEMrFEc$" role="3EZMnx">
<ref role="PMmxG" node="5xEoEMrFs7i" resolve="argList" />
<node concept="pkWqt" id="5xEoEMrFEc_" role="pqm2j">
<node concept="3clFbS" id="5xEoEMrFEcA" role="2VODD2">
<node concept="3clFbF" id="5xEoEMrFEcB" role="3cqZAp">
<node concept="2OqwBi" id="5xEoEMrFEcC" role="3clFbG">
<node concept="pncrf" id="5xEoEMrFEcD" role="2Oq$k0" />
<node concept="2qgKlT" id="5xEoEMrFEcE" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrFtHl" resolve="needsActuals" />
</node>
</node>
</node>
</node>
<node concept="11L4FC" id="5xEoEMrGg7L" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="Veino" id="5avmkTFCmpY" role="3F10Kt">
<node concept="3ZlJ5R" id="5avmkTFCmEQ" role="VblUZ">
<node concept="3clFbS" id="5avmkTFCmER" role="2VODD2">
<node concept="3clFbJ" id="5avmkTFCmLP" role="3cqZAp">
<node concept="3clFbS" id="5avmkTFCmLQ" role="3clFbx">
<node concept="3cpWs6" id="5avmkTFCmLR" role="3cqZAp">
<node concept="2ShNRf" id="5avmkTFCmLS" role="3cqZAk">
<node concept="1pGfFk" id="5avmkTFCmLT" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="5avmkTFCmLU" role="37wK5m">
<property role="3cmrfH" value="224" />
</node>
<node concept="3cmrfG" id="5avmkTFCmLV" role="37wK5m">
<property role="3cmrfH" value="247" />
</node>
<node concept="3cmrfG" id="5avmkTFCmLW" role="37wK5m">
<property role="3cmrfH" value="255" />
</node>
<node concept="11L4FC" id="5xEoEMrGg7L" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="Veino" id="5avmkTFCmpY" role="3F10Kt">
<node concept="3ZlJ5R" id="5avmkTFCmEQ" role="VblUZ">
<node concept="3clFbS" id="5avmkTFCmER" role="2VODD2">
<node concept="3clFbJ" id="5avmkTFCmLP" role="3cqZAp">
<node concept="3clFbS" id="5avmkTFCmLQ" role="3clFbx">
<node concept="3cpWs6" id="5avmkTFCmLR" role="3cqZAp">
<node concept="2ShNRf" id="5avmkTFCmLS" role="3cqZAk">
<node concept="1pGfFk" id="5avmkTFCmLT" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="5avmkTFCmLU" role="37wK5m">
<property role="3cmrfH" value="224" />
</node>
<node concept="3cmrfG" id="5avmkTFCmLV" role="37wK5m">
<property role="3cmrfH" value="247" />
</node>
<node concept="3cmrfG" id="5avmkTFCmLW" role="37wK5m">
<property role="3cmrfH" value="255" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5avmkTFCmLX" role="3clFbw">
<node concept="2OqwBi" id="5avmkTFCoe4" role="2Oq$k0">
<node concept="2OqwBi" id="5avmkTFCmLY" role="2Oq$k0">
<node concept="pncrf" id="5avmkTFCmLZ" role="2Oq$k0" />
<node concept="2qgKlT" id="5avmkTFCnUB" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
</node>
</node>
<node concept="3Tsc0h" id="5avmkTFCoKO" role="2OqNvi">
<ref role="3TtcxE" to="wtll:5xEoEMrzSo8" resolve="args" />
</node>
<node concept="2OqwBi" id="5avmkTFCmLX" role="3clFbw">
<node concept="2OqwBi" id="5avmkTFCoe4" role="2Oq$k0">
<node concept="2OqwBi" id="5avmkTFCmLY" role="2Oq$k0">
<node concept="pncrf" id="5avmkTFCmLZ" role="2Oq$k0" />
<node concept="2qgKlT" id="5avmkTFCnUB" role="2OqNvi">
<ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
</node>
</node>
<node concept="3GX2aA" id="5avmkTFCmM1" role="2OqNvi" />
<node concept="3Tsc0h" id="5avmkTFCoKO" role="2OqNvi">
<ref role="3TtcxE" to="wtll:5xEoEMrzSo8" resolve="args" />
</node>
</node>
<node concept="3GX2aA" id="5avmkTFCmM1" role="2OqNvi" />
</node>
<node concept="3cpWs6" id="5avmkTFCpir" role="3cqZAp">
<node concept="10Nm6u" id="5avmkTFCpqE" role="3cqZAk" />
</node>
</node>
<node concept="3cpWs6" id="5avmkTFCpir" role="3cqZAp">
<node concept="10Nm6u" id="5avmkTFCpqE" role="3cqZAk" />
</node>
</node>
</node>
Expand Down Expand Up @@ -6086,6 +6084,19 @@
<node concept="3c8USq" id="5tXCpgby3HU" role="37vLTx" />
</node>
</node>
<node concept="3clFbF" id="3JvidvJG3bm" role="3cqZAp">
<node concept="37vLTI" id="3JvidvJG43b" role="3clFbG">
<node concept="Xl_RD" id="3JvidvJG48v" role="37vLTx">
<property role="Xl_RC" value="" />
</node>
<node concept="2OqwBi" id="3JvidvJG3n3" role="37vLTJ">
<node concept="7Obwk" id="3JvidvJG3bl" role="2Oq$k0" />
<node concept="3TrcHB" id="3JvidvJG3KD" role="2OqNvi">
<ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5tXCpgbATag" role="3cqZAp">
<node concept="2OqwBi" id="5tXCpgbATgd" role="3clFbG">
<node concept="1Q80Hx" id="5tXCpgbATaf" role="2Oq$k0" />
Expand All @@ -6100,38 +6111,10 @@
<node concept="3cqGtN" id="5tXCpgbCM0m" role="2jZA2a">
<node concept="3cqJkl" id="5tXCpgbCM0n" role="3cqGtW">
<node concept="3clFbS" id="5tXCpgbCM0o" role="2VODD2">
<node concept="3cpWs6" id="5tXCpgbJyRp" role="3cqZAp">
<node concept="3K4zz7" id="5tXCpgbJ_AW" role="3cqZAk">
<node concept="3y3z36" id="5tXCpgbJ$Yx" role="3K4Cdx">
<node concept="10Nm6u" id="5tXCpgbJ_yU" role="3uHU7w" />
<node concept="2OqwBi" id="5tXCpgbJ$6S" role="3uHU7B">
<node concept="7Obwk" id="5tXCpgbJySk" role="2Oq$k0" />
<node concept="3TrcHB" id="5tXCpgbJ$8K" role="2OqNvi">
<ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
</node>
</node>
</node>
<node concept="3cpWs3" id="5tXCpgbCMAw" role="3K4E3e">
<node concept="2OqwBi" id="5tXCpgbCMN1" role="3uHU7w">
<node concept="7Obwk" id="5tXCpgbCMBm" role="2Oq$k0" />
<node concept="3TrcHB" id="5tXCpgbCNl0" role="2OqNvi">
<ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
</node>
</node>
<node concept="3cpWs3" id="5tXCpgbDHp4" role="3uHU7B">
<node concept="Xl_RD" id="5tXCpgbCMnU" role="3uHU7w">
<property role="Xl_RC" value="/" />
</node>
<node concept="2OqwBi" id="5tXCpgbDIfF" role="3uHU7B">
<node concept="3jrdc4" id="5tXCpgbDIak" role="2Oq$k0" />
<node concept="3j5asI" id="5tXCpgbDIsr" role="2OqNvi" />
</node>
</node>
</node>
<node concept="2OqwBi" id="5tXCpgbJ_K1" role="3K4GZi">
<node concept="3jrdc4" id="5tXCpgbJ_K2" role="2Oq$k0" />
<node concept="3j5asI" id="5tXCpgbJ_K3" role="2OqNvi" />
</node>
<node concept="3clFbF" id="3JvidvJF51D" role="3cqZAp">
<node concept="2OqwBi" id="5tXCpgbDIfF" role="3clFbG">
<node concept="3jrdc4" id="5tXCpgbDIak" role="2Oq$k0" />
<node concept="3j5asI" id="5tXCpgbDIsr" role="2OqNvi" />
</node>
</node>
</node>
Expand Down
5 changes: 5 additions & 0 deletions ...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12142,6 +12142,11 @@
<ref role="3bR37D" node="cPLa7FuMZR" resolve="org.iets3.core.expr.data" />
</node>
</node>
<node concept="1SiIV0" id="2LepRDoQ2eI" role="3bR37C">
<node concept="3bR9La" id="2LepRDoQ2eJ" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
</node>
</node>
</node>
<node concept="1E1JtA" id="OJuIQp$d7j" role="3989C9">
<property role="BnDLt" value="true" />
Expand Down
Loading

0 comments on commit 59f5660

Please sign in to comment.