Skip to content

feature(base): Make concepts with a main expression a visible elements provider #1555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexanderpann wants to merge 3 commits into
base: maintenance/mps20251
Choose a base branch
from
Open

feature(base): Make concepts with a main expression a visible elements provider #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47a4469
feature(base): make concepts with a main expression a visible element…
Dec 9, 2025
6d8b8bb
Merge branch 'maintenance/mps20251' into feature/visible_elements_pro…
alexanderpann Jan 7, 2026
95277c0
Merge branch 'maintenance/mps20251' into feature/visible_elements_pro…
alexanderpann Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
### Added

- Variability: The intention "Update all configurations" for feature models has been improved: Now a modal dialog with a progress bar and some additional information is shown. The process is now completely sequential, improving stability. Moreover, there is some timing output in the log. Finally, performance has been improved by postponing the event handling for all changes to the involved models.
- Concepts with a main expression can now act as a visible elements provider. They forward the task to the expression if it implements `IVisibleElementsProviderSource`; otherwise, they call the parent provider instead.
- Variability: The intention "Adapt to changes in feature model" and related quickfixes also have been improved similarly to the improvements on "Update all configurations".

### Fixed
Expand Down
1 change: 1 addition & 0 deletions code/languages/org.iets3.opensource/.mps/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.tests" />
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl" folder="trace" />
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.customization/test.ts.expr.os.customization.mpl" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.nix/test.ts.expr.os.nix.mpl" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/InterpreterTestExecutor/InterpreterTestExecutor.msd" folder="_build" />
Expand Down
8 changes: 8 additions & 0 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/structure.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</languages>
<imports>
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
</imports>
<registry>
<language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
Expand Down Expand Up @@ -214,5 +215,12 @@
</node>
</node>
</node>
<node concept="PlHQZ" id="7UbQLM_m7K$">
<property role="EcuMT" value="9118622786621307940" />
<property role="TrG5h" value="IVisibleElementProviderSource" />
<node concept="PrWs8" id="7UbQLM_m7KA" role="PrDN$">
<ref role="PrY4T" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
</node>
</node>
</model>

102 changes: 102 additions & 0 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
<import index="ciba" ref="r:11b7cdb2-cc58-456e-bb9a-ce45b78edd2f(jetbrains.mps.ide.httpsupport.runtime.base)" />
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
</imports>
<registry>
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
Expand Down Expand Up @@ -532,6 +533,7 @@
<concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
<reference id="1138056546658" name="link" index="3TtcxE" />
</concept>
<concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug" />
<concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
Expand Down Expand Up @@ -32722,5 +32724,105 @@
<ref role="3uigEE" node="7LZDtvhnXHQ" resolve="IValueAndTrace" />
</node>
</node>
<node concept="13h7C7" id="7UbQLM_mw0U">
<ref role="13h7C2" to="hm2y:3G_qVqIw4zo" resolve="IContainExpressionParam" />
<node concept="13i0hz" id="7UbQLM_mw1d" role="13h7CS">
<property role="TrG5h" value="visibleContentsOfType" />
<property role="13i0it" value="false" />
<property role="13i0iv" value="false" />
<ref role="13i0hy" to="hwgx:6clJcrJXo2_" resolve="visibleContentsOfType" />
<node concept="3Tm1VV" id="7UbQLM_mw1e" role="1B3o_S" />
<node concept="2AHcQZ" id="7UbQLM_mw1f" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
</node>
<node concept="3clFbS" id="7UbQLM_mw1g" role="3clF47">
<node concept="3clFbF" id="7UbQLM_mw1h" role="3cqZAp">
<node concept="BsUDl" id="7UbQLM_mw1i" role="3clFbG">
<ref role="37wK5l" to="hwgx:3g6LnlWuSo8" resolve="visibleContentsOfTypeAsSequence" />
<node concept="2OqwBi" id="7UbQLM_mw1j" role="37wK5m">
<node concept="37vLTw" id="7UbQLM_mw1k" role="2Oq$k0">
<ref role="3cqZAo" node="7UbQLM_mw1m" resolve="targetConcept" />
</node>
<node concept="1rGIog" id="7UbQLM_mw1l" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="7UbQLM_mw1m" role="3clF46">
<property role="TrG5h" value="targetConcept" />
<node concept="3THzug" id="7UbQLM_mw1n" role="1tU5fm" />
</node>
<node concept="A3Dl8" id="7UbQLM_mw1o" role="3clF45">
<node concept="3Tqbb2" id="7UbQLM_mw1p" role="A3Ik2" />
</node>
</node>
<node concept="13i0hz" id="7UbQLM_mw1q" role="13h7CS">
<property role="TrG5h" value="visibleContentsOfType" />
<property role="13i0it" value="false" />
<property role="13i0iv" value="false" />
<ref role="13i0hy" to="hwgx:79$zShlSHxZ" resolve="visibleContentsOfType" />
<node concept="3Tm1VV" id="7UbQLM_mw1r" role="1B3o_S" />
<node concept="3clFbS" id="7UbQLM_mw1s" role="3clF47">
<node concept="Jncv_" id="7UbQLM_mzcw" role="3cqZAp">
<ref role="JncvD" to="4kwy:7UbQLM_m7K$" resolve="IVisibleElementProviderSource" />
<node concept="2OqwBi" id="7UbQLM_mBRY" role="JncvB">
<node concept="13iPFW" id="7UbQLM_mBDt" role="2Oq$k0" />
<node concept="3TrEf2" id="7UbQLM_mCiA" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:3G_qVqIw4zp" resolve="expr" />
</node>
</node>
<node concept="3clFbS" id="7UbQLM_mzc$" role="Jncv$">
<node concept="3cpWs6" id="7UbQLM_mD4A" role="3cqZAp">
<node concept="2OqwBi" id="7UbQLM_mDoI" role="3cqZAk">
<node concept="Jnkvi" id="7UbQLM_mD7K" role="2Oq$k0">
<ref role="1M0zk5" node="7UbQLM_mzcA" resolve="source" />
</node>
<node concept="2qgKlT" id="7UbQLM_mDR0" role="2OqNvi">
<ref role="37wK5l" to="hwgx:79$zShlSHxZ" resolve="visibleContentsOfType" />
<node concept="37vLTw" id="7UbQLM_mG6d" role="37wK5m">
<ref role="3cqZAo" node="7UbQLM_mw1Y" resolve="targetConcept" />
</node>
</node>
</node>
</node>
</node>
<node concept="JncvC" id="7UbQLM_mzcA" role="JncvA">
<property role="TrG5h" value="source" />
<node concept="2jxLKc" id="7UbQLM_mzcB" role="1tU5fm" />
</node>
</node>
<node concept="3cpWs6" id="7UbQLM_mGJE" role="3cqZAp">
<node concept="2OqwBi" id="7UbQLM_mw1w" role="3cqZAk">
<node concept="2OqwBi" id="7UbQLM_mw1x" role="2Oq$k0">
<node concept="13iPFW" id="7UbQLM_mw1y" role="2Oq$k0" />
<node concept="2Xjw5R" id="7UbQLM_mw1z" role="2OqNvi">
<node concept="1xMEDy" id="7UbQLM_mw1$" role="1xVPHs">
<node concept="chp4Y" id="7UbQLM_mw1_" role="ri$Ld">
<ref role="cht4Q" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="7UbQLM_mw1A" role="2OqNvi">
<ref role="37wK5l" to="hwgx:79$zShlSHxZ" resolve="visibleContentsOfType" />
<node concept="37vLTw" id="7UbQLM_mw1B" role="37wK5m">
<ref role="3cqZAo" node="7UbQLM_mw1Y" resolve="targetConcept" />
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="7UbQLM_mw1Y" role="3clF46">
<property role="TrG5h" value="targetConcept" />
<node concept="3bZ5Sz" id="7UbQLM_mw1Z" role="1tU5fm" />
</node>
<node concept="3uibUv" id="7UbQLM_mw20" role="3clF45">
<ref role="3uigEE" to="o8zo:3fifI_xCtN$" resolve="Scope" />
</node>
</node>
<node concept="13hLZK" id="7UbQLM_mw0V" role="13h7CW">
<node concept="3clFbS" id="7UbQLM_mw0W" role="2VODD2" />
</node>
</node>
</model>

3 changes: 3 additions & 0 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2408,6 +2408,9 @@
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6sdnDbSla17" resolve="Expression" />
</node>
<node concept="PrWs8" id="7UbQLM_mw0T" role="PrDN$">
<ref role="PrY4T" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
</node>
</node>
<node concept="PlHQZ" id="1azguFQNaDo">
<property role="EcuMT" value="1342989591305300568" />
Expand Down
Loading