Skip to content

mpsqa.arch: small improvements #277

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
merged 3 commits into from
Jan 21, 2025
Merged

mpsqa.arch: small improvements #277

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
cff873b
mpsqa.arch: collapse cells by default
Jan 20, 2025
905e135
mpsqa.arch: create a new interface ICommentable
Jan 20, 2025
32d92a2
mpsqa.arch: add support for commenting single component dependencies
Jan 20, 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
118 changes: 64 additions & 54 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
</concept>
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
<property id="1160590353935" name="usesFolding" index="S$Qs1" />
<property id="6240706158490734113" name="collapseByDefault" index="3EXrWe" />
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
<child id="7723470090030138869" name="foldedCellModel" index="AHCbl" />
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
Expand Down Expand Up @@ -708,6 +709,9 @@
</node>
</node>
<node concept="3EZMnI" id="Te1zv$_m_4" role="6VMZX">
<node concept="PMmxH" id="5gfdDUfSb_n" role="3EZMnx">
<ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
</node>
<node concept="3F0ifn" id="Te1zv$_pgh" role="3EZMnx">
<property role="3F0ifm" value="// module/model/node-lock: does not allow other modules/models/nodes as dependency besides those saved in the whitelist" />
<node concept="VechU" id="Te1zv$Huvl" role="3F10Kt">
Expand Down Expand Up @@ -757,69 +761,74 @@
<node concept="24kQdi" id="6MUZd5Uj9wF">
<ref role="1XX52x" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
<node concept="3EZMnI" id="6MUZd5Uj9wH" role="2wV5jI">
<property role="S$Qs1" value="true" />
<node concept="PMmxH" id="2p0G1uTtm2z" role="3EZMnx">
<ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
</node>
<node concept="3EZMnI" id="6MUZd5Uj9wO" role="3EZMnx">
<node concept="VPM3Z" id="6MUZd5Uj9wQ" role="3F10Kt" />
<node concept="3F0ifn" id="6MUZd5Uj9wY" role="3EZMnx">
<property role="3F0ifm" value="component definition:" />
</node>
<node concept="3F0A7n" id="6MUZd5Uj9x4" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
<node concept="3F0ifn" id="6MUZd5Uj9xc" role="3EZMnx">
<property role="3F0ifm" value="{" />
</node>
<node concept="2iRfu4" id="6MUZd5Uj9wT" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="6MUZd5Uj9xy" role="3EZMnx">
<node concept="VPM3Z" id="6MUZd5Uj9x$" role="3F10Kt" />
<node concept="3XFhqQ" id="6MUZd5Uj9xN" role="3EZMnx" />
<node concept="3F2HdR" id="6MUZd5Uj9xW" role="3EZMnx">
<ref role="1NtTu8" to="ryx8:6MUZd5Uj9xT" resolve="content" />
<node concept="2iRkQZ" id="6MUZd5Uj9xZ" role="2czzBx" />
<node concept="VPM3Z" id="6MUZd5Uj9y0" role="3F10Kt" />
<node concept="4$FPG" id="fm3v0WWnFf" role="4_6I_">
<node concept="3clFbS" id="fm3v0WWnFg" role="2VODD2">
<node concept="3clFbF" id="fm3v0WWnFh" role="3cqZAp">
<node concept="2ShNRf" id="fm3v0WWnFi" role="3clFbG">
<node concept="3zrR0B" id="fm3v0WWnFj" role="2ShVmc">
<node concept="3Tqbb2" id="fm3v0WWnFk" role="3zrR0E">
<ref role="ehGHo" to="ryx8:fm3v0WWntE" resolve="EmptyLine" />
<node concept="3EZMnI" id="5gfdDUfJ$A2" role="3EZMnx">
<property role="S$Qs1" value="true" />
<property role="3EXrWe" value="true" />
<node concept="2iRkQZ" id="5gfdDUfJ$A3" role="2iSdaV" />
<node concept="3EZMnI" id="6MUZd5Uj9wO" role="3EZMnx">
<node concept="VPM3Z" id="6MUZd5Uj9wQ" role="3F10Kt" />
<node concept="3F0ifn" id="6MUZd5Uj9wY" role="3EZMnx">
<property role="3F0ifm" value="component definition:" />
</node>
<node concept="3F0A7n" id="6MUZd5Uj9x4" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
<node concept="3F0ifn" id="6MUZd5Uj9xc" role="3EZMnx">
<property role="3F0ifm" value="{" />
</node>
<node concept="2iRfu4" id="6MUZd5Uj9wT" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="6MUZd5Uj9xy" role="3EZMnx">
<node concept="VPM3Z" id="6MUZd5Uj9x$" role="3F10Kt" />
<node concept="3XFhqQ" id="6MUZd5Uj9xN" role="3EZMnx" />
<node concept="3F2HdR" id="6MUZd5Uj9xW" role="3EZMnx">
<ref role="1NtTu8" to="ryx8:6MUZd5Uj9xT" resolve="content" />
<node concept="2iRkQZ" id="6MUZd5Uj9xZ" role="2czzBx" />
<node concept="VPM3Z" id="6MUZd5Uj9y0" role="3F10Kt" />
<node concept="4$FPG" id="fm3v0WWnFf" role="4_6I_">
<node concept="3clFbS" id="fm3v0WWnFg" role="2VODD2">
<node concept="3clFbF" id="fm3v0WWnFh" role="3cqZAp">
<node concept="2ShNRf" id="fm3v0WWnFi" role="3clFbG">
<node concept="3zrR0B" id="fm3v0WWnFj" role="2ShVmc">
<node concept="3Tqbb2" id="fm3v0WWnFk" role="3zrR0E">
<ref role="ehGHo" to="ryx8:fm3v0WWntE" resolve="EmptyLine" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2iRfu4" id="6MUZd5Uj9xB" role="2iSdaV" />
</node>
<node concept="2iRfu4" id="6MUZd5Uj9xB" role="2iSdaV" />
</node>
<node concept="3F0ifn" id="6MUZd5Uj9xp" role="3EZMnx">
<property role="3F0ifm" value="}" />
</node>
<node concept="2iRkQZ" id="6MUZd5Uj9wK" role="2iSdaV" />
<node concept="3EZMnI" id="fm3v0WWu31" role="AHCbl">
<node concept="VPM3Z" id="fm3v0WWu32" role="3F10Kt" />
<node concept="3F0ifn" id="fm3v0WWu33" role="3EZMnx">
<property role="3F0ifm" value="component" />
</node>
<node concept="3F0A7n" id="fm3v0WWu34" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
<node concept="3F0ifn" id="fm3v0WWu35" role="3EZMnx">
<property role="3F0ifm" value="{" />
</node>
<node concept="3F0ifn" id="fm3v0WWu3s" role="3EZMnx">
<property role="3F0ifm" value="..." />
</node>
<node concept="3F0ifn" id="fm3v0WWu3L" role="3EZMnx">
<node concept="3F0ifn" id="6MUZd5Uj9xp" role="3EZMnx">
<property role="3F0ifm" value="}" />
</node>
<node concept="2iRfu4" id="fm3v0WWu36" role="2iSdaV" />
<node concept="3F0ifn" id="5gfdDUfJ$A1" role="3EZMnx" />
<node concept="3EZMnI" id="fm3v0WWu31" role="AHCbl">
<node concept="VPM3Z" id="fm3v0WWu32" role="3F10Kt" />
<node concept="3F0ifn" id="fm3v0WWu33" role="3EZMnx">
<property role="3F0ifm" value="component" />
</node>
<node concept="3F0A7n" id="fm3v0WWu34" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
<node concept="3F0ifn" id="fm3v0WWu35" role="3EZMnx">
<property role="3F0ifm" value="{" />
</node>
<node concept="3F0ifn" id="fm3v0WWu3s" role="3EZMnx">
<property role="3F0ifm" value="..." />
</node>
<node concept="3F0ifn" id="fm3v0WWu3L" role="3EZMnx">
<property role="3F0ifm" value="}" />
</node>
<node concept="2iRfu4" id="fm3v0WWu36" role="2iSdaV" />
</node>
</node>
<node concept="2iRkQZ" id="6MUZd5Uj9wK" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="SYt8UYwnix" role="6VMZX">
<node concept="2iRkQZ" id="SYt8UYwniy" role="2iSdaV" />
Expand Down Expand Up @@ -987,6 +996,7 @@
<ref role="1XX52x" to="ryx8:6MUZd5Uje4h" resolve="ModuleComponent" />
<node concept="3EZMnI" id="1tkdAPw1fXU" role="2wV5jI">
<property role="S$Qs1" value="true" />
<property role="3EXrWe" value="true" />
<node concept="2iRkQZ" id="1tkdAPw1fXV" role="2iSdaV" />
<node concept="PMmxH" id="2p0G1uTtlzF" role="3EZMnx">
<ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
Expand Down Expand Up @@ -1543,7 +1553,7 @@
</node>
<node concept="PKFIW" id="2p0G1uTtlry">
<property role="TrG5h" value="CommentEditorComponent" />
<ref role="1XX52x" to="ryx8:6MUZd5UjGNW" resolve="IComponentLike" />
<ref role="1XX52x" to="ryx8:5gfdDUfN3cO" resolve="ICommentable" />
<node concept="3EZMnI" id="2p0G1uTtk0V" role="2wV5jI">
<node concept="VPM3Z" id="2p0G1uTtk0X" role="3F10Kt" />
<node concept="3F0ifn" id="2p0G1uTtk0Z" role="3EZMnx">
Expand All @@ -1561,7 +1571,7 @@
<node concept="2OqwBi" id="2p0G1uTu2n9" role="2Oq$k0">
<node concept="pncrf" id="2p0G1uTu298" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTu2$6" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="3Tsc0h" id="2p0G1uTullj" role="2OqNvi">
Expand Down Expand Up @@ -1644,7 +1654,7 @@
</node>
</node>
<node concept="3F1sOY" id="2p0G1uTtk4N" role="3EZMnx">
<ref role="1NtTu8" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="1NtTu8" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
<node concept="3F0ifn" id="2p0G1uTtk50" role="3EZMnx">
<property role="3F0ifm" value=";" />
Expand All @@ -1657,7 +1667,7 @@
<node concept="2OqwBi" id="2p0G1uTtklO" role="2Oq$k0">
<node concept="pncrf" id="2p0G1uTtk5x" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTtkCc" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="3x8VRR" id="2p0G1uTtlco" role="2OqNvi" />
Expand Down
12 changes: 6 additions & 6 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
</node>
<node concept="2S6QgY" id="2p0G1uTtfVz">
<property role="TrG5h" value="toggleComment" />
<ref role="2ZfgGC" to="ryx8:6MUZd5UjGNW" resolve="IComponentLike" />
<ref role="2ZfgGC" to="ryx8:5gfdDUfN3cO" resolve="ICommentable" />
<node concept="2S6ZIM" id="2p0G1uTtfV$" role="2ZfVej">
<node concept="3clFbS" id="2p0G1uTtfV_" role="2VODD2">
<node concept="3cpWs8" id="2p0G1uTtg71" role="3cqZAp">
Expand All @@ -473,7 +473,7 @@
<node concept="2OqwBi" id="2p0G1uTtgpW" role="2Oq$k0">
<node concept="2Sf5sV" id="2p0G1uTtgb1" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTtg_v" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="3x8VRR" id="2p0G1uTth7t" role="2OqNvi" />
Expand All @@ -500,7 +500,7 @@
<node concept="2OqwBi" id="2p0G1uTtihh" role="2Oq$k0">
<node concept="2Sf5sV" id="2p0G1uTti6O" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTtisM" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="3x8VRR" id="2p0G1uTtiWc" role="2OqNvi" />
Expand All @@ -511,7 +511,7 @@
<node concept="2OqwBi" id="2p0G1uTtiWY" role="2Oq$k0">
<node concept="2Sf5sV" id="2p0G1uTtiWJ" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTtiY5" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="3YRAZt" id="2p0G1uTtj4a" role="2OqNvi" />
Expand All @@ -525,7 +525,7 @@
<node concept="2OqwBi" id="2p0G1uTtj5M" role="2Oq$k0">
<node concept="2Sf5sV" id="2p0G1uTtj5z" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTtjim" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="zfrQC" id="2p0G1uTtjLt" role="2OqNvi" />
Expand All @@ -537,7 +537,7 @@
<node concept="2OqwBi" id="2p0G1uTtOTZ" role="2Oq$k0">
<node concept="2Sf5sV" id="2p0G1uTtOKN" role="2Oq$k0" />
<node concept="3TrEf2" id="2p0G1uTtP54" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
<ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
</node>
</node>
<node concept="3Tsc0h" id="2p0G1uTtPxB" role="2OqNvi">
Expand Down
Loading
Loading