Merge pull request #85 from mbeddr/maintenance/MPS-2022.3_merge_2022.…

…2_dan maintenance/merge_maintenance_mps_2022.2_into_maintenance_2022.3
mbeddr · May 17, 2024 · 9caf234 · 9caf234
2 parents 3839047 + f5f1924
commit 9caf234
Show file tree

Hide file tree

Showing 596 changed files with 221,549 additions and 195,098 deletions.
diff --git a/.github/workflows/PR-into-next-version.yml b/.github/workflows/PR-into-next-version.yml
@@ -0,0 +1,18 @@
+name: PR to merge into the next version
+
+on:
+  push:
+    branches:
+      - 'maintenance/MPS-*'
+
+jobs:
+  create-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create PR
+        uses: specificlanguages/cascading-merge@v2
+        with:
+          branch_prefix: maintenance/MPS-
+          merge_prefix: merge/MPS-
+          default_merge_prefix: merge/
+          token: ${{ secrets.MPS_CI_BUILD_BOT_ACCESS_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
     id("de.itemis.mps.gradle.common") version "1.20.+"
 }
 
-val jbrVers = "17.0.6-b653.34"
+val jbrVers = "17.0.6-b469.82"
 
 downloadJbr {
     jbrVersion = jbrVers
@@ -41,7 +41,7 @@ val bugfix = "1"
 
 fun appendOpt(str:String, pre:String) = if(!str.isEmpty()) "${pre}${str}" else ""
 
-val mpsVersion = "$major.$minor" + appendOpt(bugfix, ".")
+val mpsVersion = "2022.3" + appendOpt(bugfix, ".")
 
 // Dependency versions
 val platformVersion = "$major.$minor.+"
@@ -175,13 +175,26 @@ tasks {
         destination = file("code/languages/com.mbeddr.formal.nusmv/.mps/libraries.xml")
     }
 
+	// "com.fasten.safety.rcp.pluginSolution" makes use of the mbeddr actionsfilter plugin.
+	// The "actionsfilter" plugin and dependencies must be copied to "MPS\plugins" folder in order to load properly.
+	val copy_mbeddr_actionsfilter by registering(Copy::class) {
+		dependsOn(resolveLanguageLibs)
+		description="Installs 'com.mbeddr.mpsutil.actionsfilter' plugin and its dependencies into 'MPS\\plugins' directory."
+		from("$dependenciesDir/com.mbeddr.platform")
+		include("com.mbeddr.mpsutil.actionsfilter/",
+            "de.itemis.mps.editor.widgets/",
+            "de.slisson.mps.hacks/",
+            "de.itemis.mps.tooltips/")
+		into("$mpsHomeDir/plugins")
+	}
+
     val setup by registering {
         dependsOn(generateLibrariesXml)
         description = "Set up MPS project libraries. Libraries are read in from projectlibraries.properties file."
     }
 
     val build_allScripts by registering(BuildLanguages::class) {
-        dependsOn(resolveMps, resolveLanguageLibs)
+        dependsOn(resolveMps, resolveLanguageLibs, copy_mbeddr_actionsfilter)
         script = "$buildDir/scripts/build_all_scripts.xml"
     }
 

diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
@@ -39,6 +39,7 @@
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
     <fileset dir="${artifacts.mps}/lib">
       <include name="util.jar" />
+      <include name="3rd-party-rt.jar" />
     </fileset>
   </path>
 
@@ -167,6 +168,7 @@
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk8.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.references.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
@@ -252,7 +254,6 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx1024m" />
-        <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mbeddr.formal.home" path="${mbeddr.formal.home}" />
       <macro name="mps.home" path="${mps.home}" />

diff --git a/code/languages/com.fasten.symo/.mps/vcs.xml b/code/languages/com.fasten.symo/.mps/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
     <mapping directory="$mbeddr.formal.home$" vcs="Git" />
   </component>
 </project>
diff --git a/....fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps b/....fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
@@ -89,12 +89,12 @@
       <property role="TrG5h" value="ecu2" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwa8" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4BO" resolve="ecu1" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
+      <ref role="2jnmXU" node="2gpUZARh4BO" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwaa" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4C9" resolve="ecu2" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
+      <ref role="2jnmXU" node="2gpUZARh4C9" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" />
     </node>
   </node>
 </model>

diff --git a/...ymo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps b/...ymo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
@@ -76,15 +76,15 @@
       <property role="TrG5h" value="Sender" />
       <node concept="3USqFc" id="pk5lVrZWqi" role="3UVs02">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
+        <ref role="3US7yy" node="pk5lVrZWqd" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWqq" role="3UUxLy" />
     <node concept="3UVs0c" id="pk5lVrZWqB" role="3UUxLy">
       <property role="TrG5h" value="Receiver" />
       <node concept="3USqFc" id="pk5lVrZWqL" role="3UVs00">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
+        <ref role="3US7yy" node="pk5lVrZWqd" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWr9" role="3UUxLy" />
@@ -93,20 +93,20 @@
       <node concept="3UVpuM" id="pk5lVrZWrH" role="3UVWDc">
         <node concept="3UVpuK" id="pk5lVrZWrJ" role="3UVKbZ">
           <property role="TrG5h" value="s" />
-          <ref role="3UVpu6" node="6TLpWSY0gIt" resolve="Sender" />
+          <ref role="3UVpu6" node="6TLpWSY0gIt" />
         </node>
         <node concept="3UVpuK" id="pk5lVrZWrO" role="3UVKbZ">
           <property role="TrG5h" value="r" />
-          <ref role="3UVpu6" node="pk5lVrZWqB" resolve="Receiver" />
+          <ref role="3UVpu6" node="pk5lVrZWqB" />
         </node>
         <node concept="3UVptf" id="pk5lVrZWrW" role="3UVKbZ">
           <node concept="3UVgTP" id="pk5lVrZWs1" role="3UVptc">
-            <ref role="3UVgTb" node="pk5lVrZWrJ" resolve="s" />
-            <ref role="3UVgT4" node="pk5lVrZWqi" resolve="data" />
+            <ref role="3UVgTb" node="pk5lVrZWrJ" />
+            <ref role="3UVgT4" node="pk5lVrZWqi" />
           </node>
           <node concept="3UVgTP" id="pk5lVrZWs3" role="3UVpta">
-            <ref role="3UVgTb" node="pk5lVrZWrO" resolve="r" />
-            <ref role="3UVgT4" node="pk5lVrZWqL" resolve="data" />
+            <ref role="3UVgTb" node="pk5lVrZWrO" />
+            <ref role="3UVgT4" node="pk5lVrZWqL" />
           </node>
         </node>
         <node concept="37mRI7" id="pk5lVrZWs6" role="lGtFl">

diff --git a/code/languages/com.mbeddr.formal.nusmv/devkits/fasten.nusmv/fasten.nusmv.devkit b/code/languages/com.mbeddr.formal.nusmv/devkits/fasten.nusmv/fasten.nusmv.devkit
@@ -16,5 +16,7 @@
   <exported-language name="85d37fe5-2c7e-4ea1-ae78-08007614c543(com.mbeddr.formal.nusmv.importer)" />
   <exported-language name="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" />
   <exported-language name="58bd9c99-ba42-4205-b3c9-ce445fd870e6(com.mbeddr.formal.nusmv.cbd)" />
+  <exported-language name="3b22dedc-d6cf-4626-9445-6e9909b3e04a(com.fasten.base.arch.msc)" />
+  <exported-language name="81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc)" />
 </dev-kit>
 
diff --git a/...mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl b/...mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
@@ -22,7 +22,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />

diff --git a/...languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps b/...languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
@@ -7,7 +7,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />

diff --git a/...languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl b/...languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
@@ -20,7 +20,7 @@
     <dependency reexport="true">4bf9a860-39c9-4cb2-8004-157a961bf42c(com.mbeddr.formal.base.operatorspanel.rt)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />

diff --git a/...com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps b/...com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
@@ -6,7 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>

diff --git a/...uages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl b/...uages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
@@ -28,6 +28,7 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+    <dependency reexport="false">1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -89,6 +90,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
+    <module reference="1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)" version="0" />
     <module reference="8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />

diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
@@ -620,6 +620,27 @@
         </node>
       </node>
     </node>
+    <node concept="Wx3nA" id="3Q78AXIZrq" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_LIGHT_BLUE" />
+      <node concept="3Tm1VV" id="3Q78AXIZrr" role="1B3o_S" />
+      <node concept="3uibUv" id="3Q78AXIZrs" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="3Q78AXIZrt" role="33vP2m">
+        <node concept="1pGfFk" id="3Q78AXIZru" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="3Q78AXIZrv" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="3cmrfG" id="3Q78AXIZrw" role="37wK5m">
+            <property role="3cmrfH" value="210" />
+          </node>
+          <node concept="3cmrfG" id="3Q78AXJbUG" role="37wK5m">
+            <property role="3cmrfH" value="255" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="Wx3nA" id="KwKRgpJugV" role="jymVt">
       <property role="TrG5h" value="KEYWORD_DARK_BLUE" />
       <node concept="3Tm1VV" id="KwKRgpJugW" role="1B3o_S" />
@@ -641,7 +662,37 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4afdSTbPIoh" role="jymVt" />
+    <node concept="Wx3nA" id="4afdSTbPIhl" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_GREEN_DARK" />
+      <node concept="3Tm1VV" id="4afdSTbPIhm" role="1B3o_S" />
+      <node concept="3uibUv" id="4afdSTbPIhn" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2YIFZM" id="42Yf_hF11Mi" role="33vP2m">
+        <ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
+        <ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
+        <node concept="Xl_RD" id="42Yf_hF11Mj" role="37wK5m">
+          <property role="Xl_RC" value="#01C60B" />
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="4afdSTbQoB4" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_GREEN_LIGHT" />
+      <node concept="3Tm1VV" id="4afdSTbQoB5" role="1B3o_S" />
+      <node concept="3uibUv" id="4afdSTbQoB6" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2YIFZM" id="42Yf_hF11Md" role="33vP2m">
+        <ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
+        <ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
+        <node concept="Xl_RD" id="42Yf_hF11Me" role="37wK5m">
+          <property role="Xl_RC" value="#017507" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="KwKRgpJueU" role="jymVt" />
+    <node concept="2tJIrI" id="4afdSTbPIfQ" role="jymVt" />
     <node concept="Wx3nA" id="y826GEUxbz" role="jymVt">
       <property role="TrG5h" value="INACTIVE" />
       <node concept="3Tm1VV" id="y826GEUxb$" role="1B3o_S" />
@@ -1969,8 +2020,8 @@
                     <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
                     <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
-                  <node concept="10M0yZ" id="8xY_IhAb1I" role="37wK5m">
-                    <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
+                  <node concept="10M0yZ" id="4afdSTbQY$w" role="37wK5m">
+                    <ref role="3cqZAo" node="4afdSTbQoB4" resolve="KEYWORD_GREEN_LIGHT" />
                     <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
                 </node>
@@ -1997,8 +2048,8 @@
                     <ref role="3cqZAo" node="KwKRgpJugV" resolve="KEYWORD_DARK_BLUE" />
                     <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
-                  <node concept="10M0yZ" id="8xY_IhAbdL" role="37wK5m">
-                    <ref role="3cqZAo" node="KwKRgpJugV" resolve="KEYWORD_DARK_BLUE" />
+                  <node concept="10M0yZ" id="3Q78AXJuEw" role="37wK5m">
+                    <ref role="3cqZAo" node="3Q78AXIZrq" resolve="KEYWORD_LIGHT_BLUE" />
                     <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
                 </node>
@@ -4351,6 +4402,26 @@
       <property role="TrG5h" value="AnnotationProviderStyle" />
       <node concept="VSNWy" id="65LrkjiZl6c" role="3F10Kt">
         <property role="1lJzqX" value="8" />
+        <node concept="1cFabM" id="3Q78AXT7ST" role="1d8cEk">
+          <node concept="3clFbS" id="3Q78AXT7SU" role="2VODD2">
+            <node concept="3clFbF" id="3Q78AXM_3g" role="3cqZAp">
+              <node concept="3cpWsd" id="3Q78AXM_3h" role="3clFbG">
+                <node concept="3cmrfG" id="3Q78AXM_3i" role="3uHU7w">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="2OqwBi" id="3Q78AXM_3j" role="3uHU7B">
+                  <node concept="2YIFZM" id="3Q78AXM_3k" role="2Oq$k0">
+                    <ref role="37wK5l" to="exr9:~EditorSettings.getInstance()" resolve="getInstance" />
+                    <ref role="1Pybhc" to="exr9:~EditorSettings" resolve="EditorSettings" />
+                  </node>
+                  <node concept="liA8E" id="3Q78AXM_3l" role="2OqNvi">
+                    <ref role="37wK5l" to="exr9:~EditorSettings.getFontSize()" resolve="getFontSize" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2biZxu" id="65LrkjiZl6h" role="3F10Kt">
         <property role="1rj3mz" value="Arial" />
@@ -4399,9 +4470,9 @@
                     <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
                     <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
-                  <node concept="10M0yZ" id="4I1OjAqvnma" role="37wK5m">
+                  <node concept="10M0yZ" id="4afdSTbQp0P" role="37wK5m">
+                    <ref role="3cqZAo" node="4afdSTbQoB4" resolve="KEYWORD_GREEN_LIGHT" />
                     <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
-                    <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
                   </node>
                 </node>
               </node>

diff --git a/.../languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps b/.../languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
@@ -18,6 +18,7 @@
     <import index="iihn" ref="r:1ca0ad9f-f283-47a0-9785-0fcac08d0fee(com.mbeddr.formal.base.prefixed_names_utils)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpd5" ref="r:00000000-0000-4000-0000-011c895902b5(jetbrains.mps.lang.typesystem.dependencies)" />
+    <import index="agne" ref="r:2538c08a-32a3-4d93-89c3-b508268173db(com.mpsbasics.project.utils.project_finder)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -274,9 +275,9 @@
               <node concept="3uibUv" id="1noKC0JQumn" role="1tU5fm">
                 <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
               </node>
-              <node concept="2YIFZM" id="1noKC0JQ_pB" role="33vP2m">
-                <ref role="37wK5l" to="2y64:1fyC0RHInUp" resolve="getMPSProjectForNode" />
-                <ref role="1Pybhc" to="2y64:1fyC0RHIfK6" resolve="ProjectHelper" />
+              <node concept="2YIFZM" id="2u7UHDCh3mr" role="33vP2m">
+                <ref role="37wK5l" to="agne:1fyC0RHInUp" resolve="getMPSProjectForNode" />
+                <ref role="1Pybhc" to="agne:1fyC0RHIfK6" resolve="ProjectHelper" />
                 <node concept="1YBJjd" id="1noKC0JQ_yS" role="37wK5m">
                   <ref role="1YBMHb" node="3f8ZVRYfNzK" resolve="containerForEntitiesWithPrefixedNames" />
                 </node>

diff --git a/...eddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl b/...eddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
@@ -86,7 +86,7 @@
     <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />