Skip to content

Bugfix/creating a feature should be the default in the feature diagram editor #739 #1760

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
dbinkele wants to merge 15 commits into
base: maintenance/mps20241
Choose a base branch
from
Open

Bugfix/creating a feature should be the default in the feature diagram editor #739 #1760

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
588c640
fix bug & add tests (#739)
dbinkele Apr 17, 2026
e5f4aa6
Merge remote-tracking branch 'origin/maintenance/mps20241' into maint…
dbinkele Apr 21, 2026
fe2f8c3
Merge branch 'maintenance/mps20241' into bugfix/Creating-a-Feature-sh…
dbinkele Apr 28, 2026
bf5753f
Merge branch 'maintenance/mps20241' into bugfix/Creating-a-Feature-sh…
dbinkele May 13, 2026
f3e6412
Merge branch 'maintenance/mps20241' into bugfix/Creating-a-Feature-sh…
dbinkele Jun 11, 2026
140ccdb
Fix: Type ':' at Feature to get FeatureModelInclude (#739)
dbinkele Jun 12, 2026
d2722e0
Fix: Type ':' at Feature with Cardinality to get FeatureModelInclude …
dbinkele Jun 12, 2026
9aa2d1d
Refactor common code to method (#739)
dbinkele Jun 12, 2026
9e2584e
Fix Test (#739)
dbinkele Jun 12, 2026
127773e
migrate (#739)
dbinkele Jun 12, 2026
c2d4094
Add Editortest typing cardinality bracket before semicolon (#739)
dbinkele Jun 15, 2026
de5b827
migrate (#739)
dbinkele Jun 15, 2026
7402314
Merge branch 'maintenance/mps20241' into bugfix/Creating-a-Feature-sh…
dbinkele Jun 16, 2026
6d8c4d7
Merge branch 'maintenance/mps20241' into bugfix/Creating-a-Feature-sh…
dbinkele Jun 16, 2026
c133633
Merge branch 'maintenance/mps20241' into bugfix/Creating-a-Feature-sh…
dbinkele Jun 18, 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
6 changes: 3 additions & 3 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 @@ -5499,9 +5499,9 @@
</node>
<node concept="2qgKlT" id="3Kl2xAACBO4" role="2OqNvi">
<ref role="37wK5l" to="zccc:1GMgmu$sb6j" resolve="addSubFeature" />
<node concept="2pJPEk" id="3Kl2xAACBO5" role="37wK5m">
<node concept="2pJPED" id="3Kl2xAACBO6" role="2pJPEn">
<ref role="2pJxaS" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
<node concept="2pJPEk" id="1Foaw9JOanl" role="37wK5m">
<node concept="2pJPED" id="1Foaw9JOanm" role="2pJPEn">
<ref role="2pJxaS" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
</node>
</node>
</node>
Expand Down
85 changes: 85 additions & 0 deletions ...ty.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
<concept id="1228934484974" name="jetbrains.mps.lang.test.structure.PressKeyStatement" flags="nn" index="yd1bK">
<child id="1228934507814" name="keyStrokes" index="yd6KS" />
</concept>
<concept id="7011073693661765739" name="jetbrains.mps.lang.test.structure.InvokeActionStatement" flags="nn" index="2HxZob">
<child id="1101347953350127927" name="actionReference" index="3iKnsn" />
</concept>
Expand Down Expand Up @@ -56,6 +59,12 @@
<child id="8933192351751916178" name="parameter" index="1v$tAf" />
</concept>
</language>
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
<concept id="1207318242772" name="jetbrains.mps.lang.plugin.structure.KeyMapKeystroke" flags="ng" index="pLAjd">
<property id="1207318242773" name="modifiers" index="pLAjc" />
<property id="1207318242774" name="keycode" index="pLAjf" />
</concept>
</language>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
Expand Down Expand Up @@ -1552,5 +1561,81 @@
</node>
</node>
</node>
<node concept="LiM7Y" id="1Foaw9K5pxN">
<property role="TrG5h" value="NewChildIsFeature" />
<node concept="1qefOq" id="1Foaw9K5pxO" role="25YQCW">
<node concept="12iwZl" id="1Foaw9K5pxQ" role="1qenE9">
<property role="bVyBI" value="-1971802247" />
<node concept="12iwV3" id="1Foaw9K5pxR" role="12iwV8">
<property role="TrG5h" value="M" />
<node concept="LIFWc" id="1Foaw9K5pxY" role="lGtFl">
<property role="LIFWa" value="0" />
<property role="OXtK3" value="true" />
<property role="p6zMq" value="0" />
<property role="p6zMs" value="0" />
<property role="LIFWd" value="property_name" />
</node>
</node>
</node>
</node>
<node concept="1qefOq" id="1Foaw9K5pxT" role="25YQFr">
<node concept="12iwZl" id="1Foaw9K5pxV" role="1qenE9">
<property role="bVyBI" value="1836408938" />
<node concept="12iwV3" id="1Foaw9K5pxW" role="12iwV8">
<property role="TrG5h" value="M" />
<node concept="12iwV3" id="1Foaw9K5pxX" role="12iwVe" />
</node>
</node>
</node>
<node concept="3clFbS" id="1Foaw9K5qM4" role="LjaKd">
<node concept="yd1bK" id="1Foaw9K5qM2" role="3cqZAp">
<node concept="pLAjd" id="1Foaw9K5qM3" role="yd6KS">
<property role="pLAjc" value="ctrl" />
<property role="pLAjf" value="VK_ENTER" />
</node>
</node>
</node>
</node>
<node concept="LiM7Y" id="1Foaw9Kmv$D">
<property role="TrG5h" value="NewSiblingIsFeature" />
<node concept="1qefOq" id="1Foaw9Kmv$E" role="25YQCW">
<node concept="12iwZl" id="1Foaw9Kmv$G" role="1qenE9">
<property role="bVyBI" value="-400666486" />
<node concept="12iwV3" id="1Foaw9Kmv$H" role="12iwV8">
<property role="TrG5h" value="M" />
<node concept="12iwV3" id="1Foaw9Kmv$N" role="12iwVe">
<property role="TrG5h" value="A" />
<node concept="LIFWc" id="1Foaw9Ko8Ur" role="lGtFl">
<property role="ZRATv" value="true" />
<property role="OXtK3" value="true" />
<property role="p6zMq" value="1" />
<property role="p6zMs" value="1" />
<property role="LIFWd" value="property_name" />
</node>
</node>
</node>
</node>
</node>
<node concept="1qefOq" id="1Foaw9Kmv$J" role="25YQFr">
<node concept="12iwZl" id="1Foaw9Kmv$L" role="1qenE9">
<property role="bVyBI" value="112496978" />
<node concept="12iwV3" id="1Foaw9Kmv$M" role="12iwV8">
<property role="TrG5h" value="M" />
<node concept="12iwV3" id="1Foaw9Kmv$O" role="12iwVe">
<property role="TrG5h" value="A" />
</node>
<node concept="12iwV3" id="1Foaw9Kmv$P" role="12iwVe" />
</node>
</node>
</node>
<node concept="3clFbS" id="1Foaw9KmvEL" role="LjaKd">
<node concept="yd1bK" id="1Foaw9KmvEJ" role="3cqZAp">
<node concept="pLAjd" id="1Foaw9KoIiX" role="yd6KS">
<property role="pLAjf" value="VK_ENTER" />
<property role="pLAjc" value="ctrl+shift" />
</node>
</node>
</node>
</node>
</model>