Merge pull request #2571 from mbeddr/bugfix/refreshtreeview_condition

mbeddr · Oct 30, 2024 · 96b6f93 · 96b6f93
2 parents 8a509a2 + 08dee2f
commit 96b6f93
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 34 deletions.
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
@@ -17215,60 +17215,65 @@
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="6AXckLE8K91" role="1oa70y" />
     </node>
+    <node concept="1DS2jV" id="6AXckLE9yw3" role="1NuT2Z">
+      <property role="TrG5h" value="window" />
+      <ref role="1DUlNI" to="qkt:~PlatformDataKeys.TOOL_WINDOW" resolve="TOOL_WINDOW" />
+      <node concept="1oajcY" id="6AXckLE9yw4" role="1oa70y" />
+    </node>
     <node concept="1QGGSu" id="6AXckLE8K94" role="3Uehp1">
       <property role="1iqoE4" value="${module}/icons/refresh.png" />
     </node>
     <node concept="2ScWuX" id="6AXckLE8K95" role="tmbBb">
       <node concept="3clFbS" id="6AXckLE8K96" role="2VODD2">
-        <node concept="3cpWs8" id="27vLEjs6SZw" role="3cqZAp">
-          <node concept="3cpWsn" id="27vLEjs6SZx" role="3cpWs9">
-            <property role="TrG5h" value="tool" />
-            <node concept="1xUVSX" id="27vLEjs6SYG" role="1tU5fm">
-              <ref role="1xYkEM" node="7Q6Q5uyvZ1G" resolve="GenericTreeTool" />
+        <node concept="3clFbJ" id="7LIXz$lzI2k" role="3cqZAp">
+          <node concept="3clFbS" id="7LIXz$lzI2l" role="3clFbx">
+            <node concept="3cpWs6" id="7LIXz$lzI2m" role="3cqZAp">
+              <node concept="3clFbT" id="7LIXz$lzI2n" role="3cqZAk">
+                <property role="3clFbU" value="false" />
+              </node>
             </node>
-            <node concept="2OqwBi" id="27vLEjs6SZy" role="33vP2m">
-              <node concept="2OqwBi" id="27vLEjs6SZz" role="2Oq$k0">
-                <node concept="2WthIp" id="27vLEjs6SZ$" role="2Oq$k0" />
-                <node concept="1DTwFV" id="27vLEjs6SZ_" role="2OqNvi">
+          </node>
+          <node concept="3clFbC" id="3ILA0udVHUa" role="3clFbw">
+            <node concept="10Nm6u" id="3ILA0udVHVM" role="3uHU7w" />
+            <node concept="2OqwBi" id="3ILA0udVHAe" role="3uHU7B">
+              <node concept="2OqwBi" id="3ILA0udVHAf" role="2Oq$k0">
+                <node concept="2WthIp" id="3ILA0udVHAg" role="2Oq$k0" />
+                <node concept="1DTwFV" id="3ILA0udVHAh" role="2OqNvi">
                   <ref role="2WH_rO" node="6AXckLE8K90" resolve="project" />
                 </node>
               </node>
-              <node concept="LR4U6" id="27vLEjs6SZA" role="2OqNvi">
+              <node concept="LR4U6" id="3ILA0udVHAi" role="2OqNvi">
                 <ref role="LR4U5" node="7Q6Q5uyvZ1G" resolve="GenericTreeTool" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="3ILA0udVHqA" role="3cqZAp">
-          <node concept="3clFbS" id="3ILA0udVHqC" role="3clFbx">
-            <node concept="3cpWs6" id="3ILA0udVIaC" role="3cqZAp">
-              <node concept="3clFbT" id="3ILA0udVIk1" role="3cqZAk">
-                <property role="3clFbU" value="false" />
+        <node concept="3clFbF" id="6AXckLE9yKZ" role="3cqZAp">
+          <node concept="3clFbC" id="6AXckLE9A_V" role="3clFbG">
+            <node concept="2OqwBi" id="6AXckLE9G8E" role="3uHU7w">
+              <node concept="2OqwBi" id="6AXckLE9DTf" role="2Oq$k0">
+                <node concept="2OqwBi" id="6AXckLE9BnF" role="2Oq$k0">
+                  <node concept="2WthIp" id="6AXckLE9AXv" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="6AXckLE9D1P" role="2OqNvi">
+                    <ref role="2WH_rO" node="6AXckLE8K90" resolve="project" />
+                  </node>
+                </node>
+                <node concept="LR4U6" id="6AXckLE9FCR" role="2OqNvi">
+                  <ref role="LR4U5" node="7Q6Q5uyvZ1G" resolve="GenericTreeTool" />
+                </node>
               </node>
