From 1518db4800a4d343b9db24d9dc61f0ebbbc38d3c Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 14 Nov 2023 14:24:00 +0100 Subject: [PATCH] mpsutil.intentions: add a new style attribute to allow intentions in read-only-cells --- CHANGELOG.md | 4 + .../models/de.itemis.mps.extensions.build.mps | 5 + .../com.mbeddr.mpsutil.intentions.runtime.msd | 5 + .../com/mbeddr/mpsutil/intentions/runtime.mps | 257 ++++++++++++++++-- .../languageModels/editor.mps | 17 ++ ....mbeddr.mpsutil.intentions.sandboxlang.mpl | 4 + ....mpsutil.intentions.sandboxlang.editor.mps | 101 +++++++ ...util.intentions.sandboxlang.intentions.mps | 65 +++++ ...sutil.intentions.sandboxlang.structure.mps | 57 ++++ ...ddr.mpsutil.intentions.sandbox.sandbox.mps | 17 ++ docs/extensions/utils/intentions-menu.md | 3 + 11 files changed, 517 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d82ed4d22..6f8daf0ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented - `@NotNull` annotations in the code are now checked at run time (the `javac2` compiler is used). +### Added + +- mpsutil.intentions: a new style attribute `intentions-in-read-only-cell` is now available to allow intentions in read-only cells. + ## October 2023 ### Added diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 1cfdbba13..c24f02e57 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -12997,6 +12997,11 @@ + + + + + diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd index 7add2c943..2c931f104 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd @@ -16,6 +16,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions) @@ -27,11 +28,13 @@ + + @@ -43,8 +46,10 @@ + + diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps index 813de5367..aa9a1f5e5 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps @@ -4,6 +4,8 @@ + + @@ -38,7 +40,12 @@ - + + + + + + @@ -46,6 +53,11 @@ + + + + + @@ -88,6 +100,7 @@ + @@ -96,6 +109,7 @@ + @@ -547,28 +561,41 @@ - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + @@ -4313,5 +4340,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/editor.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/editor.mps index 9c626ab9c..6ee904d78 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/editor.mps +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/editor.mps @@ -25,9 +25,16 @@ + + + + + + + @@ -60,6 +67,7 @@ + @@ -72,6 +80,7 @@ + @@ -216,5 +225,13 @@ + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl index 1a82e4f32..adf6b9b7b 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl @@ -55,6 +55,9 @@ + + b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions) + @@ -97,6 +100,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.editor.mps b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.editor.mps index 4ca2fcff4..60a3ccc68 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.editor.mps +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.editor.mps @@ -7,22 +7,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30,5 +75,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps index 254e29013..66c9991d7 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps @@ -8,15 +8,25 @@ + + + + + + + + + + @@ -41,12 +51,28 @@ + + + + + + + + + + + + + + + + @@ -183,5 +209,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.structure.mps b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.structure.mps index 77f5388be..c7492d505 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.structure.mps +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.structure.mps @@ -13,10 +13,23 @@ + + + + + + + + + + + + + @@ -32,5 +45,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/models/com.mbeddr.mpsutil.intentions.sandbox.sandbox.mps b/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/models/com.mbeddr.mpsutil.intentions.sandbox.sandbox.mps index 3a3b12eef..e6f2993b0 100644 --- a/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/models/com.mbeddr.mpsutil.intentions.sandbox.sandbox.mps +++ b/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/models/com.mbeddr.mpsutil.intentions.sandbox.sandbox.mps @@ -6,10 +6,27 @@ + + + + + + + + + + + + + + + + + diff --git a/docs/extensions/utils/intentions-menu.md b/docs/extensions/utils/intentions-menu.md index df19f7929..19e25e5f9 100644 --- a/docs/extensions/utils/intentions-menu.md +++ b/docs/extensions/utils/intentions-menu.md @@ -5,4 +5,7 @@ A language that adds support for grouping intentions. Invoke the intention `Toggle Group Annotation` to add it to a group. The intentions will be grouped together if they use the same label in the annotation. +Additionally, it adds support for enabling intentions in read-only cells when the style attribute `intentions-in-read-only-cell` of the stylesheet +`IntentionStyles` is set to true. + ![example: intention group](../img/intention_group_example.png) \ No newline at end of file