Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/maintenance/mps20222' into featu…
Browse files Browse the repository at this point in the history 
…re/diagram_box_edge_label_options

# Conflicts:
#	code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
#	code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
  • Loading branch information
@alexanderpann
alexanderpann committed Jul 15, 2024
2 parents 4679c0d + c330052 commit 805389a
Show file tree
Hide file tree
Showing 41 changed files with 3,035 additions and 1,697 deletions.
44 changes: 13 additions & 31 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id 'de.itemis.mps.gradle.common' version '1.24.0.+'
id 'de.itemis.mps.gradle.common' version '1.28.0.+'
id "com.github.breadmoirai.github-release" version "2.4.1"
id 'maven-publish'
id 'base'
id 'de.itemis.mps.gradle.launcher' version '2.3.0.+'
}

import de.itemis.mps.gradle.*
import de.itemis.mps.gradle.tasks.MpsMigrate
import de.itemis.mps.gradle.tasks.Remigrate
import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
import groovy.xml.XmlSlurper

Expand Down Expand Up @@ -528,12 +528,12 @@ def usedPluginRoots = [
new File(mpsHomeDir, 'plugins/mps-tooltips'),
new File(mpsHomeDir, 'plugins/mps-vcs'),
new File(mpsHomeDir, 'plugins/mps-git4idea'),
new File(mpsHomeDir, 'plugins/mps-httpsupport'),
]

tasks.register('migrate', MpsMigrate) {
dependsOn(resolveMps, 'downloadJbr', 'build_languages', 'build_tests')
javaExecutable = layout.file(
tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable })
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }

haltOnPrecheckFailure = true
haltOnDependencyError = true
Expand All @@ -547,37 +547,19 @@ tasks.register('migrate', MpsMigrate) {
maxHeapSize = '4G'
}


tasks.register('rerunMigrations', JavaExec) {
tasks.register('remigrate', Remigrate) {
mustRunAfter('migrate')
mustRunAfter('build_languages', 'build_tests')

dependsOn(resolveMps, 'downloadJbr')
mpsBackendLauncher.builder()
.withMpsHome(mpsHomeDir)
.withJavaExecutable(tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable.path })
.configure(it)

classpath(fileTree(mpsHomeDir) {
include("lib/**/*.jar")
})
classpath(configurations.rerunMigrationsBackend)
mainClass = 'de.itemis.mps.gradle.migrate.MainKt'

args("--project=${file('code')}")

// rerun-migrations needs its own jar added as a plugin
argumentProviders.add(new CommandLineArgumentProvider() {
@Override
Iterable<String> asArguments() {
def config = configurations.rerunMigrationsBackend

["--plugin=de.itemis.mps.buildbackends.rerun-migrations::" +
configurations.rerunMigrationsBackend.files(config.dependencies.first()).first()]
}
})

args(usedPluginRoots.collect { "--plugin-root=$it".toString() })
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }

mpsHome = mpsHomeDir
projectDirectories.from('code')
pluginRoots.from(usedPluginRoots)
maxHeapSize = '4G'