-            </node>
-          </node>
-          <node concept="22lmx$" id="27vLEjs6T26" role="3clFbw">
-            <node concept="3clFbC" id="27vLEjs6TJf" role="3uHU7B">
-              <node concept="10Nm6u" id="27vLEjs6TSs" role="3uHU7w" />
-              <node concept="37vLTw" id="27vLEjs6Til" role="3uHU7B">
-                <ref role="3cqZAo" node="27vLEjs6SZx" resolve="tool" />
+              <node concept="liA8E" id="6AXckLE9GA1" role="2OqNvi">
+                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
               </node>
             </node>
-            <node concept="2OqwBi" id="27vLEjs6SHg" role="3uHU7w">
-              <node concept="37vLTw" id="27vLEjs6SZB" role="2Oq$k0">
-                <ref role="3cqZAo" node="27vLEjs6SZx" resolve="tool" />
-              </node>
-              <node concept="liA8E" id="27vLEjs6SX7" role="2OqNvi">
-                <ref role="37wK5l" to="71xd:~BaseTool.toolIsOpened()" resolve="toolIsOpened" />
+            <node concept="2OqwBi" id="6AXckLE9yKT" role="3uHU7B">
+              <node concept="2WthIp" id="6AXckLE9yKW" role="2Oq$k0" />
+              <node concept="1DTwFV" id="6AXckLE9yKY" role="2OqNvi">
+                <ref role="2WH_rO" node="6AXckLE9yw3" resolve="window" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="27vLEjs63x0" role="3cqZAp">
-          <node concept="3clFbT" id="27vLEjs63Ko" role="3cqZAk">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
       </node>
     </node>
   </node>

diff --git a/...nguages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl b/...nguages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl
@@ -38,6 +38,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />

diff --git a/...mpsutil/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl b/...mpsutil/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl
@@ -38,6 +38,7 @@
         <language slang="l:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
         <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:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
@@ -113,6 +114,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <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" />

diff --git a/...nguages/com.mbeddr.mpsutil.interpreter/runtime/com.mbeddr.mpsutil.interpreter.runtime.msd b/...nguages/com.mbeddr.mpsutil.interpreter/runtime/com.mbeddr.mpsutil.interpreter.runtime.msd
@@ -29,6 +29,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />

diff --git a/...languages/com.mbeddr.mpsutil.nodes_tracing.test/com.mbeddr.mpsutil.nodes_tracing.test.mpl b/...languages/com.mbeddr.mpsutil.nodes_tracing.test/com.mbeddr.mpsutil.nodes_tracing.test.mpl
@@ -86,6 +86,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />

diff --git a/...om.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd b/...om.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd
@@ -27,6 +27,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />

diff --git a/....mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/com.mbeddr.mpsutil.toolrunner.msd b/....mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/com.mbeddr.mpsutil.toolrunner.msd
@@ -21,6 +21,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />

diff --git a/....mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/test.com.mbeddr.mpsutil.xml.fix.msd b/....mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.xml.fix/test.com.mbeddr.mpsutil.xml.fix.msd
@@ -25,6 +25,7 @@
     <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" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:dcb5a83a-19a8-44ff-a4cb-fc7d324ecc63:jetbrains.mps.core.xml.sax" version="0" />

diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle
@@ -180,7 +180,8 @@ List<File> projectDirectoriesInDependencyOrder = projectsInDependencyOrder.colle
 tasks.register('migrate', MpsMigrate) {
     dependsOn(':com.mbeddr:platform:generate_platform_languages', 'downloadJbr')
     javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
-
+    haltOnPrecheckFailure = false
+    haltOnDependencyError = false
     mpsHome = mpsHomeDir
     projectDirectories.from(projectDirectoriesInDependencyOrder)