diff --git a/.github/workflows/PR-into-2022-2.yml b/.github/workflows/PR-into-2022-2.yml
deleted file mode 100644
index ed64c4270..000000000
--- a/.github/workflows/PR-into-2022-2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Merge and PR into 2022.2
-
-run-name: Merge 2021.3 -> 2022.2
-on:
- pull_request_target:
- types:
- - closed
- branches:
- - 'maintenance/mps20213'
-
-jobs:
- merge-and-pr:
- # only trigger if it was actually merged
- if: github.event.pull_request.merged == true
- uses: ./.github/workflows/PR-into-next-version.yml
- with:
- from-version: 2021.3
- from-branch: maintenance/mps20213
- to-version: 2022.2
- to-branch: maintenance/mps20222
diff --git a/.github/workflows/PR-into-next-version.yml b/.github/workflows/PR-into-next-version.yml
index 083682d0c..663913ca5 100644
--- a/.github/workflows/PR-into-next-version.yml
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab1db3df8..6e76360cf 100644
--- a/CHANGELOG.md
+++ b/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.
diff --git a/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd b/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd
index 170eaa830..99eb5f51f 100644
--- a/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd
+++ b/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd
@@ -27,6 +27,7 @@
+
diff --git a/code/linenumbers/de.itemis.mps.linenumbers/models/de.itemis.mps.linenumbers.plugin.mps b/code/linenumbers/de.itemis.mps.linenumbers/models/de.itemis.mps.linenumbers.plugin.mps
index e01395f90..ac8541f69 100644
--- a/code/linenumbers/de.itemis.mps.linenumbers/models/de.itemis.mps.linenumbers.plugin.mps
+++ b/code/linenumbers/de.itemis.mps.linenumbers/models/de.itemis.mps.linenumbers.plugin.mps
@@ -9,6 +9,7 @@
+
@@ -228,6 +229,7 @@
+
@@ -238,6 +240,7 @@
+
@@ -310,6 +313,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -324,14 +339,10 @@
-
-
-
-
-
-
-
+
+
+
@@ -1734,12 +1745,6 @@
-
-
-
-