From 9a3b8d9e20edaa53674244c17a6a079232c3a186 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 13 Mar 2024 10:28:03 +0100 Subject: [PATCH 01/18] richtext: only provide insert actions for IWords --- .../de/slisson/mps/richtext/runtime.mps | 160 +++++++++++++++--- 1 file changed, 138 insertions(+), 22 deletions(-) diff --git a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime.mps b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime.mps index 8221db401..53cc4fbc0 100644 --- a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime.mps +++ b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime.mps @@ -6,8 +6,8 @@ - + @@ -20,6 +20,7 @@ + @@ -182,10 +183,14 @@ + + + + @@ -233,6 +238,7 @@ + @@ -390,6 +396,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -398,15 +426,48 @@ - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -584,6 +645,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -592,20 +680,48 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1595ede334b93c0ffd3bc91d58702b4cdcade386 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 15 Mar 2024 19:43:08 +0100 Subject: [PATCH 02/18] Mark MultilineUtil#escapeText and MultilineUtil#unescapeJavaIfAvailable as deprecated --- .../slisson/mps/editor/multiline/runtime.mps | 288 +++--------------- 1 file changed, 49 insertions(+), 239 deletions(-) diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps index 8d5a94762..8905609cd 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps @@ -4,6 +4,7 @@ + @@ -28,6 +29,12 @@ + + + + + + @@ -134,7 +141,25 @@ + + + + + + + + + + + + + + + + + + @@ -462,34 +487,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -500,6 +497,18 @@ + + + + + + + + + + + + @@ -507,217 +516,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -730,6 +528,18 @@ + + + + + + + + + + + + From 00253bc9b2fa64ccb40a85f99dd08050c104118c Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Mar 2024 09:19:25 +0100 Subject: [PATCH 03/18] Fail the build when tests fail --- build.gradle | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/build.gradle b/build.gradle index 909d8af4e..2f5ef842b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ plugins { } import de.itemis.mps.gradle.* +import groovy.xml.XmlSlurper import java.time.LocalDateTime @@ -228,12 +229,42 @@ task build_tests(type: BuildLanguages, dependsOn: build_languages) { script scriptFile('tests/build.xml') } +task failOnTestError() { + description 'evaluate junit result and fail on error' + doLast { + + def juniXml = file('TESTS-TestSuites.xml') + if(juniXml.exists()){ + def junitResult = new XmlSlurper().parse(juniXml) + def failures = junitResult.'**'.findAll { it.name() == 'failure' } + def errors = junitResult.'**'.findAll { it.name() == 'error' } + + if (failures || errors) { + def amount = failures.size() + errors.size() + throw new GradleException(amount + " JUnit tests failed. Check the test report for details.") + } + } + } +} + task run_tests(type: TestLanguages, dependsOn: build_tests) { description "Will execute all tests from command line" script scriptFile('tests/build.xml') targets 'check' + doLast { + ant.taskdef(name: 'junitreport', + classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', + classpath: configurations.junitAnt.asPath) + ant.junitreport { + fileset(dir: "$buildDir", includes: '**/TEST*.xml') + report(format: 'frames', todir: "$buildDir/junitreport") + } + ant.echo("JUnit report placed into $buildDir/junitreport/index.html") + } } +run_tests.configure { finalizedBy failOnTestError } + task install_nativelibs(type: Copy, dependsOn: build_languages) { from "$rootDir/artifacts/de.itemis.mps.extensions/" include "de.itemis.mps.nativelibs.loader/" From 6c0c7cb18453d2de8f7afaa0d152304a9a538b25 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Mar 2024 11:49:08 +0100 Subject: [PATCH 04/18] multiline.cells: paint the last cell of selections --- .../de/slisson/mps/editor/multiline/cells.mps | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps index 020dbe1f4..2bbe40898 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps @@ -15208,19 +15208,14 @@ - - - + + + + + - - - - - - - - - + + From f8380a433ffc011b039bc7242adfd077fcd07114 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Mar 2024 12:02:47 +0100 Subject: [PATCH 05/18] richtext.runtime: Fix deleting when there is only one word --- .../slisson/mps/richtext/runtime/selection.mps | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps index 53539d4e7..d4f148abe 100644 --- a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps +++ b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps @@ -4981,12 +4981,12 @@ - - - + + + @@ -5013,8 +5013,15 @@ - - + + + + + + + + + From 94fb4ff12fd08d933f6de04198ede7f58885c471 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Mar 2024 12:20:58 +0100 Subject: [PATCH 06/18] richtext: improve applicable checks of delete actions --- .../richtext/languageModels/plugin.mps | 257 +++++++++++++----- 1 file changed, 192 insertions(+), 65 deletions(-) diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps index b5d553d64..bf6df50f4 100644 --- a/code/richtext/languages/richtext/languageModels/plugin.mps +++ b/code/richtext/languages/richtext/languageModels/plugin.mps @@ -142,6 +142,9 @@ + + + @@ -206,6 +209,7 @@ + @@ -1344,35 +1348,83 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + @@ -1480,25 +1532,50 @@ - - - - + + + + + - - - - - + + + + + + + - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -1577,25 +1654,50 @@ - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -1635,25 +1737,50 @@ - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + From fd9561e55ffa08cabf06be86cdeb3b669dfc3191 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Mar 2024 12:26:16 +0100 Subject: [PATCH 07/18] richtext: improve applicable checks of selection actions --- .../richtext/languageModels/plugin.mps | 360 +++++++++++++----- 1 file changed, 267 insertions(+), 93 deletions(-) diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps index bf6df50f4..15f326f5f 100644 --- a/code/richtext/languages/richtext/languageModels/plugin.mps +++ b/code/richtext/languages/richtext/languageModels/plugin.mps @@ -131,6 +131,7 @@ + @@ -205,6 +206,7 @@ + @@ -309,32 +311,53 @@ - - - - - - - + + + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -417,12 +440,26 @@ - - - + + + + + + + + + + + + - - + + + + + + + @@ -439,32 +476,53 @@ - - - - - - - + + + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -539,20 +597,34 @@ - - - - + + + + - - - + + + + + + + + + + + + - - + + + + + + + @@ -569,32 +641,53 @@ - - - - - - - + + + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -669,20 +762,34 @@ - - - - + + + + - - - + + + + + + + + + + + + - - + + + + + + + @@ -699,32 +806,53 @@ - - - - - - - + + + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -799,20 +927,34 @@ - - - - + + + + - - - + + + + + + + + + + + + - - + + + + + + + @@ -1922,8 +2064,24 @@ - - + + + + + + + + + + + + + + + + + + @@ -2077,9 +2235,25 @@ - - - + + + + + + + + + + + + + + + + + + + From 7d867244b2aaaa130097f0ad305facc34952abc3 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Mar 2024 14:00:21 +0100 Subject: [PATCH 08/18] Add tests for the multiline and richtext language --- code/.mps/modules.xml | 6 + .../models/de.itemis.mps.extensions.build.mps | 466 ++- .../de.slisson.mps.editor.multiline.test.mpl | 167 ++ ...ine.test.generator.templates@generator.mps | 206 ++ ....mps.editor.multiline.test.constraints.mps | 142 + ...isson.mps.editor.multiline.test.editor.mps | 204 ++ ...n.mps.editor.multiline.test.intentions.mps | 473 +++ ...on.mps.editor.multiline.test.structure.mps | 106 + ...n.mps.editor.multiline.test.typesystem.mps | 86 + .../demolang/languageModels/editor.mps | 13 + .../demolang/languageModels/structure.mps | 11 + .../multiline/languageModels/constraints.mps | 11 - .../multiline/languageModels/typesystem.mps | 11 - .../languages/multiline/multiline.mpl | 16 - .../de.slisson.mps.editor.multiline.test.mps | 217 ++ .../mps/editor/multiline/runtime/plugin.mps | 1 + ....de.slisson.mps.editor.multiline@tests.mps | 1977 +++++++++++++ .../test.de.slisson.mps.editor.multiline.msd | 57 + .../de.slisson.mps.richtext.test.mpl | 170 ++ ...ext.test.generator.templates@generator.mps | 206 ++ .../de.slisson.mps.richtext.test.behavior.mps | 12 + ....slisson.mps.richtext.test.constraints.mps | 132 + .../de.slisson.mps.richtext.test.editor.mps | 202 ++ ...e.slisson.mps.richtext.test.intentions.mps | 476 +++ ...de.slisson.mps.richtext.test.structure.mps | 105 + ...e.slisson.mps.richtext.test.typesystem.mps | 84 + .../richtext/languageModels/plugin.mps | 261 +- .../de.slisson.mps.richtext.test.runtime.msd | 23 + .../de.slisson.mps.richtext.test.runtime.mps | 216 ++ .../test.de.slisson.mps.richtext@tests.mps | 2572 +++++++++++++++++ .../test.de.slisson.mps.richtext.msd | 51 + 31 files changed, 8529 insertions(+), 151 deletions(-) create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/generator/templates/de.slisson.mps.editor.multiline.test.generator.templates@generator.mps create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.constraints.mps create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.editor.mps create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.intentions.mps create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.structure.mps create mode 100644 code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.typesystem.mps delete mode 100644 code/multiline/languages/multiline/languageModels/constraints.mps delete mode 100644 code/multiline/languages/multiline/languageModels/typesystem.mps create mode 100644 code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de.slisson.mps.editor.multiline.test.mps create mode 100644 code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps create mode 100644 code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/generator/templates/de.slisson.mps.richtext.test.generator.templates@generator.mps create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.behavior.mps create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.constraints.mps create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.editor.mps create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.intentions.mps create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.structure.mps create mode 100644 code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.typesystem.mps create mode 100644 code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd create mode 100644 code/richtext/solutions/de.slisson.mps.richtext.test.runtime/models/de.slisson.mps.richtext.test.runtime.mps create mode 100644 code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps create mode 100644 code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index e1e53bec5..bc9601963 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -102,10 +102,12 @@ + + @@ -129,10 +131,13 @@ + + + @@ -191,6 +196,7 @@ + diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 09d5c3e53..24f2e6325 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -1001,6 +1001,9 @@ + + + @@ -1034,21 +1037,11 @@ - - - - - - - - - - @@ -1156,6 +1149,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1646,6 +1765,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13439,11 +13753,6 @@ - - - - - @@ -18598,7 +18907,7 @@ - + @@ -18739,9 +19048,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18857,6 +19225,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl new file mode 100644 index 000000000..a83af8c08 --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime) + fc4584d6-365c-4ceb-b660-b2c91933024d(jetbrains.mps.lang.test#1210261198005) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/generator/templates/de.slisson.mps.editor.multiline.test.generator.templates@generator.mps b/code/multiline/languages/de.slisson.mps.editor.multiline.test/generator/templates/de.slisson.mps.editor.multiline.test.generator.templates@generator.mps new file mode 100644 index 000000000..be2a9de95 --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/generator/templates/de.slisson.mps.editor.multiline.test.generator.templates@generator.mps @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.constraints.mps b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.constraints.mps new file mode 100644 index 000000000..922e8cddb --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.constraints.mps @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.editor.mps b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.editor.mps new file mode 100644 index 000000000..67e0d746e --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.editor.mps @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.intentions.mps b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.intentions.mps new file mode 100644 index 000000000..79f5399d1 --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.intentions.mps @@ -0,0 +1,473 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.structure.mps b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.structure.mps new file mode 100644 index 000000000..4a3400e50 --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.structure.mps @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.typesystem.mps b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.typesystem.mps new file mode 100644 index 000000000..0d29fd2c3 --- /dev/null +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/models/de.slisson.mps.editor.multiline.test.typesystem.mps @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/languages/demolang/languageModels/editor.mps b/code/multiline/languages/demolang/languageModels/editor.mps index 44d3fad43..67f25ffd3 100644 --- a/code/multiline/languages/demolang/languageModels/editor.mps +++ b/code/multiline/languages/demolang/languageModels/editor.mps @@ -19,6 +19,7 @@ + @@ -340,5 +341,17 @@ + + + + + + + + + + + + diff --git a/code/multiline/languages/demolang/languageModels/structure.mps b/code/multiline/languages/demolang/languageModels/structure.mps index 475ff7350..54f4ae067 100644 --- a/code/multiline/languages/demolang/languageModels/structure.mps +++ b/code/multiline/languages/demolang/languageModels/structure.mps @@ -106,5 +106,16 @@ + + + + + + + + + + + diff --git a/code/multiline/languages/multiline/languageModels/constraints.mps b/code/multiline/languages/multiline/languageModels/constraints.mps deleted file mode 100644 index f7dc8d15d..000000000 --- a/code/multiline/languages/multiline/languageModels/constraints.mps +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/code/multiline/languages/multiline/languageModels/typesystem.mps b/code/multiline/languages/multiline/languageModels/typesystem.mps deleted file mode 100644 index 45bf83229..000000000 --- a/code/multiline/languages/multiline/languageModels/typesystem.mps +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/code/multiline/languages/multiline/multiline.mpl b/code/multiline/languages/multiline/multiline.mpl index 78f15440c..028af4ffe 100644 --- a/code/multiline/languages/multiline/multiline.mpl +++ b/code/multiline/languages/multiline/multiline.mpl @@ -106,9 +106,7 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) @@ -120,36 +118,22 @@ - - - - - - - - - - - - - - diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de.slisson.mps.editor.multiline.test.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de.slisson.mps.editor.multiline.test.mps new file mode 100644 index 000000000..09e53c5d3 --- /dev/null +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de.slisson.mps.editor.multiline.test.mps @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime/plugin.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime/plugin.mps index f0cb0da51..aebda11a8 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime/plugin.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime/plugin.mps @@ -10,6 +10,7 @@ + diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps new file mode 100644 index 000000000..9a976d39c --- /dev/null +++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps @@ -0,0 +1,1977 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd new file mode 100644 index 000000000..15ffc23c7 --- /dev/null +++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + 26a9201d-e70b-4755-acd6-40baf7a63b3a(de.slisson.mps.editor.multiline.demolang) + 5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl new file mode 100644 index 000000000..709231fac --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + fc4584d6-365c-4ceb-b660-b2c91933024d(jetbrains.mps.lang.test#1210261198005) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) + 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + e85618c0-260a-4538-97d6-32f6c5e74e74(de.slisson.mps.richtext.test.runtime) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + e85618c0-260a-4538-97d6-32f6c5e74e74(de.slisson.mps.richtext.test.runtime) + + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/generator/templates/de.slisson.mps.richtext.test.generator.templates@generator.mps b/code/richtext/languages/de.slisson.mps.richtext.test/generator/templates/de.slisson.mps.richtext.test.generator.templates@generator.mps new file mode 100644 index 000000000..846c40f94 --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/generator/templates/de.slisson.mps.richtext.test.generator.templates@generator.mps @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.behavior.mps b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.behavior.mps new file mode 100644 index 000000000..9dbce0901 --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.behavior.mps @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.constraints.mps b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.constraints.mps new file mode 100644 index 000000000..dc0fc1bd0 --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.constraints.mps @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.editor.mps b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.editor.mps new file mode 100644 index 000000000..1d6e78460 --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.editor.mps @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.intentions.mps b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.intentions.mps new file mode 100644 index 000000000..a299f8d4f --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.intentions.mps @@ -0,0 +1,476 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.structure.mps b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.structure.mps new file mode 100644 index 000000000..91e00e74f --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.structure.mps @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.typesystem.mps b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.typesystem.mps new file mode 100644 index 000000000..f57bb0569 --- /dev/null +++ b/code/richtext/languages/de.slisson.mps.richtext.test/models/de.slisson.mps.richtext.test.typesystem.mps @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps index 15f326f5f..e97156728 100644 --- a/code/richtext/languages/richtext/languageModels/plugin.mps +++ b/code/richtext/languages/richtext/languageModels/plugin.mps @@ -35,6 +35,7 @@ + @@ -246,6 +247,12 @@ + + + + + + @@ -257,6 +264,7 @@ + @@ -1936,18 +1944,18 @@ - - + + - + - - + + - - - + + + @@ -1955,101 +1963,134 @@ - - - - - - + + + + - - - + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + - + + + + + + + + + + + + + + - - - + + - + - + - - - - - - - - - + + + - + - - - + + + - + + + + + + + - - - - - - + + + + + + - + - + - - + + @@ -2112,55 +2153,83 @@ - - - - - - + + + + + + + + + + + + + + + - + - - - - - + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + + - - + + + + + - + + + + + + + + + + + + + + + + @@ -2186,13 +2255,13 @@ - - + + - + diff --git a/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd b/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd new file mode 100644 index 000000000..a35ace823 --- /dev/null +++ b/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/models/de.slisson.mps.richtext.test.runtime.mps b/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/models/de.slisson.mps.richtext.test.runtime.mps new file mode 100644 index 000000000..debc82552 --- /dev/null +++ b/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/models/de.slisson.mps.richtext.test.runtime.mps @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps b/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps new file mode 100644 index 000000000..8d634da47 --- /dev/null +++ b/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps @@ -0,0 +1,2572 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd b/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd new file mode 100644 index 000000000..0721110ea --- /dev/null +++ b/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + 5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor) + dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) + e85618c0-260a-4538-97d6-32f6c5e74e74(de.slisson.mps.richtext.test.runtime) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b4dc235b36aad2a1e5a508f361c6793f0319f8cc Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 13:48:10 +0100 Subject: [PATCH 09/18] richtext: Simplify the code --- .../richtext/languageModels/editor.mps | 143 ++++-------------- 1 file changed, 32 insertions(+), 111 deletions(-) diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps index da9fc8eb8..f589d10e7 100644 --- a/code/richtext/languages/richtext/languageModels/editor.mps +++ b/code/richtext/languages/richtext/languageModels/editor.mps @@ -6374,26 +6374,37 @@ - - - - - - + + + + + + + + + + - + - + - + + + + + + + + @@ -6405,23 +6416,8 @@ - - - - - - - - - - - - - - - - - + + @@ -6434,23 +6430,8 @@ - - - - - - - - - - - - - - - - - + + @@ -6463,23 +6444,8 @@ - - - - - - - - - - - - - - - - - + + @@ -6492,23 +6458,8 @@ - - - - - - - - - - - - - - - - - + + @@ -6521,23 +6472,8 @@ - - - - - - - - - - - - - - - - - + + @@ -6550,23 +6486,8 @@ - - - - - - - - - - - - - - - - - + + From 43bf2b19170752421c622cbc5393c67572a61504 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 13:48:23 +0100 Subject: [PATCH 10/18] richtext: Remove not working duplicate line action --- .../richtext/languageModels/editor.mps | 153 ---------- .../richtext/languageModels/plugin.mps | 274 ------------------ .../test.de.slisson.mps.richtext@tests.mps | 28 +- docs/extensions/editor/richtext.md | 2 - 4 files changed, 14 insertions(+), 443 deletions(-) diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps index f589d10e7..4aa2f9730 100644 --- a/code/richtext/languages/richtext/languageModels/editor.mps +++ b/code/richtext/languages/richtext/languageModels/editor.mps @@ -6355,159 +6355,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps index e97156728..b15be1604 100644 --- a/code/richtext/languages/richtext/languageModels/plugin.mps +++ b/code/richtext/languages/richtext/languageModels/plugin.mps @@ -51,10 +51,7 @@ - - - @@ -65,7 +62,6 @@ - @@ -93,7 +89,6 @@ - @@ -129,9 +124,6 @@ - - - @@ -219,12 +211,6 @@ - - - - - - @@ -245,7 +231,6 @@ - @@ -260,12 +245,7 @@ - - - - - @@ -1108,253 +1088,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1735,13 +1468,6 @@ - - - - - - - diff --git a/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps b/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps index 8d634da47..104a1c2df 100644 --- a/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps +++ b/code/richtext/solutions/test.de.slisson.mps.richtext/models/test.de.slisson.mps.richtext@tests.mps @@ -2338,20 +2338,6 @@ - - - - - - - - - - - - - - @@ -2373,6 +2359,20 @@ + + + + + + + + + + + + + + diff --git a/docs/extensions/editor/richtext.md b/docs/extensions/editor/richtext.md index bd43c32ec..213703f39 100644 --- a/docs/extensions/editor/richtext.md +++ b/docs/extensions/editor/richtext.md @@ -32,7 +32,6 @@ This languages add additional keyboard shortcuts to the editor: | ++ctrl+del++ | delete text until the end of the word | | ++ctrl+shift+back++ | delete text until the start of the line | | ++ctrl+shift+del++ | delete text until end of the line | -| ++ctrl+d++ | duplicate the current line | | ++shift+left++ | increase selection to the character to the left | | ++shift+right++ | increase selection to the character to the right | | ++alt+shift+left++ | increase selection to the start of the word | @@ -49,7 +48,6 @@ This languages add additional keyboard shortcuts to the editor: | ++cmd+del++ | delete text until the end of the word | | ++cmd+shift+back++ | delete text until the start of the line | | ++cmd+shift+del++ | delete text until end of the line | -| ++cmd+d++ | duplicate the current line | | ++shift+left++ | increase selection to the character to the left | | ++shift+right++ | increase selection to the character to the right | | ++alt+shift+left++ | increase selection to the start of the word | From 34eb74140d1635df01d448512fc294b50b9dfb7d Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 14:21:42 +0100 Subject: [PATCH 11/18] Check if setting the caret position is allowed --- .../de/slisson/mps/editor/multiline/cells.mps | 108 ++++++++--- .../richtext/languageModels/editor.mps | 180 ++++++++++++------ .../richtext/languageModels/plugin.mps | 27 ++- .../mps/richtext/runtime/selection.mps | 74 ++++--- 4 files changed, 272 insertions(+), 117 deletions(-) diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps index 2bbe40898..da3bcdd28 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps @@ -13449,23 +13449,47 @@ - - - - + + + + + + + + + + + - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + @@ -14322,28 +14346,52 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps index 4aa2f9730..248ebcf40 100644 --- a/code/richtext/languages/richtext/languageModels/editor.mps +++ b/code/richtext/languages/richtext/languageModels/editor.mps @@ -5237,28 +5237,52 @@ - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + @@ -5275,18 +5299,8 @@ - - - - - - - - - - - - + + @@ -6630,14 +6644,29 @@ - - - + + + + + + + + + + + + + + + + + + - - - + + + @@ -7449,14 +7478,29 @@ - - - + + + + + + + + + + + + + + + + + + - - - + + + @@ -7686,28 +7730,52 @@ - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps index b15be1604..08c4c7491 100644 --- a/code/richtext/languages/richtext/languageModels/plugin.mps +++ b/code/richtext/languages/richtext/languageModels/plugin.mps @@ -1373,14 +1373,29 @@ - - - + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps index d4f148abe..8aa0df01a 100644 --- a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps +++ b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps @@ -2489,12 +2489,12 @@ - + - + @@ -2503,36 +2503,60 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + From 9dc8b0219b9ffa919986f16ce333888d0a879717 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 14:28:04 +0100 Subject: [PATCH 12/18] richtext: Make Word the default IWord --- .../richtext/languageModels/behavior.mps | 16 +++++++++++++++- .../richtext/languageModels/constraints.mps | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/code/richtext/languages/richtext/languageModels/behavior.mps b/code/richtext/languages/richtext/languageModels/behavior.mps index 53b855cb1..d2bb5364a 100644 --- a/code/richtext/languages/richtext/languageModels/behavior.mps +++ b/code/richtext/languages/richtext/languageModels/behavior.mps @@ -1442,7 +1442,21 @@ - + + + + + + + + + + + + + + + diff --git a/code/richtext/languages/richtext/languageModels/constraints.mps b/code/richtext/languages/richtext/languageModels/constraints.mps index e3d152b82..179f7d22e 100644 --- a/code/richtext/languages/richtext/languageModels/constraints.mps +++ b/code/richtext/languages/richtext/languageModels/constraints.mps @@ -5,7 +5,20 @@ - - + + + + + + + + + + + + + + + From 8d8a23394f6720a5f558d7601f8bcfcd59a6cf5b Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 20:23:00 +0100 Subject: [PATCH 13/18] grammarcells: remove duplicate editor cell models from the cc menu --- .../mbeddr/mpsutil/grammarcells/editor.mps | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps index 46e918777..a83938973 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps @@ -20,9 +20,6 @@ - - - @@ -81,9 +78,6 @@ - - - @@ -2403,26 +2397,6 @@ - - - - - - - - - - - - - - - - - - - - From 0b28b892e89f8e4343619f2bc0252557e8e820f3 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 20:23:41 +0100 Subject: [PATCH 14/18] grammarcells: hide IncludeParentSideTransformations from the cc menu --- .../models/com/mbeddr/mpsutil/grammarcells/editor.mps | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps index a83938973..626ac8449 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps @@ -2532,5 +2532,10 @@ + + + + + From 32d19d2fc32d8e2e80279a2b516bea541259fbd7 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 20:26:44 +0100 Subject: [PATCH 15/18] grammarcells: use a different color for the node substitute cell --- .../models/com/mbeddr/mpsutil/grammarcells/editor.mps | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps index 626ac8449..67251c9ac 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps @@ -1733,9 +1733,7 @@ - - - + From eb7716826114659c4e1df6797c1804b990198d16 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 19 Mar 2024 20:38:18 +0100 Subject: [PATCH 16/18] grammarcells: rename some side transformation cells --- .../generator/template/main@generator.mps | 26 +++++++-------- .../mbeddr/mpsutil/grammarcells/behavior.mps | 12 +++---- .../mpsutil/grammarcells/constraints.mps | 2 +- .../mbeddr/mpsutil/grammarcells/editor.mps | 16 +++++----- .../mbeddr/mpsutil/grammarcells/structure.mps | 32 +++++++++---------- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index 6aa409bfb..d7e5f13ae 100755 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -546,7 +546,7 @@ - + @@ -563,7 +563,7 @@ - + @@ -8064,7 +8064,7 @@ - + @@ -8661,7 +8661,7 @@ - + @@ -8705,11 +8705,11 @@ - + - + @@ -16958,7 +16958,7 @@ - + @@ -17171,7 +17171,7 @@ - + @@ -18489,7 +18489,7 @@ - + @@ -18513,7 +18513,7 @@ - + @@ -26322,7 +26322,7 @@ - + @@ -27157,7 +27157,7 @@ - + @@ -29376,7 +29376,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/behavior.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/behavior.mps index 3c369dff3..996a57bf8 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/behavior.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/behavior.mps @@ -2403,7 +2403,7 @@ - + @@ -2692,7 +2692,7 @@ - + @@ -2745,7 +2745,7 @@ - + @@ -2793,7 +2793,7 @@ - + @@ -2847,7 +2847,7 @@ - + @@ -4545,7 +4545,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/constraints.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/constraints.mps index 1596a0e46..e3f44a3a7 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/constraints.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/constraints.mps @@ -124,7 +124,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps index 67251c9ac..4548e0858 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/editor.mps @@ -1630,7 +1630,7 @@ - + @@ -1678,7 +1678,7 @@ - + @@ -1765,7 +1765,7 @@ - + @@ -1780,7 +1780,7 @@ - + @@ -1855,7 +1855,7 @@ - + @@ -1876,7 +1876,7 @@ - + @@ -2424,7 +2424,7 @@ - + @@ -2438,7 +2438,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/structure.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/structure.mps index 095fa05c5..9267ee206 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/structure.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/structure.mps @@ -587,8 +587,8 @@ - - + + @@ -689,7 +689,7 @@ - + @@ -703,21 +703,21 @@ - + - + - + @@ -731,19 +731,19 @@ - + - + - + @@ -758,8 +758,8 @@ - - + + @@ -779,21 +779,21 @@ - + - + - + @@ -1093,8 +1093,8 @@ - - + + From 2ed3a8cfbc39d57ef81b8e40730ecb4608216920 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 20 Mar 2024 07:25:10 +0100 Subject: [PATCH 17/18] richtext: Enable two-step deleting for constant texts --- .../richtext/languageModels/editor.mps | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps index 248ebcf40..8fdec964a 100644 --- a/code/richtext/languages/richtext/languageModels/editor.mps +++ b/code/richtext/languages/richtext/languageModels/editor.mps @@ -53,6 +53,9 @@ + + + @@ -1862,6 +1865,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 47a620ae27eed14ed0fd8ae09825b42fbe0e1843 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 20 Mar 2024 09:20:09 +0100 Subject: [PATCH 18/18] Update the changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb0ba152b..2b2a3e917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,16 @@ The project does _not_ follow Semantic Versioning and the changes are documented - com.mbeddr.mpsutil.grammarcells: Read-only model accessory cells can now also be used in places where constant cells are supported. +### Fixed + +- de.slisson.mps.richtext: Various small issues were fixed (e.g. NullPointerExceptions, usability problems). +- de.slisson.mps.editor.multiline: Selections are now correctly painted. + +### Changed + +- de.slisson.mps.richtext: Words are automatically insert as the default concept for IWord. +- de.slisson.mps.richtext: The faulty duplicate line action was removed. + ## February 2024 ### Added