Skip to content

Commit

Permalink
Merge pull request #799 from JetBrains/merge/mps20213
Browse files Browse the repository at this point in the history
Merge maintenance/mps20213 into maintenance/mps20222
  • Loading branch information
alexanderpann authored Mar 20, 2024
2 parents eefaa0a + 2f84322 commit 0cb552e
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 312 deletions.
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 @@ -272,12 +273,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
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@
<language id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells">
<concept id="7272510943426055326" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Factory" flags="ig" index="2kS2EP" />
<concept id="7272510943426093121" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_SideTransformActionsBuilderContext" flags="ng" index="2kS8pE" />
<concept id="7272510943425988699" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="2kSiTK">
<concept id="7272510943425988699" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationFromFactoryCell" flags="ng" index="2kSiTK">
<property id="7272510943425988883" name="side" index="2kSiWS" />
<child id="7272510943426097631" name="factory" index="2kS9vO" />
<child id="7272510943425989076" name="wrapped" index="2kSiZZ" />
Expand All @@ -565,7 +565,7 @@
<concept id="745148820870387403" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationHolderProcessor" flags="ng" index="2u$9CG">
<child id="745148820870387404" name="wrappedCell" index="2u$9CF" />
</concept>
<concept id="745148820867185554" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell4" flags="ng" index="2uKrtP">
<concept id="745148820867185554" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationSectionCell" flags="ng" index="2uKrtP">
<property id="745148820908747612" name="description" index="2thAuV" />
<child id="745148820874363426" name="section" index="2vkWV5" />
</concept>
Expand Down Expand Up @@ -8066,7 +8066,7 @@
<node concept="2Rf3mk" id="DnjeumMKrn" role="2OqNvi">
<node concept="1xMEDy" id="DnjeumMKrp" role="1xVPHs">
<node concept="chp4Y" id="DnjeumMKNj" role="ri$Ld">
<ref role="cht4Q" to="teg0:Dnjeuk_JIi" resolve="SideTransformationCell4" />
<ref role="cht4Q" to="teg0:Dnjeuk_JIi" resolve="SideTransformationSectionCell" />
</node>
</node>
<node concept="hTh3S" id="DnjeumNvI7" role="1xVPHs">
Expand Down Expand Up @@ -8663,7 +8663,7 @@
</node>
</node>
<node concept="3aamgX" id="6jH9yJK9Q6n" role="3acgRq">
<ref role="30HIoZ" to="teg0:6jH9yJK30xr" resolve="SideTransformationCell" />
<ref role="30HIoZ" to="teg0:6jH9yJK30xr" resolve="SideTransformationFromFactoryCell" />
<node concept="1Koe21" id="6jH9yJK9Q6o" role="1lVwrX">
<node concept="3F0ifn" id="6jH9yJK9Q6p" role="1Koe22">
<node concept="raruj" id="6jH9yJK9Q6q" role="lGtFl" />
Expand Down Expand Up @@ -8707,11 +8707,11 @@
</node>
</node>
<node concept="3aamgX" id="4eBi5gdoOwJ" role="3acgRq">
<ref role="30HIoZ" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell2" />
<ref role="30HIoZ" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell" />
<node concept="b5Tf3" id="4eBi5gdoPka" role="1lVwrX" />
</node>
<node concept="3aamgX" id="6rhOS_xx3Ax" role="3acgRq">
<ref role="30HIoZ" to="teg0:6rhOS_xv7_i" resolve="SideTransformationCell3" />
<ref role="30HIoZ" to="teg0:6rhOS_xv7_i" resolve="SideTransformationBothSidesCell" />
<node concept="1Koe21" id="6rhOS_xx3Ay" role="1lVwrX">
<node concept="3F0ifn" id="6rhOS_xx3Az" role="1Koe22">
<node concept="raruj" id="6rhOS_xx3A$" role="lGtFl" />
Expand Down Expand Up @@ -16960,7 +16960,7 @@
</node>
<node concept="3aamgX" id="4eBi5gdp21V" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="teg0:6jH9yJK30xr" resolve="SideTransformationCell" />
<ref role="30HIoZ" to="teg0:6jH9yJK30xr" resolve="SideTransformationFromFactoryCell" />
<node concept="1Koe21" id="4eBi5gdp40r" role="1lVwrX">
<node concept="3clFb_" id="4eBi5gdp40s" role="1Koe22">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -17173,7 +17173,7 @@
</node>
<node concept="3aamgX" id="4eBi5gdpjnS" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell2" />
<ref role="30HIoZ" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell" />
<node concept="1Koe21" id="4eBi5gdpjnT" role="1lVwrX">
<node concept="3clFb_" id="4eBi5gdpjnU" role="1Koe22">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -18491,7 +18491,7 @@
<node concept="1ps_xZ" id="1_ZVVXfVZgx" role="1ps_xO">
<property role="TrG5h" value="st" />
<node concept="3Tqbb2" id="4eBi5gdU6j3" role="1ps_xK">
<ref role="ehGHo" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell2" />
<ref role="ehGHo" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell" />
</node>
<node concept="2jfdEK" id="4eBi5gdTZf3" role="1ps_xN">
<node concept="3clFbS" id="4eBi5gdTZf5" role="2VODD2">
Expand All @@ -18515,7 +18515,7 @@
</node>
<node concept="3aamgX" id="6rhOS_xwLRl" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="teg0:6rhOS_xv7_i" resolve="SideTransformationCell3" />
<ref role="30HIoZ" to="teg0:6rhOS_xv7_i" resolve="SideTransformationBothSidesCell" />
<node concept="1Koe21" id="6rhOS_xwLRm" role="1lVwrX">
<node concept="3clFb_" id="6rhOS_xwLRn" role="1Koe22">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -26324,7 +26324,7 @@
<node concept="1N15co" id="4eBi5gdtsjr" role="1s_3oS">
<property role="TrG5h" value="sideTransformationCell" />
<node concept="3Tqbb2" id="4eBi5gdtsjH" role="1N15GL">
<ref role="ehGHo" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell2" />
<ref role="ehGHo" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell" />
</node>
</node>
<node concept="1N15co" id="4eBi5gdtsjR" role="1s_3oS">
Expand Down Expand Up @@ -27159,7 +27159,7 @@
</node>
</node>
<node concept="3aamgX" id="DnjeukFymF" role="3acgRq">
<ref role="30HIoZ" to="teg0:Dnjeuk_JIi" resolve="SideTransformationCell4" />
<ref role="30HIoZ" to="teg0:Dnjeuk_JIi" resolve="SideTransformationSectionCell" />
<node concept="1Koe21" id="DnjeukFymG" role="1lVwrX">
<node concept="9aQIb" id="DnjeukFymH" role="1Koe22">
<node concept="3clFbS" id="DnjeukFymI" role="9aQI4">
Expand Down Expand Up @@ -29378,7 +29378,7 @@
</node>
<node concept="13MO4I" id="DnjeukFysO">
<property role="TrG5h" value="reduce_SideTransformationCell4" />
<ref role="3gUMe" to="teg0:Dnjeuk_JIi" resolve="SideTransformationCell4" />
<ref role="3gUMe" to="teg0:Dnjeuk_JIi" resolve="SideTransformationSectionCell" />
<node concept="312cEu" id="DnjeukFysP" role="13RCb5">
<property role="TrG5h" value="_context_class_" />
<property role="1sVAO0" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2403,7 +2403,7 @@
</node>
<node concept="13h7C7" id="6jH9yJK31zt">
<property role="3GE5qa" value="cells" />
<ref role="13h7C2" to="teg0:6jH9yJK30xr" resolve="SideTransformationCell" />
<ref role="13h7C2" to="teg0:6jH9yJK30xr" resolve="SideTransformationFromFactoryCell" />
<node concept="13i0hz" id="6jH9yJK31zY" role="13h7CS">
<property role="TrG5h" value="isLeftSide" />
<node concept="3Tm1VV" id="6jH9yJK31zZ" role="1B3o_S" />
Expand Down Expand Up @@ -2692,7 +2692,7 @@
</node>
<node concept="13h7C7" id="4eBi5gdn8pY">
<property role="3GE5qa" value="cells" />
<ref role="13h7C2" to="teg0:4eBi5gdn8p_" resolve="SideTransformationCell2_MatchingText" />
<ref role="13h7C2" to="teg0:4eBi5gdn8p_" resolve="SideTransformationCell_MatchingText" />
<node concept="13hLZK" id="4eBi5gdn8pZ" role="13h7CW">
<node concept="3clFbS" id="4eBi5gdn8q0" role="2VODD2" />
</node>
Expand Down Expand Up @@ -2745,7 +2745,7 @@
</node>
<node concept="13h7C7" id="4eBi5gdnkT2">
<property role="3GE5qa" value="cells" />
<ref role="13h7C2" to="teg0:4eBi5gdnkSD" resolve="SideTransformationCell2_IsApplicable" />
<ref role="13h7C2" to="teg0:4eBi5gdnkSD" resolve="SideTransformationCell_IsApplicable" />
<node concept="13hLZK" id="4eBi5gdnkT3" role="13h7CW">
<node concept="3clFbS" id="4eBi5gdnkT4" role="2VODD2" />
</node>
Expand Down Expand Up @@ -2793,7 +2793,7 @@
</node>
<node concept="13h7C7" id="4eBi5gdo2F8">
<property role="3GE5qa" value="cells" />
<ref role="13h7C2" to="teg0:4eBi5gdnlo4" resolve="SideTransformationCell2_Execute" />
<ref role="13h7C2" to="teg0:4eBi5gdnlo4" resolve="SideTransformationCell_Execute" />
<node concept="13hLZK" id="4eBi5gdo2F9" role="13h7CW">
<node concept="3clFbS" id="4eBi5gdo2Fa" role="2VODD2" />
</node>
Expand Down Expand Up @@ -2847,7 +2847,7 @@
</node>
<node concept="13h7C7" id="6rhOS_xv7_V">
<property role="3GE5qa" value="cells" />
<ref role="13h7C2" to="teg0:6rhOS_xv7_i" resolve="SideTransformationCell3" />
<ref role="13h7C2" to="teg0:6rhOS_xv7_i" resolve="SideTransformationBothSidesCell" />
<node concept="13hLZK" id="6rhOS_xv7_W" role="13h7CW">
<node concept="3clFbS" id="6rhOS_xv7_X" role="2VODD2" />
</node>
Expand Down Expand Up @@ -4545,7 +4545,7 @@
</node>
<node concept="13h7C7" id="DnjeukDzVf">
<property role="3GE5qa" value="cells" />
<ref role="13h7C2" to="teg0:Dnjeuk_JIi" resolve="SideTransformationCell4" />
<ref role="13h7C2" to="teg0:Dnjeuk_JIi" resolve="SideTransformationSectionCell" />
<node concept="13hLZK" id="DnjeukDzVg" role="13h7CW">
<node concept="3clFbS" id="DnjeukDzVh" role="2VODD2">
<node concept="3clFbF" id="Dnjeulj4i$" role="3cqZAp">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<node concept="2Xjw5R" id="DnjeuljDt2" role="2OqNvi">
<node concept="1xMEDy" id="DnjeuljDt4" role="1xVPHs">
<node concept="chp4Y" id="DnjeuljDwW" role="ri$Ld">
<ref role="cht4Q" to="teg0:Dnjeuk_JIi" resolve="SideTransformationCell4" />
<ref role="cht4Q" to="teg0:Dnjeuk_JIi" resolve="SideTransformationSectionCell" />
</node>
</node>
<node concept="1xIGOp" id="DnjeuljDB$" role="1xVPHs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
<registry>
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
<concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
<concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
<child id="414384289274416996" name="parts" index="3ft7WO" />
</concept>
<concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
<concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi">
<child id="1078153129734" name="inspectedCellModel" index="6VMZX" />
Expand Down Expand Up @@ -81,9 +78,6 @@
<concept id="1214406466686" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorSelectedStyleClassItem" flags="ln" index="30h1P$" />
<concept id="1220974635399" name="jetbrains.mps.lang.editor.structure.QueryFunction_FontStyle" flags="in" index="17KAyr" />
<concept id="1221062700015" name="jetbrains.mps.lang.editor.structure.QueryFunction_Underlined" flags="in" index="1d0yFN" />
<concept id="414384289274424754" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_AddConcept" flags="ng" index="3ft5Ry">
<reference id="697754674827630451" name="concept" index="4PJHt" />
</concept>
<concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
<child id="1088186146602" name="editorComponent" index="1sWHZn" />
</concept>
Expand Down Expand Up @@ -1636,7 +1630,7 @@
</node>
<node concept="24kQdi" id="6jH9yJK30$K">
<property role="3GE5qa" value="cells" />
<ref role="1XX52x" to="teg0:6jH9yJK30xr" resolve="SideTransformationCell" />
<ref role="1XX52x" to="teg0:6jH9yJK30xr" resolve="SideTransformationFromFactoryCell" />
<node concept="3EZMnI" id="6jH9yJK30_m" role="2wV5jI">
<node concept="2iRfu4" id="6jH9yJK30_p" role="2iSdaV" />
<node concept="3F0ifn" id="6jH9yJK3g8e" role="3EZMnx">
Expand Down Expand Up @@ -1684,7 +1678,7 @@
<node concept="3EZMnI" id="6jH9yJK3gIA" role="6VMZX">
<node concept="2EHx9g" id="6jH9yJK3rcY" role="2iSdaV" />
<node concept="3F0ifn" id="dN43ccfaYG" role="3EZMnx">
<property role="3F0ifm" value="Side transformation cell:" />
<property role="3F0ifm" value="Side transformation (from factory) cell:" />
<ref role="1k5W1q" to="tpc5:hF4yUZ8" resolve="header" />
</node>
<node concept="3EZMnI" id="6jH9yJK3gLR" role="3EZMnx">
Expand Down Expand Up @@ -1739,9 +1733,7 @@
<property role="VOm3f" value="true" />
</node>
<node concept="Veino" id="6jH9yJK5uGU" role="3F10Kt">
<node concept="1iSF2X" id="6jH9yJK5uGV" role="VblUZ">
<property role="1iTho6" value="303db2" />
</node>
<property role="Vb096" value="hGRnIZc/lightBlue" />
</node>
</node>
<node concept="3EZMnI" id="6jH9yJK5uWv" role="6VMZX">
Expand Down Expand Up @@ -1773,7 +1765,7 @@
</node>
<node concept="24kQdi" id="4eBi5gdn8lF">
<property role="3GE5qa" value="cells" />
<ref role="1XX52x" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell2" />
<ref role="1XX52x" to="teg0:4eBi5gdn8jm" resolve="SideTransformationCell" />
<node concept="3F0ifn" id="4eBi5gdn8lH" role="2wV5jI">
<property role="3F0ifm" value="ST" />
<node concept="VPXOz" id="4eBi5gdn8nr" role="3F10Kt">
Expand All @@ -1788,7 +1780,7 @@
<node concept="3EZMnI" id="4eBi5gdnlmA" role="6VMZX">
<node concept="2EHx9g" id="4eBi5gdnEZU" role="2iSdaV" />
<node concept="3F0ifn" id="dN43ccfaXg" role="3EZMnx">
<property role="3F0ifm" value="Side transformation cell 2:" />
<property role="3F0ifm" value="Side transformation cell:" />
<ref role="1k5W1q" to="tpc5:hF4yUZ8" resolve="header" />
</node>
<node concept="3EZMnI" id="4eBi5gdnlmK" role="3EZMnx">
Expand Down Expand Up @@ -1863,7 +1855,7 @@
</node>
<node concept="24kQdi" id="6rhOS_xvraI">
<property role="3GE5qa" value="cells" />
<ref role="1XX52x" to="teg0:6rhOS_xv7_i" resolve="SideTransformationCell3" />
<ref role="1XX52x" to="teg0:6rhOS_xv7_i" resolve="SideTransformationBothSidesCell" />
<node concept="3EZMnI" id="6rhOS_xvraQ" role="2wV5jI">
<node concept="3F0ifn" id="6rhOS_xvraS" role="3EZMnx">
<property role="3F0ifm" value="ST" />
Expand All @@ -1884,7 +1876,7 @@
<node concept="3EZMnI" id="6rhOS_xv$$V" role="6VMZX">
<node concept="2EHx9g" id="6rhOS_xv$$W" role="2iSdaV" />
<node concept="3F0ifn" id="dN43ccfaXP" role="3EZMnx">
<property role="3F0ifm" value="Side transformation cell 3:" />
<property role="3F0ifm" value="Side transformation (both sides) cell:" />
<ref role="1k5W1q" to="tpc5:hF4yUZ8" resolve="header" />
</node>
<node concept="3EZMnI" id="6rhOS_xv$$X" role="3EZMnx">
Expand Down Expand Up @@ -2403,26 +2395,6 @@
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
</node>
</node>
<node concept="3p309x" id="3iPRerNa4AQ">
<property role="3GE5qa" value="cells" />
<property role="TrG5h" value="contributeFlagCell" />
<node concept="2kknPJ" id="3iPRerNa4AS" role="1IG6uw">
<ref role="2ZyFGn" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
</node>
<node concept="3ft5Ry" id="3iPRerNa4AW" role="3ft7WO">
<ref role="4PJHt" to="teg0:6oKG1kMxv_T" resolve="FlagCell" />
</node>
</node>
<node concept="3p309x" id="7Pt6c$zz$Tp">
<property role="3GE5qa" value="cells" />
<property role="TrG5h" value="SplittableCell" />
<node concept="2kknPJ" id="7Pt6c$zz$Tr" role="1IG6uw">
<ref role="2ZyFGn" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
</node>
<node concept="3ft5Ry" id="7Pt6c$zz$Tx" role="3ft7WO">
<ref role="4PJHt" to="teg0:3pFNVizDvwD" resolve="SplittableCell" />
</node>
</node>
<node concept="22mcaB" id="2cvVnUuAoxV">
<ref role="aqKnT" to="teg0:3pFNVizDvwJ" resolve="StubSplittableCell" />
<node concept="22hDWj" id="7q24335a1C7" role="22hAXT" />
Expand Down Expand Up @@ -2452,7 +2424,7 @@
</node>
<node concept="24kQdi" id="Dnjeuk_JIS">
<property role="3GE5qa" value="cells" />
<ref role="1XX52x" to="teg0:Dnjeuk_JIi" resolve="SideTransformationCell4" />
<ref role="1XX52x" to="teg0:Dnjeuk_JIi" resolve="SideTransformationSectionCell" />
<node concept="3F0ifn" id="Dnjeuk_JIU" role="2wV5jI">
<property role="3F0ifm" value="ST" />
<node concept="VPXOz" id="Dnjeuk_JIV" role="3F10Kt">
Expand All @@ -2466,7 +2438,7 @@
</node>
<node concept="3EZMnI" id="Dnjeun4pIE" role="6VMZX">
<node concept="3F0ifn" id="dN43ccfaYw" role="3EZMnx">
<property role="3F0ifm" value="Side transformation cell 4:" />
<property role="3F0ifm" value="Side transformation section cell:" />
<ref role="1k5W1q" to="tpc5:hF4yUZ8" resolve="header" />
</node>
<node concept="3F1sOY" id="Dnjeul18aU" role="3EZMnx">
Expand Down Expand Up @@ -2558,5 +2530,10 @@
<node concept="2iRfu4" id="J6gp_6ycJ4" role="2iSdaV" />
</node>
</node>
<node concept="22mcaB" id="7tM9FxHDijD">
<property role="3GE5qa" value="cells" />
<ref role="aqKnT" to="teg0:6ASs6Ln2N$C" resolve="IncludeParentSideTransformations" />
<node concept="22hDWj" id="7tM9FxHDijE" role="22hAXT" />
</node>
</model>

Loading

0 comments on commit 0cb552e

Please sign in to comment.