Skip to content

Commit

Permalink
Merge pull request #804 from JetBrains/merge/mps20222
Browse files Browse the repository at this point in the history
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
alexanderpann authored Mar 21, 2024
2 parents c3393a5 + c88318d commit da696e2
Show file tree
Hide file tree
Showing 46 changed files with 9,622 additions and 1,286 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ The project does _not_ follow Semantic Versioning and the changes are documented
- de.slisson.mps.conditionalEditor: Support for editor components with parameters was added.
- 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
Expand Down
31 changes: 31 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
}

import de.itemis.mps.gradle.*
import groovy.xml.XmlSlurper

import java.time.LocalDateTime

Expand Down Expand Up @@ -287,12 +288,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/"
Expand Down
6 changes: 6 additions & 0 deletions code/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,12 @@
<modulePath path="$PROJECT_DIR$/modelmerger/solutions/tests.de.itemis.mps.modelmerger/tests.de.itemis.mps.modelmerger.msd" folder="modelmerger" />
<modulePath path="$PROJECT_DIR$/mouseselection/languages/de.itemis.mps.selection.intentions/de.itemis.mps.selection.intentions.mpl" folder="mouseselection" />
<modulePath path="$PROJECT_DIR$/mouseselection/solutions/de.itemis.mps.selection.runtime/de.itemis.mps.selection.runtime.msd" folder="mouseselection" />
<modulePath path="$PROJECT_DIR$/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl" folder="multiline" />
<modulePath path="$PROJECT_DIR$/multiline/languages/demolang/demolang.mpl" folder="multiline" />
<modulePath path="$PROJECT_DIR$/multiline/languages/multiline/multiline.mpl" folder="multiline" />
<modulePath path="$PROJECT_DIR$/multiline/solutions/de.slisson.mps.editor.multiline.runtime/runtime.msd" folder="multiline" />
<modulePath path="$PROJECT_DIR$/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/de.slisson.mps.editor.multiline.sandbox.msd" folder="multiline" />
<modulePath path="$PROJECT_DIR$/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd" folder="multiline" />
<modulePath path="$PROJECT_DIR$/nodeversioning/languages/de.itemis.mps.nodeversioning/de.itemis.mps.nodeversioning.mpl" folder="nodeversioning" />
<modulePath path="$PROJECT_DIR$/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd" folder="nodeversioning" />
<modulePath path="$PROJECT_DIR$/nodeversioning/tests/de.itemis.mps.nodeversioning.test/de.itemis.mps.nodeversioning.test.msd" folder="nodeversioning" />
Expand All @@ -129,10 +131,13 @@
<modulePath path="$PROJECT_DIR$/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd" folder="querylist" />
<modulePath path="$PROJECT_DIR$/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd" folder="querylist" />
<modulePath path="$PROJECT_DIR$/querylist/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.mpl" folder="querylist" />
<modulePath path="$PROJECT_DIR$/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl" folder="richtext" />
<modulePath path="$PROJECT_DIR$/richtext/languages/de.slisson.richtext.customcell/de.slisson.richtext.customcell.mpl" folder="richtext" />
<modulePath path="$PROJECT_DIR$/richtext/languages/javadoc/javadoc.mpl" folder="richtext" />
<modulePath path="$PROJECT_DIR$/richtext/languages/richtext/richtext.mpl" folder="richtext" />
<modulePath path="$PROJECT_DIR$/richtext/solutions/de.slisson.mps.richtext.sandbox/de.slisson.mps.richtext.sandbox.msd" folder="richtext" />
<modulePath path="$PROJECT_DIR$/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd" folder="richtext" />
<modulePath path="$PROJECT_DIR$/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd" folder="richtext" />
<modulePath path="$PROJECT_DIR$/shadowmodels/de.q60.mps.explorer.impl/de.q60.mps.explorer.impl.msd" folder="shadowmodels.explorer" />
<modulePath path="$PROJECT_DIR$/shadowmodels/de.q60.mps.explorer/de.q60.mps.explorer.msd" folder="shadowmodels.explorer" />
<modulePath path="$PROJECT_DIR$/shadowmodels/de.q60.mps.util/de.q60.mps.util.msd" folder="shadowmodels" />
Expand Down Expand Up @@ -191,6 +196,7 @@
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/testing/languages/de.itemis.mps.testing/de.itemis.mps.testing.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd" folder="3rd-party" />
<modulePath path="$PROJECT_DIR$/third-party/solutions/third.party.usage.test/third.party.usage.test.msd" folder="" />
<modulePath path="$PROJECT_DIR$/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd" folder="tooltips" />
Expand Down
Loading

0 comments on commit da696e2

Please sign in to comment.