maxHeapSize = "4G"
// diagram migration from version 0 is currently not rerunnable, although it claims to be
excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
}
11 changes: 5 additions & 6 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2802,6 +2802,11 @@
<ref role="1E1Vl2" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="1be6WiHh6Cn" role="3bR37C">
<node concept="3bR9La" id="1be6WiHh6Co" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
</node>
</node>
</node>
<node concept="1E1JtD" id="6oSQRDqps34" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -5807,12 +5812,6 @@
<ref role="3bR37D" to="ffeo:7YI57w6K0iE" resolve="jetbrains.mps.lang.editor#1129914002149" />
</node>
</node>
<node concept="1SiIV0" id="6OfpnAhj8QS" role="3bR37C">
<node concept="3bR9La" id="6OfpnAhj8QT" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
</node>
</node>
</node>
<node concept="3rtmxn" id="3xFG3bj5Mmn" role="3bR31x">
<node concept="3LXTmp" id="3xFG3bj5Mmo" role="3rtmxm">
Expand Down
102 changes: 102 additions & 0 deletions code/celllayout/languages/de.itemis.mps.editor.celllayout/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
<child id="1137022507850" name="body" index="2VODD2" />
</concept>
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
<child id="1068580123133" name="returnType" index="3clF45" />
<child id="1068580123135" name="body" index="3clF47" />
Expand Down Expand Up @@ -973,5 +977,103 @@
<node concept="3clFbS" id="6W5Xfjf4TxR" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="1be6WiH906Y">
<ref role="13h7C2" to="pvux:3ATi8gIrB$_" resolve="TopDownLayoutCell" />
<node concept="13hLZK" id="1be6WiH906Z" role="13h7CW">
<node concept="3clFbS" id="1be6WiH9070" role="2VODD2" />
</node>
<node concept="13i0hz" id="1be6WiH90dg" role="13h7CS">
<property role="TrG5h" value="getOpeningText" />
<ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
<node concept="3Tm1VV" id="1be6WiH90dh" role="1B3o_S" />
<node concept="3clFbS" id="1be6WiH90dm" role="3clF47">
<node concept="3clFbF" id="1be6WiH90fG" role="3cqZAp">
<node concept="Xl_RD" id="1be6WiH90fF" role="3clFbG">
<property role="Xl_RC" value="[" />
</node>
</node>
</node>
<node concept="17QB3L" id="1be6WiH90dn" role="3clF45" />
</node>
<node concept="13i0hz" id="1be6WiH9tG4" role="13h7CS">
<property role="TrG5h" value="getClosingText" />
<ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
<node concept="3Tm1VV" id="1be6WiH9tG5" role="1B3o_S" />
<node concept="3clFbS" id="1be6WiH9tGa" role="3clF47">
<node concept="3clFbF" id="1be6WiH9tIA" role="3cqZAp">
<node concept="Xl_RD" id="1be6WiH9tI_" role="3clFbG">
<property role="Xl_RC" value="]" />
</node>
</node>
</node>
<node concept="17QB3L" id="1be6WiH9tGb" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="1be6WiHa7Kr">
<property role="3GE5qa" value="lines" />
<ref role="13h7C2" to="pvux:43ViAfTrykj" resolve="HorizontalLineCell" />
<node concept="13hLZK" id="1be6WiHa7Ks" role="13h7CW">
<node concept="3clFbS" id="1be6WiHa7Kt" role="2VODD2" />
</node>
<node concept="13i0hz" id="1be6WiHa7QH" role="13h7CS">
<property role="TrG5h" value="getOpeningText" />
<ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
<node concept="3Tm1VV" id="1be6WiHa7QI" role="1B3o_S" />
<node concept="3clFbS" id="1be6WiHa7QN" role="3clF47">
<node concept="3clFbF" id="1be6WiHa7Z7" role="3cqZAp">
<node concept="Xl_RD" id="1be6WiHa7Z6" role="3clFbG">
<property role="Xl_RC" value="[" />
</node>
</node>
</node>
<node concept="17QB3L" id="1be6WiHa7QO" role="3clF45" />
</node>
<node concept="13i0hz" id="1be6WiHa85D" role="13h7CS">
<property role="TrG5h" value="getClosingText" />
<ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
<node concept="3Tm1VV" id="1be6WiHa85E" role="1B3o_S" />
<node concept="3clFbS" id="1be6WiHa85J" role="3clF47">
<node concept="3clFbF" id="1be6WiHa88z" role="3cqZAp">
<node concept="Xl_RD" id="1be6WiHa88y" role="3clFbG">
<property role="Xl_RC" value="]" />
</node>
</node>
</node>
<node concept="17QB3L" id="1be6WiHa85K" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="1be6WiHa8rp">
<property role="3GE5qa" value="lines" />
<ref role="13h7C2" to="pvux:7d0q5VH9fgO" resolve="VerticalLineCell" />
<node concept="13hLZK" id="1be6WiHa8rq" role="13h7CW">
<node concept="3clFbS" id="1be6WiHa8rr" role="2VODD2" />
</node>
<node concept="13i0hz" id="1be6WiHa8xF" role="13h7CS">
<property role="TrG5h" value="getOpeningText" />
<ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
<node concept="3Tm1VV" id="1be6WiHa8xG" role="1B3o_S" />
<node concept="3clFbS" id="1be6WiHa8xL" role="3clF47">
<node concept="3clFbF" id="1be6WiHa8Ev" role="3cqZAp">
<node concept="Xl_RD" id="1be6WiHa8Eu" role="3clFbG">
<property role="Xl_RC" value="[" />
</node>
</node>
</node>
<node concept="17QB3L" id="1be6WiHa8xM" role="3clF45" />
</node>
<node concept="13i0hz" id="1be6WiHa8Iz" role="13h7CS">
<property role="TrG5h" value="getClosingText" />
<ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
<node concept="3Tm1VV" id="1be6WiHa8I$" role="1B3o_S" />
<node concept="3clFbS" id="1be6WiHa8ID" role="3clF47">
<node concept="3clFbF" id="1be6WiHa8Lt" role="3cqZAp">
<node concept="Xl_RD" id="1be6WiHa8Ls" role="3clFbG">
<property role="Xl_RC" value="]" />
</node>
</node>
</node>
<node concept="17QB3L" id="1be6WiHa8IE" role="3clF45" />
</node>
</node>
</model>

