Merge pull request #734 from JetBrains/merge/mps20213

Merge maintenance/mps20213 into maintenance/mps20222

.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

CHANGELOG.md

@@ -23,6 +23,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - 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.

code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd

@@ -27,6 +27,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />