Merge pull request #735 from JetBrains/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223

.github/workflows/PR-into-next-version.yml

@@ -1,69 +1,10 @@
-name: Merge and PR into next version
+name: PR to merge into the next version
 
 on:
-  workflow_call:
-    inputs:
-      from-branch:
-        required: true
-        type: string
-        description: source branch name, e.g. 'maintenance/mps20213'
-      from-version:
-        required: true
-        type: string
-        description: source version (human-readable), e.g. '2021.3'
-      to-branch:
-        required: true
-        type: string
-        description: destination branch name, e.g. 'maintenance/mps20222'
-      to-version:
-        required: true
-        type: string
-        description: destination version (human-readable), e.g. '2022.2'
+  push:
+    branches:
+      - 'maintenance/mps*'
 
 jobs:
-  merge-and-pr:
-    # only trigger if it was actually merged
-    if: github.event.pull_request.merged == true
-
-    runs-on: ubuntu-latest
-    steps:
-      # checkout the target branch
-      # Only fetch 100 commits, assuming that if the difference between branches is more than 100 commits then they
-      # probably won't be automergeable anyway.
-      - name: Checkout ${{ inputs.to-version }}
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.to-branch }}
-          fetch-depth: 100
-
-      # actually merge from the previous branch
-      - name: Perform merge from ${{ inputs.from-version }} to ${{ inputs.to-version }}
-        run: |
-          # setup to allow to merge and commit
-          git config user.name 'github-actions[bot]'
-          git config user.email 'github-actions[bot]@users.noreply.github.com'
-          
-          git fetch origin ${{ inputs.from-branch }} --depth=100
-
-          # actual merge operation
-          git merge --no-ff --message "Merge ${{ inputs.from-branch }}" origin/${{ inputs.from-branch }} -- || ( echo "Merge failed. Please merge manually!" ; exit 1 )
-
-      # actually merge from the previous branch
-      - name: Prepare environment variables for PR
-        run: |
-          NEW_TITLE='${{ github.event.pull_request.title }}'
-          NEW_TITLE="${NEW_TITLE% (* -> ${{ inputs.from-version }})} (${{ inputs.from-version }} -> ${{ inputs.to-version }})"
-
-          echo "NEW_TITLE=$NEW_TITLE" >> $GITHUB_ENV
-
-      # create a PR based on the merge
-      - name: Create PR for ${{ inputs.to-version }}
-        uses: peter-evans/create-pull-request@v5
-        with:
-          branch: 'merge/${{ inputs.to-branch }}'
-          commit-message: Merge ${{ inputs.from-branch }}
-          title: ${{ env.NEW_TITLE }}
-          body: |
-            This is an automatic PR which merges changes from `${{ inputs.from-branch }}` to `${{ inputs.to-branch }}`
-            
-            [Link to previous PR for `${{ inputs.from-branch }}`](${{ github.event.pull_request._links.html.href }})
+  create-pr:
+    uses: specificlanguages/cascading-merge/.github/workflows/workflow.yml@v1

.gitignore

@@ -26,3 +26,6 @@ scripts/.mps-caches
 
 # Generated during the build
 /kotlin-js-store/
+
+# Generated by statistics plugin
+code/dependencies.txt

CHANGELOG.md

@@ -7,26 +7,44 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ## 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 size of diagram cells is now recalculated before layouting the ports to fix some layout issues.
+- 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.
 - `@NotNull` annotations in the code are now checked at run time (the `javac2` compiler is used).
 - de.itemis.editor.diagram: Edge labels can now be annotated with the attribute editors of the edges. Previously they were floating in the diagram as external boxes. A new flag "use annotations from parent in label" is used to customize the behavior.
 
-### Fixed
-
-- app.jar from the platform lib folder is not exported to platform_lib_app/app.jar anymore.
-
 ### Added
 
 - 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".

build.gradle

@@ -401,4 +401,4 @@ githubRelease {
 
 tasks.named('githubRelease').configure {
     dependsOn packageExtensions
-}
+}

code/.mps/modules.xml

@@ -177,6 +177,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.simple.demo/de.itemis.model.merge.simple.demo.msd" folder="modelmerger2" />
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd" folder="modelmerger2" />
       <modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd" folder="modelmerger2" />
+      <modulePath path="$PROJECT_DIR$/statistics/de.itemis.mps.statistics.mpl" folder="statistics" />
       <modulePath path="$PROJECT_DIR$/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl" folder="structurecheck" />
       <modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd" folder="structurecheck" />
       <modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd" folder="structurecheck" />