Merge pull request #865 from JetBrains/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
JetBrains · Jul 10, 2024 · 13719ed · 13719ed
2 parents 1cbb206 + b5fd655
commit 13719ed
Show file tree

Hide file tree

Showing 77 changed files with 26,815 additions and 9,795 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,16 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
 
 ## June 2024
 
+### Added
+
+- *de.itemis.mps.editor.celllayout.styles*: A new style sheet item *full-width-root* was added that can make the root cell of the editor occupy the full editor width. That means that, for example, horizontal lines with a push/grow style will extend to the full editor width as well as all other cells with the same style.
+
 ### Fixed
 
 - *de.itemis.mps.editor.diagram.runtime*: Diagrams can now be used in an headless environment (e.g. for rendering documentation).
 - *de.slisson.mps.editor.multiline.runtime*: A bug was fixed where the multiline cell got a wrong background color set.
 - *de.itemis.mps.editor.diagram.runtime*: The dependency to *de.q60.mps.collections.libs* was removed.
+- *de.itemis.mps.editor.diagram*: Various improvements to diagrams were made. (see: [PR #866](https://github.com/JetBrains/MPS-extensions/pull/866) )
 
 ## May 2024
 

diff --git a/build.gradle b/build.gradle
@@ -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
 
@@ -543,12 +543,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
@@ -562,37 +562,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)
 }
diff --git a/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -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" />
@@ -5063,6 +5068,12 @@
       <node concept="m$_yC" id="3_sZyadxXAa" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:6Hpa5co69BH" resolve="jetbrains.mps.editor.tooltips" />
       </node>
+      <node concept="m$_yC" id="5CBfeKljtXO" role="m$_yJ">
+        <ref role="m$_y1" node="3$A0JaN5ezp" resolve="MPS.ThirdParty" />
+      </node>
+      <node concept="m$_yC" id="Lh$XQAfAuF" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
+      </node>
     </node>
     <node concept="2G$12M" id="4be$WTb1AxY" role="3989C9">
       <property role="TrG5h" value="de.itemis.mps.editor.diagram" />
@@ -5123,11 +5134,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="tUmIYfjym1" role="3bR37C">
-          <node concept="3bR9La" id="tUmIYfjym2" role="1SiIV1">
-            <ref role="3bR37D" node="2Xjt3l57hht" resolve="de.slisson.mps.reflection.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="tUmIYfjym3" role="3bR37C">
           <node concept="3bR9La" id="tUmIYfjym4" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -5550,6 +5556,26 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="YGA9S6qTe9" role="3bR37C">
+          <node concept="3bR9La" id="YGA9S6qTea" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5CBfeKkVNlr" role="3bR37C">
+          <node concept="3bR9La" id="5CBfeKkVNls" role="1SiIV1">
+            <ref role="3bR37D" node="3$A0JaN5bpX" resolve="MPS.ThirdParty" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5CBfeKkVNlx" role="3bR37C">
+          <node concept="3bR9La" id="5CBfeKkVNly" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5CBfeKkVNlz" role="3bR37C">
+          <node concept="3bR9La" id="5CBfeKkVNl$" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6wEeo$QJAsB" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5900,6 +5926,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="74e51Ji4Ba7" role="3bR37C">
+          <node concept="3bR9La" id="74e51Ji4Ba8" role="1SiIV1">
+            <ref role="3bR37D" node="4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="56Tfdun3uan" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -20541,6 +20572,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="6W5Xfjf_imB" role="3bR37C">
+          <node concept="3bR9La" id="6W5Xfjf_imC" role="1SiIV1">
+            <ref role="3bR37D" node="6SVXTgIel8z" resolve="de.itemis.mps.editor.celllayout.styles" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7qi8mU1OzZB" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/code/celllayout/languages/de.itemis.mps.celllayout/models/styles/editor.mps b/code/celllayout/languages/de.itemis.mps.celllayout/models/styles/editor.mps
@@ -156,6 +156,12 @@
   </registry>
   <node concept="V5hpn" id="6SVXTgI9FWP">
     <property role="TrG5h" value="LayoutStyleAttributes" />
+    <node concept="3t5Usi" id="6W5Xfjf3D25" role="V601i">
+      <property role="iBDjm" value="7zL4upErSle/simple" />
+      <property role="TrG5h" value="_full-width-root" />
+      <node concept="10P_77" id="6W5Xfjf3D44" role="3t5Oan" />
+      <node concept="3clFbT" id="6W5Xfjf3D4k" role="3t49C2" />
+    </node>
     <node concept="3t5Usi" id="6SVXTgI9FWQ" role="V601i">
       <property role="iBDjm" value="7zL4upErSle/simple" />
       <property role="TrG5h" value="_border-color" />

diff --git a/....itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl b/....itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl
@@ -12,6 +12,9 @@
   </facets>
   <accessoryModels />
   <sourcePath />
+  <dependencies>
+    <dependency reexport="false">24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)</dependency>
+  </dependencies>
   <languageVersions>
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -51,6 +54,7 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="a49c7665-6e20-479f-8483-903f65b74ed2(de.itemis.mps.editor.celllayout.sandboxlang)" version="0" />
+    <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>

diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/models/editor.mps b/code/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/models/editor.mps
@@ -8,6 +8,7 @@
   </languages>
   <imports>
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
+    <import index="z0fb" ref="r:0b928dd6-dd7e-45a8-b309-a2e315b7877a(de.itemis.mps.editor.celllayout.styles.editor)" />
     <import index="uvw8" ref="r:8779fe48-e315-4d07-bdd5-8767e3f955d0(de.itemis.mps.editor.celllayout.sandboxlang.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -101,6 +102,7 @@
       <concept id="8304752469786031156" name="de.itemis.mps.editor.celllayout.structure.VerticalLineCell" flags="ng" index="2up9LE" />
       <concept id="8304752469786524965" name="de.itemis.mps.editor.celllayout.structure.VerticalLineColorStyle" flags="lg" index="2ur1lV" />
       <concept id="8304752469786516942" name="de.itemis.mps.editor.celllayout.structure.VerticalLineWidthStyle" flags="lg" index="2ur3mg" />
+      <concept id="8000069645376918054" name="de.itemis.mps.editor.celllayout.structure.FullWidthRootStyle" flags="lg" index="2w5Ari" />
       <concept id="4682418030829244851" name="de.itemis.mps.editor.celllayout.structure.StringStyle" flags="lg" index="2TzlJg">
         <property id="1238091709220" name="value" index="1413C4" />
         <child id="1236443321503" name="query" index="3xKXm0" />
@@ -1817,6 +1819,9 @@
   <node concept="24kQdi" id="7d0q5VHblIl">
     <ref role="1XX52x" to="uvw8:7d0q5VHb5QX" resolve="LinesContainer" />
     <node concept="3EZMnI" id="7d0q5VHblIn" role="2wV5jI">
+      <node concept="2w5Ari" id="6W5Xfjf5pz_" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
       <node concept="3EZMnI" id="7d0q5VHblIu" role="3EZMnx">
         <node concept="VPM3Z" id="7d0q5VHblIw" role="3F10Kt">
           <property role="VOm3f" value="false" />

diff --git a/.../celllayout/languages/de.itemis.mps.editor.celllayout/de.itemis.mps.editor.celllayout.mpl b/.../celllayout/languages/de.itemis.mps.editor.celllayout/de.itemis.mps.editor.celllayout.mpl
@@ -124,14 +124,25 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
+    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
+    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
+    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />