Commit bbffa23
Alexander Pann
Merge remote-tracking branch 'origin/maintenance/mps20251' into merge/mps20251
# Conflicts:
# code/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd
# code/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd
# code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl
# code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mpsFile tree
360 files changed
+3471
-3077
lines changed- .github
- workflows
- code
- .mps
- dictionaries
- blutil
- languages
- com.mbeddr.mpsutil.blutil.genutil
- models
- com.mbeddr.mpsutil.blutil
- languageModels
- tests/test.com.mbeddr.mpsutil.blutil.genutil.lang
- models
- build/solutions/de.itemis.mps.extensions.build/models
- celllayout
- languages
- de.itemis.mps.celllayout
- models/styles
- de.itemis.mps.editor.celllayout.sandboxlang
- models
- de.itemis.mps.editor.celllayout
- generator/template
- models
- test.de.itemis.mps.editor.celllayout.lang
- models
- solutions/de.slisson.mps.editor.celllayout.runtime
- models/de/itemis/mps/editor/celllayout
- runtime
- changelog/de.itemis.mps.changelog
- models
- compare
- languages
- de.itemis.mps.compare.pattern.baselang
- models
- de.itemis.mps.compare.pattern.generator
- models
- de.itemis.mps.compare.pattern
- models
- de.itemis.mps.compare
- languageModels
- test.de.itemis.mps.compare.testlang
- models
- solutions
- de.itemis.mps.comparator.diff.tests
- models
- de.itemis.mps.comparator
- conditional-editor
- languages
- de.slisson.mps.conditionalEditor.demolang
- languageModels
- de.slisson.mps.conditionalEditor.hints
- models
- de.slisson.mps.conditionalEditor
- generator/template
- languageModels
- solutions/de.slisson.mps.conditionalEditor.runtime
- models/de/slisson/mps/conditionalEditor/runtime
- debug
- languages/de.itemis.mps.debug
- models
- solutions/de.itemis.mps.debug.runtime/models
- diagram
- languages
- de.itemis.mps.editor.diagram.demo.activity
- languageModels
- de.itemis.mps.editor.diagram.demo.callgraph
- languageModels
- de.itemis.mps.editor.diagram.demo.elk
- models
- de.itemis.mps.editor.diagram.demo.ports
- models
- de.itemis.mps.editor.diagram.demoentities
- languageModels
- de.itemis.mps.editor.diagram.demolang
- languageModels
- de.itemis.mps.editor.diagram.layout
- languageModels
- de.itemis.mps.editor.diagram.styles
- languageModels
- de.itemis.mps.editor.diagram
- generator/template
- languageModels
- test.de.itemis.mps.editor.diagram.lang
- languageModels
- solutions
- de.itemis.mps.editor.diagram.demo.activity.sandbox
- de.itemis.mps.editor.diagram.demo.elk.sandbox
- de.itemis.mps.editor.diagram.demo.ports.sandbox
- de.itemis.mps.editor.diagram.demoentities.sandbox
- de.itemis.mps.editor.diagram.runtime
- models/de/itemis/mps/editor/diagram/runtime
- de.itemis.mps.editor.diagram.sandbox
- de.itemis.mps.editor.diagram.shapes
- test.de.itemis.mps.editor.diagram.solution
- grammarcells
- languages
- com.mbeddr.mpsutil.grammarcells.runtimelang
- models
- com.mbeddr.mpsutil.grammarcells.sandboxlang
- models/com/mbeddr/mpsutil/grammarcells/sandboxlang
- com.mbeddr.mpsutil.grammarcells
- generator/template
- models/com/mbeddr/mpsutil/grammarcells
- solutions/com.mbeddr.mpsutil.grammarcells.runtime
- models/com/mbeddr/mpsutil/grammarcells
- runtime
- hacks
- languages/de.slisson.mps.reflection
- languageModels
- solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks
- hasher/solutions
- nl.f1re.mpsutil.hasher.tests
- nl.f1re.mpsutil.hasher
- htmlcell
- languages
- de.itemis.mps.editor.htmlcell.demolang
- models
- de.itemis.mps.editor.htmlcell
- models
- solutions/de.itemis.mps.editor.htmlcell.runtime
- models
- kotlin/solutions/MPS.Kotlin
- languages
- com.mbeddr.mpsutil.intentions.sandboxlang
- models
- de.itemis.model.merge.baselang
- models
- de.itemis.model.merge.diamond
- models
- de.itemis.model.merge.simple.demo.annotated
- models
- de.itemis.model.merge
- models
- de.itemis.model.simple.demo.children
- models
- de.itemis.model.simple.demo.collection.keeper
- models
- de.itemis.model.simple.demo.collection.ref
- models
- de.itemis.model.simple.demo.collection
- models
- de.itemis.model.simple.demo.enums
- models
- de.itemis.model.simple.demo.property
- models
- de.itemis.model.simple.demo.reference
- models
- langvis
- languages/com.dslfoundry.langvis.demolang
- models
- solutions/com.dslfoundry.langvis.plugin
- linenumbers/de.itemis.mps.linenumbers/models
- math
- languages
- de.itemis.mps.editor.math.demolang
- languageModels
- de.itemis.mps.editor.math.java
- languageModels
- de.itemis.mps.editor.math.notations
- generator/template
- languageModels
- de.itemis.mps.editor.math
- generator/template
- languageModels
- solutions
- de.itemis.mps.editor.math.runtime
- models/de/itemis/mps/editor/math
- de.itemis.mps.editor.math.symbols
- de.itemis.mps.editor.math.tests
- model-api
- org.modelix.model.mpsadapters/models
- org.modelix.model.repositoryconcepts
- models
- modellisteners
- com.mbeddr.mpsutil.modellisteners.runtime
- models/com/mbeddr/mpsutil/modellisteners/runtime
- com.mbeddr.mpsutil.modellisteners.sandboxlang
- languageModels
- com.mbeddr.mpsutil.modellisteners
- languageModels
- modelmerger/languages
- de.itemis.mps.modelmerger
- models
- test.de.itemis.mps.modelmerger.testlanguage
- models
- mouseselection/languages/de.itemis.mps.selection.intentions
- languageModels
- multiline
- languages
- de.slisson.mps.editor.multiline.test
- models
- demolang
- languageModels
- multiline
- languageModels
- solutions/test.de.slisson.mps.editor.multiline
- nodeversioning/languages/de.itemis.mps.nodeversioning
- models
- pagination
- languages
- de.itemis.mps.editor.pagination.demolang
- models
- de.itemis.mps.editor.pagination
- generator/templates
- models
- solutions/de.itemis.mps.editor.pagination.runtime
- models
- plaintextgen/languages
- com.dslfoundry.plaintextflow
- models
- com.dslfoundry.plaintextgen.example.nestedlist
- models
- com.dslfoundry.plaintextgen.example.testlang
- models
- com.dslfoundry.plaintextgen
- models/com/dslfoundry/plaintextgen
- projectview
- com.mbeddr.mpsutil.projectview.demo
- com.mbeddr.mpsutil.projectview.views
- com.mbeddr.mpsutil.projectview
- languageModels
- querylist
- com.mbeddr.mpsutil.editor.querylist.demolang
- languageModels
- com.mbeddr.mpsutil.editor.querylist
- languageModels
- richtext/languages
- de.slisson.mps.richtext.test
- models
- de.slisson.richtext.customcell
- languageModels
- javadoc
- languageModels
- richtext
- languageModels
- models/de/slisson/mps/richtext/runtime
- shadowmodels
- languages
- de.q60.mps.incremental.sandboxlang
- models
- de.q60.mps.incremental
- models
- de.q60.mps.polymorphicfunctions.sandboxlang
- models
- de.q60.mps.polymorphicfunctions
- models
- de.q60.mps.shadowmodels.examples.blext
- models
- de.q60.mps.shadowmodels.examples.editor
- models
- de.q60.mps.shadowmodels.examples.entities
- models
- de.q60.mps.shadowmodels.examples.statemachine
- models
- de.q60.mps.shadowmodels.gen.afterPF
- models
- de.q60.mps.shadowmodels.gen.desugar
- models
- de.q60.mps.shadowmodels.gen.typesystem
- models
- de.q60.mps.shadowmodels.repository
- models
- de.q60.mps.shadowmodels.runtimelang
- models
- de.q60.mps.shadowmodels.target.editor
- models
- de.q60.mps.shadowmodels.target.text
- models
- de.q60.mps.shadowmodels.transformation
- models
- de.q60.mps.shadowmodels.util
- models
- de.q60.mps.virtualinterfaces.sandboxlang
- models
- de.q60.mps.virtualinterfaces
- models
- solutions
- de.q60.mps.polymorphicfunctions.runtime
- models
- de.q60.mps.shadowmodels.runtime/models
- solutions
- com.mbeddr.mpsutil.intentions.tests
- models
- de.itemis.model.merge.simple.demo
- de.itemis.mps.extensions.changelog/models
- spellcheck/languages/de.itemis.mps.spellcheck
- models
- statistics
- models
- structurecheck/languages/de.itemis.mps.structurecheck
- languageModels
- tables/languages
- de.slisson.mps.tables.demolang
- languageModels
- de.slisson.mps.tables
- generator/template
- languageModels
- runtime
- models/de/slisson/mps/tables/runtime
- third-party/solutions/third.party.usage.test/models
- treenotation
- com.mbeddr.mpsutil.treenotation.runtime
- models/com/mbeddr/mpsutil/treenotation
- com.mbeddr.mpsutil.treenotation.sandboxlang
- models
- com.mbeddr.mpsutil.treenotation.styles
- models
- com.mbeddr.mpsutil.treenotation
- generator/template
- models
- utils/solutions/de.itemis.mps.utils.serializer.xml
- widgets
- languages
- de.itemis.mps.editor.bool.demolang
- languageModels
- de.itemis.mps.editor.bool
- languageModels
- de.itemis.mps.editor.collapsible.testlang
- models
- de.itemis.mps.editor.collapsible
- languageModels
- de.itemis.mps.editor.dropdown.demolang
- languageModels
- de.itemis.mps.editor.dropdown
- languageModels
- de.itemis.mps.editor.enumeration.demolang
- models
- de.itemis.mps.editor.enumeration
- models
- nl.f1re.mps.editor.intellij
- models
- nl.f1re.mps.editor.swing.demolang
- models
- nl.f1re.mps.editor.swing
- models
- solutions
- de.itemis.mps.editor.bool.runtime
- models/de/itemis/mps/editor/bool
- nl.f1re.mps.editor.swing.runtime
- nl.f1re.mps.editor.swing.sandbox
- tests/models
- docs
- extensions
- editor
- img
- other
- utils
- gradle
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
360 files changed
+3471
-3077
lines changedThis file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
7 | 13 | | |
8 | 14 | | |
9 | 15 | | |
| |||
14 | 20 | | |
15 | 21 | | |
16 | 22 | | |
| 23 | + | |
17 | 24 | | |
18 | 25 | | |
19 | 26 | | |
| |||
44 | 51 | | |
45 | 52 | | |
46 | 53 | | |
| 54 | + | |
47 | 55 | | |
48 | 56 | | |
49 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
21 | 24 | | |
22 | 25 | | |
23 | 26 | | |
| |||
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
33 | | - | |
| 36 | + | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
171 | | - | |
| 171 | + | |
172 | 172 | | |
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
176 | 176 | | |
177 | 177 | | |
178 | | - | |
| 178 | + | |
179 | 179 | | |
180 | 180 | | |
181 | 181 | | |
| |||
0 commit comments