Merge pull request #2556 from mbeddr/bugfix/fix_exceptions

mbeddr · Oct 17, 2024 · 02e0ce2 · 02e0ce2
2 parents 031273c + 4013805
commit 02e0ce2
Show file tree

Hide file tree

Showing 13 changed files with 852 additions and 366 deletions.
diff --git a/build-allScripts.xml b/build-allScripts.xml
@@ -1,4 +1,4 @@
-<project name="com.mbeddr.allScripts.build" default="build" basedir="../../..">
+<project name="com.mbeddr.allScripts.build" default="build" basedir="code/languages/com.mbeddr.build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/com.mbeddr.allScripts.build" />

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ ext.defaultReleaseRepository = 'https://artifacts.itemis.cloud/repository/maven-
 
 //MPS version
 ext.mpsMajor = "2023.2"
-ext.mpsBuild = "2023.2.1"
+ext.mpsBuild = "2023.2.2"
 
 //MPS-extensions version
 ext.mpsExtensionsVersion = findNonEmptyProperty('mpsExtensionsVersion') ?: "$mpsMajor.+"

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
@@ -1146,11 +1146,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7udlxS$N$Jr" role="3bR37C">
-          <node concept="3bR9La" id="7udlxS$N$Js" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:4LDuh$Ud1Lx" resolve="jetbrains.mps.debugger.java.api" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="17FCEM7ip1J" role="3bR37C">
           <node concept="3bR9La" id="17FCEM7ip1K" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
@@ -3108,11 +3103,6 @@
             <ref role="1Busuk" node="7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6oAagBJCrGJ" role="3bR37C">
-          <node concept="3bR9La" id="6oAagBJCrGK" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7gdoTYdo$et" resolve="jetbrains.mps.debugger.api.api" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="HiHZpX4D0I" role="3bR37C">
           <node concept="1Busua" id="HiHZpX4D0J" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
@@ -3428,6 +3418,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7PIunOs7bbE" role="3bR37C">
+          <node concept="3bR9La" id="7PIunOs7bbF" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:4X1d9kMCbcv" resolve="jetbrains.mps.ide.refactoring.platform" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7uZw0yZ43Mb" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3586,6 +3581,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7PIunOs7bbV" role="3bR37C">
+          <node concept="3bR9La" id="7PIunOs7bbW" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:4X1d9kMCbcv" resolve="jetbrains.mps.ide.refactoring.platform" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="WadEn6CWbr" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
diff --git a/....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
diff --git a/...ittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps b/...ittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps
diff --git a/...beddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd b/...beddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd
@@ -21,6 +21,7 @@
     <dependency reexport="false">e5fe54ab-c20f-4431-a7e7-76e843f58498(com.mbeddr.core.util.pluginSolution)</dependency>
     <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -31,6 +32,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
@@ -80,6 +82,7 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
+    <module reference="98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />

diff --git a/....core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps b/....core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps
@@ -2509,6 +2509,7 @@
     <property role="TrG5h" value="createNewMbeddrProject" />
     <property role="2uzpH1" value="mbeddr Project" />
     <property role="1rBW0U" value="true" />
+    <property role="2YLI8m" value="6u2MFnph2wS/none" />
     <node concept="1DS2jV" id="2cNe_D166j7" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />

diff --git a/...om.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd b/...om.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd
@@ -28,6 +28,7 @@
     <dependency reexport="false">d7931714-a11c-4108-aa0e-246d86070dad(com.mbeddr.mpsutil.smodule.runtime)</dependency>
     <dependency reexport="false">58e731a3-6aaa-444a-bf40-801b91c15878(com.mbeddr.mpsutil.lang.plugin.extensions)</dependency>
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
+    <dependency reexport="false">98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:58e731a3-6aaa-444a-bf40-801b91c15878:com.mbeddr.mpsutil.lang.plugin.extensions" version="0" />
@@ -90,6 +91,7 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
+    <module reference="98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)" version="0" />
     <module reference="25092e07-e655-497c-92fb-558a8e3080ed(jetbrains.mps.ide.ui)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />

diff --git a/...s/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps b/...s/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
@@ -142,7 +142,6 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
@@ -176,9 +175,6 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
-        <child id="1160998896846" name="condition" index="1gVkn0" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -742,10 +738,13 @@
             </node>
           </node>
         </node>
-        <node concept="1gVbGN" id="lcBmxsnw6K" role="3cqZAp">
-          <node concept="17QLQc" id="lcBmxsnwKx" role="1gVkn0">
-            <node concept="10Nm6u" id="lcBmxsnx0L" role="3uHU7w" />
-            <node concept="37vLTw" id="lcBmxsnwr4" role="3uHU7B">
+        <node concept="3clFbJ" id="7PIunOs4qOh" role="3cqZAp">
+          <node concept="3clFbS" id="7PIunOs4qOj" role="3clFbx">
+            <node concept="3cpWs6" id="7PIunOs4tcM" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="7PIunOs4rzE" role="3clFbw">
+            <node concept="10Nm6u" id="7PIunOs4saX" role="3uHU7w" />
+            <node concept="37vLTw" id="7PIunOs4r8I" role="3uHU7B">
               <ref role="3cqZAo" node="5gyVhZ1blCP" resolve="ref" />
             </node>
           </node>

diff --git a/...com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps b/...com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
@@ -656,6 +656,11 @@
       <node concept="3uibUv" id="FUKXd6ZBkK" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTable" resolve="JTable" />
       </node>
+      <node concept="2ShNRf" id="FUKXd6ZPth" role="33vP2m">
+        <node concept="1pGfFk" id="FUKXd6ZQH3" role="2ShVmc">
+          <ref role="37wK5l" to="dxuu:~JTable.&lt;init&gt;()" resolve="JTable" />
+        </node>
+      </node>
     </node>
     <node concept="2BZ0e9" id="6u6UJCOMnXH" role="2XNbBz">
       <property role="TrG5h" value="model" />
@@ -1089,21 +1094,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="FUKXd6ZNy2" role="3cqZAp">
-          <node concept="37vLTI" id="FUKXd6ZPhd" role="3clFbG">
-            <node concept="2ShNRf" id="FUKXd6ZPth" role="37vLTx">
-              <node concept="1pGfFk" id="FUKXd6ZQH3" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JTable.&lt;init&gt;()" resolve="JTable" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="FUKXd6ZNEH" role="37vLTJ">
-              <node concept="2WthIp" id="FUKXd6ZNy0" role="2Oq$k0" />
-              <node concept="2BZ7hE" id="FUKXd6ZOt_" role="2OqNvi">
-                <ref role="2WH_rO" node="FUKXd6Z$z7" resolve="table" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="FUKXd70iAj" role="3cqZAp">
           <node concept="2OqwBi" id="FUKXd70jZ3" role="3clFbG">
             <node concept="2OqwBi" id="FUKXd70iAd" role="2Oq$k0">

diff --git a/...om.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/com.mbeddr.mpsutil.xmlImport.msd b/...om.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/com.mbeddr.mpsutil.xmlImport.msd
@@ -15,6 +15,7 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
+    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -24,6 +25,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
@@ -37,8 +39,10 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="6f6d5be9-a352-48db-9081-851a6d5c535b(com.mbeddr.mpsutil.xmlImport)" version="0" />
     <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />