Skip to content

Commit

Permalink
Merge pull request #812 from JetBrains/merge/mps20213
Browse files Browse the repository at this point in the history
Merge maintenance/mps20213 into maintenance/mps20222
  • Loading branch information
alexanderpann authored Mar 28, 2024
2 parents 01636e2 + d5e7c12 commit 065a0b7
Show file tree
Hide file tree
Showing 24 changed files with 105 additions and 121 deletions.
24 changes: 1 addition & 23 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented

- de.slisson.mps.richtext: Various small issues were fixed (e.g. NullPointerExceptions, usability problems).
- de.slisson.mps.editor.multiline: Selections are now correctly painted.
- com.mbeddr.mpsutil.editor.querylist: return null in the query shows the empty cell again (regression).

### Changed

Expand Down Expand Up @@ -54,45 +55,23 @@ The project does _not_ follow Semantic Versioning and the changes are documented

- com.mbeddr.mpsutil.modellisteners: The newly supported interface listeners are now backward compatible and doesn't require regenerating the listener aspects anymore.

### Changed

- de.itemis.editor.diagram: The ELK dependencies were updated to the latest version.
- de.itemis.mps.debug: The editor debug expressions were moved to a new plugin to avoid introducing a dependency to the MPS console in the celllayout language.

## December 2023

### Fixed

- de.itemis.editor.diagram: Further improvements to make the auto-layouter more stable.
- de.itemis.editor.diagram: Tooltips for edge and vertex buttons work again.
- de.itemis.editor.diagram: The size of diagram cells is now recalculated before layouting the ports to fix some layout issues.
- The size of diagram cells is now recalculated before layouting the ports to fix some layout issues.

### 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*).
- de.slisson.mps.richtext: The shortcuts are now documented.
- A new action `Copy Cell Reference` is available in the editor menu in `Language Debug` that creates a reference to the current select editor cell. It can be pasted into the MPS console to debug editor cells. It can be activated through ctrl/cmd+alt+c.
- A new action `Copy Editor Component Reference` is available in the editor menu in `Language Debug` that creates a reference to the current editor component. It can be pasted into the MPS console to debug editor cells. To refer to the current opened editor component, use the expression `#currentEditorComponent` in the MPS console.
- de.itemis.mps.editor.pagination: The ability to search was added.

### Fixed

- The performance of the language `de.itemis.mps.linenumbers` was improved.

### Changed

- de.slisson.mps.richtext: The code completion entries of word cells are now clearer and unnecessary entries were removed.
- mpsutil.intentions: Intentions available in read-only cells are not available anymore when the annotation showIntentionInReadyOnlyCell is not added.
- de.itemis.mps.editor.pagination: The UI was cleaned up.

## November 2023

### Fixed

- app.jar from the platform lib folder is not exported to platform_lib_app/app.jar anymore.

### Changed

- mpsutil.modellisteners: listeners on interface concepts are now supported.
Expand All @@ -104,7 +83,6 @@ The project does _not_ follow Semantic Versioning and the changes are documented
- mpsutil.intentions: a new style attribute `intentions-in-read-only-cell` is now available to allow intentions in read-only cells. Single intentions can also be enabled or disabled in those cells through the intention "Toggle Show Intention In Read-Only Cell Annotation".
- com.mbeddr.mpsutil.editor.querylist: Default editor cells now support style attributes.
- de.slisson.mps.tables: tables now support a new property `row UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new row above/below the current row or to delete the current row. These actions only work for simple tables that are based on rows (default: *false*).
- de.itemis.mps.editor.pagination: The page number can now be entered directly.

## October 2023

Expand Down
1 change: 0 additions & 1 deletion code/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<modulePath path="$PROJECT_DIR$/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl" folder="celllayout" />
<modulePath path="$PROJECT_DIR$/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd" folder="celllayout" />
<modulePath path="$PROJECT_DIR$/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd" folder="celllayout" />
<modulePath path="$PROJECT_DIR$/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd" folder="celllayout" />
<modulePath path="$PROJECT_DIR$/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd" folder="celllayout" />
<modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl" folder="conditional-editor" />
<modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl" folder="conditional-editor" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,14 @@
<concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
<child id="848437706375087729" name="descriptionText" index="1djCvC" />
</concept>
<concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
<concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
<concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
<concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
<concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
<concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
<child id="4874944647490523335" name="matchingText" index="1eYxyj" />
<child id="4874944647490523330" name="isApplicable" index="1eYxym" />
<child id="4874944647490524677" name="execute" index="1eYxTh" />
</concept>
<concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
<concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
</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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<model ref="r:a0ad4fb2-84d1-4370-9588-bb53940875f7(test.com.mbeddr.mpsutil.blutil.doc@tests)">
<persistence version="9" />
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
<use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
</languages>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
<language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14523,6 +14523,19 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="3Z_1kA5Z4k6" role="3bR31x">
<node concept="3LXTmp" id="3Z_1kA5Z4k7" role="3rtmxm">
<node concept="398BVA" id="3Z_1kA5Z4k8" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="3Z_1kA5Z4k9" role="iGT6I">
<property role="2Ry0Am" value="statistics" />
</node>
</node>
<node concept="3qWCbU" id="3Z_1kA5Z4kb" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="4bHoaiHvmsq" role="3989C9">
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
<node concept="19Szcq" id="6LUJA7fQCK" role="2Iya4_">
<property role="TrG5h" value="cond" />
<node concept="3uibUv" id="6LUJA7fY7s" role="1tU5fm">
<ref role="3uigEE" node="6LUJA7fXc$" resolve="SerializableRunnable" />
<ref role="3uigEE" node="6LUJA7fXc$" resolve="SerializablePredicate" />
</node>
</node>
<node concept="19Szcq" id="1gBmad3PiPd" role="2Iya4_">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<property role="EcuMT" value="6733065834253110129" />
<property role="TrG5h" value="A" />
<property role="19KtqR" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="5PKDVfNYsHO" role="PzmwI">
<ref role="PrY4T" node="5PKDVfNYsHN" resolve="Interface" />
</node>
Expand All @@ -53,7 +53,7 @@
<property role="EcuMT" value="6733065834253110130" />
<property role="TrG5h" value="B" />
<property role="19KtqR" value="true" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="5PKDVfNYsHQ" role="PzmwI">
<ref role="PrY4T" node="5PKDVfNYsHN" resolve="Interface" />
</node>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
<node concept="3aamgX" id="5PKDVfOkTuY" role="3acgRq">
<ref role="30HIoZ" to="91fu:5PKDVfOkPcZ" resolve="EditorComponentParameterReference" />
<node concept="j$656" id="5PKDVfOkTvc" role="1lVwrX">
<ref role="v9R2y" node="5PKDVfOkTva" resolve="reduce_EditorComponentDeclarationReference" />
<ref role="v9R2y" node="5PKDVfOkTva" resolve="reduce_EditorComponentParameterReference" />
</node>
</node>
<node concept="3aamgX" id="5PKDVfOlWDd" role="3acgRq">
Expand Down Expand Up @@ -1759,7 +1759,7 @@
</node>
<node concept="1P9Npp" id="5PKDVfOaBrN" role="2OqNvi">
<node concept="37vLTw" id="5PKDVfOaClO" role="1P9ThW">
<ref role="3cqZAo" node="5PKDVfOaClK" resolve="replaceWithNewConcept" />
<ref role="3cqZAo" node="5PKDVfOaClK" resolve="newNode" />
</node>
</node>
</node>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@
<node concept="24kQdi" id="5PKDVfOlsvS">
<ref role="1XX52x" to="91fu:5PKDVfOlsvP" resolve="StubCellModel_ComponentWithParameters" />
<node concept="PMmxH" id="5PKDVfOlsvT" role="2wV5jI">
<ref role="PMmxG" to="tpco:37EzmTDC95l" />
<ref role="PMmxG" to="tpco:37EzmTDC95l" resolve="ImplementationRemovedInStubMessage" />
</node>
</node>
<node concept="22mcaB" id="5PKDVfOlsvU">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<property role="EcuMT" value="6733065834259138549" />
<ref role="1TJDcQ" node="5PKDVfOlrE5" resolve="CellModel_ComponentWithParameters" />
<node concept="PrWs8" id="5PKDVfOlsvR" role="PzmwI">
<ref role="PrY4T" to="tpck:8AYOKVCAP5" />
<ref role="PrY4T" to="tpck:8AYOKVCAP5" resolve="IStubForAnotherConcept" />
</node>
</node>
<node concept="1TIwiD" id="1gBmad3Feya">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@
<node concept="2OqwBi" id="5PKDVfOmJSJ" role="33vP2m">
<node concept="2OqwBi" id="5PKDVfOmINl" role="2Oq$k0">
<node concept="1YBJjd" id="5PKDVfOmINm" role="2Oq$k0">
<ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel_ComponentWithParameters" />
<ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel" />
</node>
<node concept="3TrEf2" id="5PKDVfOmJw7" role="2OqNvi">
<ref role="3Tt5mk" to="91fu:fGPMmyn" resolve="editorComponent" />
Expand All @@ -529,7 +529,7 @@
</node>
<node concept="2OqwBi" id="5PKDVfOmLsc" role="33vP2m">
<node concept="1YBJjd" id="5PKDVfOmLsd" role="2Oq$k0">
<ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel_ComponentWithParameters" />
<ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel" />
</node>
<node concept="3Tsc0h" id="5PKDVfOmLse" role="2OqNvi">
<ref role="3TtcxE" to="91fu:5PKDVfOlsvY" resolve="arguments" />
Expand Down Expand Up @@ -820,7 +820,7 @@
<node concept="2bSWHS" id="1gBmad3OmsB" role="2OqNvi" />
</node>
<node concept="37vLTw" id="1gBmad3OrKz" role="3uHU7B">
<ref role="3cqZAo" node="1gBmad3OrKv" resolve="index" />
<ref role="3cqZAo" node="1gBmad3OrKv" resolve="currentIndex" />
</node>
</node>
<node concept="3clFbS" id="1gBmad3OjsO" role="3clFbx">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3239,6 +3239,34 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="3BzrucBh1rd" role="jymVt" />
<node concept="3clFb_" id="3BzrucBhLNi" role="jymVt">
<property role="TrG5h" value="getIdeaProject" />
<node concept="3clFbS" id="3BzrucBhLNl" role="3clF47">
<node concept="3clFbF" id="3BzrucBiHWI" role="3cqZAp">
<node concept="2YIFZM" id="3kITFmIEFID" role="3clFbG">
<ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<node concept="2YIFZM" id="3BzrucBg3Ag" role="37wK5m">
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<ref role="37wK5l" to="alof:~ProjectHelper.getProject(org.jetbrains.mps.openapi.module.SRepository)" resolve="getProject" />
<node concept="2OqwBi" id="3BzrucBgFay" role="37wK5m">
<node concept="1rXfSq" id="3BzrucBg3Ah" role="2Oq$k0">
<ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
</node>
<node concept="liA8E" id="3BzrucBgMq5" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="3BzrucBhnO6" role="1B3o_S" />
<node concept="3uibUv" id="3BzrucBhIoE" role="3clF45">
<ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
</node>
</node>
<node concept="2tJIrI" id="4dus55SGBy2" role="jymVt" />
<node concept="3clFb_" id="6Bd7Vwq_Nhx" role="jymVt">
<property role="TrG5h" value="getPalette" />
Expand All @@ -3253,22 +3281,8 @@
<node concept="3uibUv" id="6Bd7VwqA68x" role="1tU5fm">
<ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
</node>
<node concept="2YIFZM" id="6Bd7VwqA68y" role="33vP2m">
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
<node concept="2OqwBi" id="6Bd7VwqA68z" role="37wK5m">
<node concept="liA8E" id="6Bd7VwqA68_" role="2OqNvi">
<ref role="37wK5l" to="w1kc:~IOperationContext.getProject()" resolve="getProject" />
</node>
<node concept="2OqwBi" id="2WtZELtyqRN" role="2Oq$k0">
<node concept="1rXfSq" id="2WtZELtyqRO" role="2Oq$k0">
<ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
</node>
<node concept="liA8E" id="2WtZELtyqRP" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext()" resolve="getOperationContext" />
</node>
</node>
</node>
<node concept="1rXfSq" id="3BzrucBjlKl" role="33vP2m">
<ref role="37wK5l" node="3BzrucBhLNi" resolve="getIdeaProject" />
</node>
</node>
</node>
Expand Down Expand Up @@ -4839,22 +4853,8 @@
<node concept="3uibUv" id="3kITFmIEFIC" role="1tU5fm">
<ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
</node>
<node concept="2YIFZM" id="3kITFmIEFID" role="33vP2m">
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
<node concept="2OqwBi" id="2WtZELtylOw" role="37wK5m">
<node concept="2OqwBi" id="2WtZELtya0I" role="2Oq$k0">
<node concept="1rXfSq" id="2WtZELty8_x" role="2Oq$k0">
<ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
</node>
<node concept="liA8E" id="2WtZELtylIL" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext()" resolve="getOperationContext" />
</node>
</node>
<node concept="liA8E" id="2WtZELtynhD" role="2OqNvi">
<ref role="37wK5l" to="w1kc:~IOperationContext.getProject()" resolve="getProject" />
</node>
</node>
<node concept="1rXfSq" id="3BzrucBi$Ur" role="33vP2m">
<ref role="37wK5l" node="3BzrucBhLNi" resolve="getIdeaProject" />
</node>
</node>
</node>
Expand Down Expand Up @@ -4897,7 +4897,7 @@
<ref role="3cqZAo" node="2mf5oprdgmL" resolve="LOG" />
</node>
<node concept="liA8E" id="5mRiQvlulG3" role="2OqNvi">
<ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object)" resolve="warn" />
<ref role="37wK5l" to="q7tw:~Category.debug(java.lang.Object)" resolve="debug" />
<node concept="Xl_RD" id="5mRiQvlulG4" role="37wK5m">
<property role="Xl_RC" value="Diagram palette not found in the project" />
</node>
Expand Down
Loading

0 comments on commit 065a0b7

Please sign in to comment.