Merge maintenance/mps20251 into master #1695
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Expensive computations were done in the paint method which are supposed to be done in the relayout method. The computation of the lines and their positions is now done only once after 1 second of inactivity. Usually, the inconsistency is only noticeable for the line number at the end. At least the line numbers are not important enough for the user experience to justify more utilization of the EDT thread, which is already an overused resource. Fixes #1662
perf(linenumbers): they were slowing down the update of the main editor
…2' into merge/mps20241
Merge maintenance/mps20232 into maintenance/mps20241
…/mps20251 # Conflicts: # code/linenumbers/de.itemis.mps.linenumbers/models/de.itemis.mps.linenumbers.plugin.mps
…age nl.f1re.mps.aliascustomization + refactor implementation
Merge maintenance/mps20241 into maintenance/mps20251
mps-ci-buildbot
requested review from
sergej-koscejev and
wsafonov
as code owners
…ation_separate_lanaguage
… point IntentionCustomization
…re/intention_customization # Conflicts: # CHANGELOG.md
It is no longer needed now that build scripts are built using a Gradle task.
…task * Generate changelog with LF line endings (for consistency on CI). * Generate changelog file name in upper case (for consistency on CI). * Add a Gradle task to generate the changelog, include it as a dependency of 'build'.
build: generate and copy the changelog as part of the Gradle 'build' task
Merge maintenance/mps20241 into maintenance/mps20251
# Conflicts: # code/alias-customization/languages/test.nl.f1re.mps.aliascustomization.demolang/models/test.nl.f1re.mps.aliascustomization.demolang.plugin.mps # code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl # code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd # code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/models/de/slisson/mps/conditionalEditor/runtime/plugin.mps # code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd # code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl # code/linenumbers/de.itemis.mps.linenumbers/models/de.itemis.mps.linenumbers.plugin.mps # code/testing/solutions/nl.f1re.testing.runtime/nl.f1re.testing.runtime.msd
alexanderpann
approved these changes
Dec 12, 2025
alexanderpann
force-pushed
the
merge/master
branch
from
a2df6ff to
ff3b208
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from
maintenance/mps20251tomaster.