Skip to content

Feature/remove deprecated variability base 1547 #1548

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

Merged
kbirken merged 2 commits into from
Dec 5, 2025
Merged

Feature/remove deprecated variability base 1547 #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df2fb5
Remove deprecated concepts and provide clean-up quickfix (#1547).
kbirken Dec 4, 2025
66e59c5
Merge branch 'maintenance/mps20241' into feature/remove_deprecated_va…
dbinkele Dec 5, 2025
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented

- Variability: The propagation of configuration updates to referencing configurations has been improved. Due to this optimization, it needs much less CPU time now.

### Changed

- Variability: Remove deprecated concepts `VariabilityModelChunk_old`, and some related concepts.


## November 2025

Expand Down
11 changes: 2 additions & 9 deletions ...urce/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
</languages>
<imports>
<import index="s6b7" ref="r:a7e2f963-3e46-49e0-a385-e8c7f33c91b7(org.iets3.variability.featuremodel.base.structure)" />
<import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
<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)" />
Expand Down Expand Up @@ -73,7 +72,7 @@
<property role="TrG5h" value="EmptyVariabilityContent" />
<property role="3GE5qa" value="container" />
<property role="EcuMT" value="3989254429232912648" />
<ref role="1TJDcQ" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="3tsFshP5d$9" role="PzmwI">
<ref role="PrY4T" node="3tsFshP5cTx" resolve="IVariabilityContent" />
</node>
Expand All @@ -88,24 +87,18 @@
<node concept="PrWs8" id="22kx7U4Kqjy" role="PrDN$">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="PrWs8" id="51M$6hf3mdw" role="PrDN$">
<ref role="PrY4T" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
</node>
</node>
<node concept="PlHQZ" id="3tsFshP5cTx">
<property role="TrG5h" value="IVariabilityContent" />
<property role="3GE5qa" value="container" />
<property role="EcuMT" value="3989254429232909921" />
<node concept="PrWs8" id="51M$6hf3mdH" role="PrDN$">
<ref role="PrY4T" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
</node>
</node>
<node concept="1TIwiD" id="3tsFshP56tQ">
<property role="TrG5h" value="VariabilityModelChunk" />
<property role="19KtqR" value="true" />
<property role="3GE5qa" value="container" />
<property role="EcuMT" value="3989254429232883574" />
<ref role="1TJDcQ" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
<ref role="1TJDcQ" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
<node concept="PrWs8" id="22kx7U49GUo" role="PzmwI">
<ref role="PrY4T" node="22kx7U49GUn" resolve="IVariabilityContainer" />
</node>
Expand Down
422 changes: 420 additions & 2 deletions ...rce/languages/org.iets3.variability.base/models/org.iets3.variability.base.typesystem.mps
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion .../org.iets3.opensource/languages/org.iets3.variability.base/org.iets3.variability.base.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<dependencies>
<dependency reexport="false">5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)</dependency>
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
<dependency reexport="false">165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -101,7 +102,8 @@
<module reference="165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)" version="36" />
</dependencyVersions>
<extendedLanguages>
<extendedLanguage>165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</extendedLanguage>
<extendedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</extendedLanguage>
<extendedLanguage>db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)</extendedLanguage>
</extendedLanguages>
</language>