72 changes: 53 additions & 19 deletions code/celllayout/languages/de.itemis.mps.editor.celllayout/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,9 @@
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
</concept>
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
<property id="1186403713874" name="color" index="Vb096" />
</concept>
<concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2">
<property id="1186403771423" name="style" index="Vbekb" />
</concept>
<concept id="1186404574412" name="jetbrains.mps.lang.editor.structure.BackgroundColorStyleClassItem" flags="ln" index="Veino" />
<concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
<property id="1186414551515" name="flag" index="VOm3f" />
</concept>
Expand Down Expand Up @@ -87,6 +83,7 @@
<child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
</concept>
<concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
<concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
<concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
<reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
</concept>
Expand Down Expand Up @@ -228,12 +225,6 @@
<node concept="24kQdi" id="43ViAfTtdtz">
<property role="3GE5qa" value="lines" />
<ref role="1XX52x" to="pvux:43ViAfTrykj" resolve="HorizontalLineCell" />
<node concept="PMmxH" id="43ViAfTtdt_" role="2wV5jI">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<node concept="VPXOz" id="1a5cdpmuifs" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3EZMnI" id="fIxj85y" role="6VMZX">
<node concept="PMmxH" id="hF4Bju4" role="3EZMnx">
<ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
Expand Down Expand Up @@ -261,6 +252,22 @@
</node>
<node concept="2iRkQZ" id="i2IxuMq" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="1be6WiHa4m$" role="2wV5jI">
<ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
<node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
<ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
<ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
</node>
<node concept="3F0ifn" id="1be6WiHa4mA" role="3EZMnx">
<property role="3F0ifm" value="horizontal-line" />
<node concept="Vb9p2" id="1be6WiHa4mB" role="3F10Kt" />
</node>
<node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
<ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
<ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
</node>
<node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
</node>
</node>
<node concept="24kQdi" id="43ViAfTtxbJ">
<ref role="1XX52x" to="pvux:43ViAfTtx6N" resolve="StringStyle" />
Expand Down Expand Up @@ -645,9 +652,6 @@
<node concept="24kQdi" id="7d0q5VH9fgX">
<property role="3GE5qa" value="lines" />
<ref role="1XX52x" to="pvux:7d0q5VH9fgO" resolve="VerticalLineCell" />
<node concept="PMmxH" id="7d0q5VH9fgZ" role="2wV5jI">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
</node>
<node concept="3EZMnI" id="7d0q5VH9fh1" role="6VMZX">
<node concept="PMmxH" id="7d0q5VH9fh2" role="3EZMnx">
<ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
Expand Down Expand Up @@ -675,18 +679,48 @@
</node>
<node concept="2iRkQZ" id="7d0q5VH9fhb" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="1be6WiHa4Ac" role="2wV5jI">
<ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
<node concept="PMmxH" id="1be6WiHa4Ad" role="3EZMnx">
<ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
<ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
</node>
<node concept="3F0ifn" id="1be6WiHa4Ae" role="3EZMnx">
<property role="3F0ifm" value="vertical-line" />
<node concept="Vb9p2" id="1be6WiHa4Af" role="3F10Kt" />
</node>
<node concept="PMmxH" id="1be6WiHa4Ag" role="3EZMnx">
<ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
<ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
</node>
<node concept="2iRfu4" id="1be6WiHa4Ah" role="2iSdaV" />
</node>
</node>
<node concept="24kQdi" id="3ATi8gIrB_2">
<ref role="1XX52x" to="pvux:3ATi8gIrB$_" resolve="TopDownLayoutCell" />
<node concept="3EZMnI" id="3ATi8gIrB_4" role="2wV5jI">
<node concept="3F0ifn" id="3ATi8gIrB_b" role="3EZMnx">
<property role="3F0ifm" value="top-down-layout" />
<node concept="Veino" id="3ATi8gIrB_n" role="3F10Kt">
<property role="Vb096" value="fLJRk5_/gray" />
<node concept="3EZMnI" id="2peXSsL72c0" role="3EZMnx">
<ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
<node concept="PMmxH" id="i0vcES5" role="3EZMnx">
<ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
<ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
</node>
<node concept="3F0ifn" id="2peXSsL72c5" role="3EZMnx">
<property role="3F0ifm" value="top-down layout" />
<node concept="Vb9p2" id="1be6WiH9g4X" role="3F10Kt" />
</node>
<node concept="PMmxH" id="i0vcESe" role="3EZMnx">
<ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
<ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
</node>
<node concept="2iRfu4" id="2peXSsL72ca" role="2iSdaV" />
</node>
<node concept="3F1sOY" id="3ATi8gIrB_h" role="3EZMnx">
<ref role="1NtTu8" to="pvux:3ATi8gIrB$A" resolve="childCell" />
<node concept="3EZMnI" id="1be6WiH9ace" role="3EZMnx">
<node concept="2iRfu4" id="1be6WiH9acf" role="2iSdaV" />
<node concept="3XFhqQ" id="1be6WiH9a9Y" role="3EZMnx" />
<node concept="3F1sOY" id="3ATi8gIrB_h" role="3EZMnx">
<ref role="1NtTu8" to="pvux:3ATi8gIrB$A" resolve="childCell" />
</node>
</node>
<node concept="2iRkQZ" id="3ATi8gIrB_7" role="2iSdaV" />
</node>
Expand Down
31 changes: 25 additions & 6 deletions code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,14 +477,33 @@
</node>
<node concept="24kQdi" id="2vJRo8gAxGE">
<ref role="1XX52x" to="91fu:2vJRo8gAxFs" resolve="NextEditor" />
<node concept="3F0ifn" id="2vJRo8gAxGG" role="2wV5jI">
<property role="3F0ifm" value="[next-editor]" />
<node concept="VechU" id="2vJRo8gAxIl" role="3F10Kt">
<property role="Vb096" value="fLwANPu/blue" />
<node concept="3EZMnI" id="2peXSsL72c0" role="2wV5jI">
<ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
<node concept="3F0ifn" id="2peXSsL72c1" role="3EZMnx">
<property role="3F0ifm" value="[&gt;" />
<node concept="VPM3Z" id="2peXSsL72c2" role="3F10Kt">
<property role="VOm3f" value="false" />
</node>
<node concept="VPXOz" id="2peXSsL72c3" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="Vb9p2" id="2peXSsL72c4" role="3F10Kt" />
</node>
<node concept="VPXOz" id="7klUZA6YFa_" role="3F10Kt">
<property role="VOm3f" value="true" />
<node concept="3F0ifn" id="2peXSsL72c5" role="3EZMnx">
<property role="3F0ifm" value="next editor" />
<ref role="1k5W1q" to="tpc5:3OSQ5wtKyli" resolve="attributedCellLabel" />
</node>
<node concept="3F0ifn" id="2peXSsL72c6" role="3EZMnx">
<property role="3F0ifm" value="&lt;]" />
<node concept="VPM3Z" id="2peXSsL72c7" role="3F10Kt">
<property role="VOm3f" value="false" />
</node>
<node concept="VPXOz" id="2peXSsL72c8" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="Vb9p2" id="2peXSsL72c9" role="3F10Kt" />
</node>
<node concept="2iRfu4" id="2peXSsL72ca" role="2iSdaV" />
</node>
</node>
<node concept="24kQdi" id="59YMGDNPSRd">
Expand Down
Loading

0 comments on commit 805389a

Please sign in to comment.