Skip to content

Commit

Permalink
Merge pull request #723 from JetBrains/bugfix/intentions_readonly_cel…
Browse files Browse the repository at this point in the history 
…ls_20213
  • Loading branch information
@alexanderpann
alexanderpann authored Dec 18, 2023
2 parents cc0a6c1 + 4e98379 commit ab6a5c0
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 33 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ All notable changes to this project are documented in this file.
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## Dezember 2023
## December 2023

### Added

- A new language `de.itemis.mps.statistics` was added that adds a new menu `MPS Statistics` to the `Tools` menu. The containing action writes a file `dependencies.txt` to the root folder. It contains all the used dependencies of the current project.
- de.slisson.mps.tables: tables now support a new property `column UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new column above/below the current column or to delete the current column. These actions only work for simple tables that are based on rows (default: *false*).

### Changed

- mpsutil.intentions: Intentions available in read-only cells are not available anymore when the annotation showIntentionInReadyOnlyCell is not added.

## November 2023

### Changed
Expand Down
38 changes: 10 additions & 28 deletions ...nu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
</concept>
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
<concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
<reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
</concept>
Expand Down Expand Up @@ -2485,37 +2484,20 @@
</node>
</node>
</node>
<node concept="1eOMI4" id="frLjuvZr4F" role="3uHU7w">
<node concept="22lmx$" id="frLjuvY9S1" role="1eOMHV">
<node concept="2OqwBi" id="frLjuvY9S2" role="3uHU7B">
<node concept="2OqwBi" id="frLjuvY9S3" role="2Oq$k0">
<node concept="37vLTw" id="frLjuvY9S4" role="2Oq$k0">
<ref role="3cqZAo" node="frLjuvY9RE" resolve="intentionDeclaration" />
</node>
<node concept="3CFZ6_" id="frLjuvY9S5" role="2OqNvi">
<node concept="3CFYIy" id="frLjuvY9S6" role="3CFYIz">
<ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
</node>
</node>
</node>
<node concept="3w_OXm" id="frLjuvY9S7" role="2OqNvi" />
<node concept="2OqwBi" id="frLjuvY9S8" role="3uHU7w">
<node concept="2OqwBi" id="frLjuvY9S9" role="2Oq$k0">
<node concept="37vLTw" id="frLjuvY9Sa" role="2Oq$k0">
<ref role="3cqZAo" node="frLjuvY9RE" resolve="intentionDeclaration" />
</node>
<node concept="2OqwBi" id="frLjuvY9S8" role="3uHU7w">
<node concept="2OqwBi" id="frLjuvY9S9" role="2Oq$k0">
<node concept="37vLTw" id="frLjuvY9Sa" role="2Oq$k0">
<ref role="3cqZAo" node="frLjuvY9RE" resolve="intentionDeclaration" />
</node>
<node concept="3CFZ6_" id="frLjuvY9Sb" role="2OqNvi">
<node concept="3CFYIy" id="frLjuvY9Sc" role="3CFYIz">
<ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
</node>
</node>
</node>
<node concept="3TrcHB" id="frLjuvY9Sd" role="2OqNvi">
<ref role="3TsBF5" to="tegv:frLjuvPGIB" resolve="flag" />
<node concept="3CFZ6_" id="frLjuvY9Sb" role="2OqNvi">
<node concept="3CFYIy" id="frLjuvY9Sc" role="3CFYIz">
<ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
</node>
</node>
</node>
<node concept="3TrcHB" id="frLjuvY9Sd" role="2OqNvi">
<ref role="3TsBF5" to="tegv:frLjuvPGIB" resolve="flag" />
</node>
</node>
</node>
</node>
Expand Down
63 changes: 61 additions & 2 deletions code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,66 @@
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />
<registry />
<imports>
<import index="tegv" ref="r:b91d2412-f094-4e55-8db6-3c782d7edc40(com.mbeddr.mpsutil.intentions.structure)" implicit="true" />
</imports>
<registry>
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
<concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
<reference id="1225194240799" name="concept" index="13h7C2" />
<child id="1225194240801" name="constructor" index="13h7CW" />
</concept>
<concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
<concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
</language>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
<child id="1137022507850" name="body" index="2VODD2" />
</concept>
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
<property id="1068580123138" name="value" index="3clFbU" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
<reference id="1138056395725" name="property" index="3TsBF5" />
</concept>
</language>
</registry>
<node concept="13h7C7" id="54O0Dxcsiiz">
<ref role="13h7C2" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
<node concept="13hLZK" id="54O0Dxcsii$" role="13h7CW">
<node concept="3clFbS" id="54O0Dxcsii_" role="2VODD2">
<node concept="3clFbF" id="54O0DxcsiiJ" role="3cqZAp">
<node concept="37vLTI" id="54O0DxcsiMQ" role="3clFbG">
<node concept="3clFbT" id="54O0DxcsiR7" role="37vLTx">
<property role="3clFbU" value="true" />
</node>
<node concept="2OqwBi" id="54O0DxcsirP" role="37vLTJ">
<node concept="13iPFW" id="54O0DxcsiiI" role="2Oq$k0" />
<node concept="3TrcHB" id="54O0Dxcsitk" role="2OqNvi">
<ref role="3TsBF5" to="tegv:frLjuvPGIB" resolve="flag" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

48 changes: 46 additions & 2 deletions ...il.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
</concept>
</language>
<language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
<concept id="278032644708909557" name="com.mbeddr.mpsutil.intentions.structure.ShowIntentionInReadyOnlyCell" flags="ng" index="2s3oj2" />
<concept id="278032644708909557" name="com.mbeddr.mpsutil.intentions.structure.ShowIntentionInReadyOnlyCell" flags="ng" index="2s3oj2">
<property id="278032644708944807" name="flag" index="2s3gUg" />
</concept>
<concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.IntentionGroupAnnotation" flags="ng" index="1SWQZ3">
<property id="5846558918537400330" name="label" index="1SWRpm" />
</concept>
Expand Down Expand Up @@ -287,7 +289,49 @@
</node>
</node>
</node>
<node concept="2s3oj2" id="frLjuw0Btu" role="lGtFl" />
<node concept="2s3oj2" id="frLjuw0Btu" role="lGtFl">
<property role="2s3gUg" value="true" />
</node>
</node>
<node concept="2S6QgY" id="54O0Dxcsaou">
<property role="TrG5h" value="ChildIntentionNeverVisibleInReadyOnly" />
<ref role="2ZfgGC" to="iikq:5qf1oe_GcsF" resolve="IChild" />
<node concept="2S6ZIM" id="54O0Dxcsaov" role="2ZfVej">
<node concept="3clFbS" id="54O0Dxcsaow" role="2VODD2">
<node concept="3clFbF" id="54O0Dxcsaox" role="3cqZAp">
<node concept="Xl_RD" id="54O0Dxcsaoy" role="3clFbG">
<property role="Xl_RC" value="Not Visible At All In Read-Only Cells" />
</node>
</node>
</node>
</node>
<node concept="2Sbjvc" id="54O0Dxcsaoz" role="2ZfgGD">
<node concept="3clFbS" id="54O0Dxcsao$" role="2VODD2">
<node concept="3clFbF" id="54O0Dxcsao_" role="3cqZAp">
<node concept="37vLTI" id="54O0DxcsaoA" role="3clFbG">
<node concept="Xl_RD" id="54O0DxcsaoB" role="37vLTx">
<property role="Xl_RC" value="Changed" />
</node>
<node concept="2OqwBi" id="54O0DxcsaoC" role="37vLTJ">
<node concept="2OqwBi" id="54O0DxcsaoD" role="2Oq$k0">
<node concept="2Sf5sV" id="54O0DxcsaoE" role="2Oq$k0" />
<node concept="2Xjw5R" id="54O0DxcsaoF" role="2OqNvi">
<node concept="1xMEDy" id="54O0DxcsaoG" role="1xVPHs">
<node concept="chp4Y" id="54O0DxcsaoH" role="ri$Ld">
<ref role="cht4Q" to="iikq:5qf1oe_GcsA" resolve="Root" />
</node>
</node>
</node>
</node>
<node concept="3TrcHB" id="54O0DxcsaoI" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2s3oj2" id="54O0DxcsaoJ" role="lGtFl" />
</node>
</model>

0 comments on commit ab6a5c0

Please sign in to comment.