718 changes: 0 additions & 718 deletions ...variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 2 additions & 128 deletions ...3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@
<child id="1140524464360" name="cellLayout" index="2czzBx" />
<child id="1140524464359" name="emptyCellModel" index="2czzBI" />
</concept>
<concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
<child id="1176795024817" name="cellProvider" index="3YsKMw" />
</concept>
<concept id="1196434649611" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_SimpleString" flags="ng" index="2h3Zct">
<property id="1196434851095" name="text" index="2h4Kg1" />
</concept>
Expand Down Expand Up @@ -354,7 +351,6 @@
</concept>
<concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
<concept id="2722384699544370949" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Placeholder" flags="ng" index="3VyMlK" />
<concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
<concept id="4307758654696938365" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_RefPresentation" flags="ig" index="1WAQ3h" />
<concept id="4307758654696952957" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ReferencedNode" flags="ng" index="1WAUZh" />
<concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
Expand Down Expand Up @@ -625,7 +621,7 @@
</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="nn" index="1Q80Hy" />
<concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX5" />
<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 Expand Up @@ -950,104 +946,6 @@
</concept>
</language>
</registry>
<node concept="24kQdi" id="3tsFshP5cTU">
<property role="3GE5qa" value="_deprecated.chunk" />
<ref role="1XX52x" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
<node concept="3EZMnI" id="4tXyFaWwywa" role="2wV5jI">
<node concept="3EZMnI" id="7nsgDAXznLJ" role="3EZMnx">
<node concept="2iRfu4" id="7nsgDAXznLK" role="2iSdaV" />
<node concept="3EZMnI" id="4tXyFaWwywk" role="3EZMnx">
<node concept="l2Vlx" id="4tXyFaWwywl" role="2iSdaV" />
<node concept="3F0ifn" id="4tXyFaWwywh" role="3EZMnx">
<property role="3F0ifm" value="variability" />
<ref role="1k5W1q" to="s7nz:16fFHQCfB3d" resolve="VariabilityHeader" />
</node>
<node concept="3F0A7n" id="4tXyFaWwywt" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
<ref role="1k5W1q" to="s7nz:16fFHQCfB3d" resolve="VariabilityHeader" />
</node>
</node>
<node concept="3XFhqQ" id="7nsgDAXznVR" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAXznWo" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAXznWT" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAXznXr" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAXznXY" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAX$QF1" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAX$QFF" role="3EZMnx" />
<node concept="3XFhqQ" id="7nsgDAX$QGm" role="3EZMnx" />
<node concept="3EZMnI" id="7nsgDAX$QE7" role="3EZMnx">
<node concept="2iRfu4" id="7nsgDAX$QE8" role="2iSdaV" />
<node concept="3F0ifn" id="7nsgDAX$QEW" role="3EZMnx">
<property role="3F0ifm" value="imports" />
</node>
<node concept="3F2HdR" id="7nsgDAXznZ7" role="3EZMnx">
<ref role="1NtTu8" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
<node concept="2iRkQZ" id="7nsgDAXznZJ" role="2czzBx" />
</node>
</node>
</node>
<node concept="2iRkQZ" id="4tXyFaWwywd" role="2iSdaV" />
<node concept="gc7cB" id="4tXyFaWwywB" role="3EZMnx">
<node concept="3VJUX4" id="4tXyFaWwywD" role="3YsKMw">
<node concept="3clFbS" id="4tXyFaWwywF" role="2VODD2">
<node concept="3clFbF" id="4tXyFaWwyxe" role="3cqZAp">
<node concept="2ShNRf" id="4tXyFaWwyxc" role="3clFbG">
<node concept="1pGfFk" id="4tXyFaWwzSe" role="2ShVmc">
<ref role="37wK5l" to="r4b4:5gTlpakvelx" resolve="HorizLineCell" />
<node concept="pncrf" id="4tXyFaWwzSS" role="37wK5m" />
<node concept="10M0yZ" id="4tXyFaWw$6n" role="37wK5m">
<ref role="3cqZAo" to="lzb2:~JBColor.BLACK" resolve="BLACK" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
<node concept="3cmrfG" id="4tXyFaWw$bx" role="37wK5m">
<property role="3cmrfH" value="2" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3F0ifn" id="4tXyFaWwBfP" role="3EZMnx">
<node concept="VPM3Z" id="4tXyFaWwBiM" role="3F10Kt">
<property role="VOm3f" value="false" />
</node>
</node>
<node concept="3F2HdR" id="4tXyFaWwBeE" role="3EZMnx">
<ref role="1NtTu8" to="s6b7:3tsFshP58gT" resolve="contents_old" />
<node concept="2iRkQZ" id="4tXyFaWwBeG" role="2czzBx" />
<node concept="4$FPG" id="6LfBX8YivEt" role="4_6I_">
<node concept="3clFbS" id="6LfBX8YivEu" role="2VODD2">
<node concept="3clFbF" id="6LfBX8YivF8" role="3cqZAp">
<node concept="2ShNRf" id="6LfBX8YivF6" role="3clFbG">
<node concept="3zrR0B" id="6LfBX8YiFHF" role="2ShVmc">
<node concept="3Tqbb2" id="6LfBX8YiFHH" role="3zrR0E">
<ref role="ehGHo" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3F0ifn" id="6LfBX8YiNlo" role="2czzBI">
<property role="3F0ifm" value="" />
<node concept="VPxyj" id="6LfBX8YiNn4" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
</node>
</node>
<node concept="24kQdi" id="3tsFshP5e60">
<property role="3GE5qa" value="_deprecated.chunk" />
<ref role="1XX52x" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
<node concept="3F0ifn" id="3tsFshP5e62" role="2wV5jI">
<property role="3F0ifm" value="" />
<node concept="VPxyj" id="3tsFshP5e7H" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
<node concept="24kQdi" id="3tsFshP5EcA">
<property role="3GE5qa" value="treenodes" />
<ref role="1XX52x" to="s6b7:3tsFshP5E8h" resolve="FeatureModel" />
Expand Down Expand Up @@ -8341,12 +8239,6 @@
</node>
<node concept="382kZG" id="7cBI1LfYpEY" role="lGtFl" />
</node>
<node concept="22mcaB" id="cEt5uj8NHA">
<property role="3GE5qa" value="_deprecated.chunk" />
<ref role="aqKnT" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
<node concept="22hDWj" id="24LQtH$d1Vk" role="22hAXT" />
<node concept="2VfDsV" id="51M$6hf3mdh" role="3ft7WO" />
</node>
<node concept="22mcaB" id="7cBI1LfYpEZ">
<ref role="aqKnT" to="s6b7:5NPKd17BG$l" resolve="FeatureModelConfiguration_old" />
<node concept="22hDWj" id="24LQtH$d1Vl" role="22hAXT" />
Expand Down Expand Up @@ -9036,7 +8928,7 @@
</node>
</node>
</node>
<node concept="3VJUX5" id="zMzE_uJNI3" role="3ZZHOD">
<node concept="3VJUX4" id="zMzE_uJNI3" role="3ZZHOD">
<node concept="3clFbS" id="zMzE_uJNI4" role="2VODD2">
<node concept="3cpWs8" id="zMzE_uJNI5" role="3cqZAp">
<node concept="3cpWsn" id="zMzE_uJNI6" role="3cpWs9">
Expand Down Expand Up @@ -12801,24 +12693,6 @@
</node>
</node>
</node>
<node concept="22mcaB" id="51M$6hf3mdt">
<property role="3GE5qa" value="_deprecated.chunk" />
<ref role="aqKnT" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
<node concept="22hDWj" id="51M$6hf3mdu" role="22hAXT" />
<node concept="2VfDsV" id="51M$6hf3mdv" role="3ft7WO" />
</node>
<node concept="22mcaB" id="51M$6hf3mdE">
<property role="3GE5qa" value="_deprecated.chunk" />
<ref role="aqKnT" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
<node concept="22hDWj" id="51M$6hf3mdF" role="22hAXT" />
<node concept="2VfDsV" id="51M$6hf3mdG" role="3ft7WO" />
</node>
<node concept="22mcaB" id="51M$6hf3mdR">
<property role="3GE5qa" value="_deprecated.chunk" />
<ref role="aqKnT" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
<node concept="22hDWj" id="51M$6hf3mdS" role="22hAXT" />
<node concept="2VfDsV" id="51M$6hf3mdT" role="3ft7WO" />
</node>
<node concept="22mcaB" id="367j$Y_CgaN">
<ref role="aqKnT" to="s6b7:30ECcbtES_0" resolve="AbstractFeatureConfiguration_old" />
<node concept="22hDWj" id="367j$Y_CgaO" role="22hAXT" />
Expand Down
Loading