From 56030fc7335a796c1a714e8011bde1d14215bd85 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 11:18:49 +0100
Subject: [PATCH 01/38] core.base: use JB classes for search tool

---
 .../core/base/pluginSolution/plugin.mps       | 46 ++++++++++---------
 .../pluginSolution/pluginSolution.msd         |  2 +
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index c36c07e1b3f..b6acdb8cd60 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -107,6 +107,9 @@
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
     <import index="r3rm" ref="r:7fc96130-6279-4a55-aeeb-422a6879539d(de.itemis.mps.editor.diagram.runtime.jgraph)" />
     <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
+    <import index="sud2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui.table(MPS.IDEA/)" />
+    <import index="qqrq" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.ui.components(MPS.ThirdParty/)" />
+    <import index="3pb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.table(MPS.IDEA/)" />
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" implicit="true" />
   </imports>
   <registry>
@@ -2376,11 +2379,11 @@
       <property role="3TUv4t" value="true" />
       <node concept="3Tm6S6" id="jpyKDg1Mqf" role="1B3o_S" />
       <node concept="3uibUv" id="jpyKDg1Mqq" role="1tU5fm">
-        <ref role="3uigEE" to="dxuu:~JTextField" resolve="JTextField" />
+        <ref role="3uigEE" to="qqrq:~JBTextField" resolve="JBTextField" />
       </node>
       <node concept="2ShNRf" id="jpyKDg1Mqs" role="33vP2m">
         <node concept="1pGfFk" id="jpyKDg1MMr" role="2ShVmc">
-          <ref role="37wK5l" to="dxuu:~JTextField.&lt;init&gt;()" resolve="JTextField" />
+          <ref role="37wK5l" to="qqrq:~JBTextField.&lt;init&gt;()" resolve="JBTextField" />
         </node>
       </node>
     </node>
@@ -2389,11 +2392,11 @@
       <property role="3TUv4t" value="true" />
       <node concept="3Tm6S6" id="7DRyZmDjH3T" role="1B3o_S" />
       <node concept="3uibUv" id="7DRyZmDjJ7K" role="1tU5fm">
-        <ref role="3uigEE" to="dxuu:~JCheckBox" resolve="JCheckBox" />
+        <ref role="3uigEE" to="qqrq:~JBCheckBox" resolve="JBCheckBox" />
       </node>
       <node concept="2ShNRf" id="7DRyZmDjH3V" role="33vP2m">
         <node concept="1pGfFk" id="7DRyZmDkgDI" role="2ShVmc">
-          <ref role="37wK5l" to="dxuu:~JCheckBox.&lt;init&gt;(java.lang.String)" resolve="JCheckBox" />
+          <ref role="37wK5l" to="qqrq:~JBCheckBox.&lt;init&gt;(java.lang.String)" resolve="JBCheckBox" />
           <node concept="Xl_RD" id="7DRyZmDkhhS" role="37wK5m">
             <property role="Xl_RC" value="all" />
           </node>
@@ -2405,11 +2408,11 @@
       <property role="3TUv4t" value="true" />
       <node concept="3Tm6S6" id="jpyKDg1OFP" role="1B3o_S" />
       <node concept="3uibUv" id="5jGyeU5Xx04" role="1tU5fm">
-        <ref role="3uigEE" to="dxuu:~JTable" resolve="JTable" />
+        <ref role="3uigEE" to="3pb2:~JBTable" resolve="JBTable" />
       </node>
       <node concept="2ShNRf" id="jpyKDg1OG2" role="33vP2m">
         <node concept="1pGfFk" id="jpyKDg1OG3" role="2ShVmc">
-          <ref role="37wK5l" to="dxuu:~JTable.&lt;init&gt;()" resolve="JTable" />
+          <ref role="37wK5l" to="3pb2:~JBTable.&lt;init&gt;()" resolve="JBTable" />
         </node>
       </node>
     </node>
@@ -2457,7 +2460,7 @@
               <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
             </node>
             <node concept="liA8E" id="5jGyeU5XF1i" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setShowVerticalLines(boolean)" resolve="setShowVerticalLines" />
+              <ref role="37wK5l" to="3pb2:~JBTable.setShowVerticalLines(boolean)" resolve="setShowVerticalLines" />
               <node concept="3clFbT" id="5jGyeU5XF1j" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
@@ -2468,14 +2471,14 @@
         <node concept="3cpWs8" id="2HzhasNzUYT" role="3cqZAp">
           <node concept="3cpWsn" id="2HzhasNzUYU" role="3cpWs9">
             <property role="TrG5h" value="topPanel" />
-            <node concept="3uibUv" id="2HzhasNzUYV" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
-            </node>
             <node concept="2ShNRf" id="2HzhasNzUYX" role="33vP2m">
               <node concept="1pGfFk" id="2HzhasNzUYY" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JPanel.&lt;init&gt;()" resolve="JPanel" />
+                <ref role="37wK5l" to="qqrq:~JBPanel.&lt;init&gt;()" resolve="JBPanel" />
               </node>
             </node>
+            <node concept="3uibUv" id="4EP4zG71h7p" role="1tU5fm">
+              <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="2HzhasNzUZ0" role="3cqZAp">
@@ -2523,7 +2526,7 @@
             </node>
             <node concept="2ShNRf" id="2HzhasNzWRQ" role="33vP2m">
               <node concept="1pGfFk" id="2HzhasNzWRR" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JPanel.&lt;init&gt;()" resolve="JPanel" />
+                <ref role="37wK5l" to="qqrq:~JBPanel.&lt;init&gt;()" resolve="JBPanel" />
               </node>
             </node>
           </node>
@@ -2570,7 +2573,7 @@
             </node>
             <node concept="2ShNRf" id="7DRyZmDl4N5" role="33vP2m">
               <node concept="1pGfFk" id="7DRyZmDl4b2" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JPanel.&lt;init&gt;(java.awt.LayoutManager)" resolve="JPanel" />
+                <ref role="37wK5l" to="qqrq:~JBPanel.&lt;init&gt;(java.awt.LayoutManager)" resolve="JBPanel" />
                 <node concept="2ShNRf" id="7DRyZmDng6G" role="37wK5m">
                   <node concept="1pGfFk" id="7DRyZmDnjYj" role="2ShVmc">
                     <ref role="37wK5l" to="z60i:~BorderLayout.&lt;init&gt;()" resolve="BorderLayout" />
@@ -2714,11 +2717,11 @@
           <node concept="3cpWsn" id="jpyKDg2wxD" role="3cpWs9">
             <property role="TrG5h" value="listScroller" />
             <node concept="3uibUv" id="jpyKDg2wxE" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JScrollPane" resolve="JScrollPane" />
+              <ref role="3uigEE" to="qqrq:~JBScrollPane" resolve="JBScrollPane" />
             </node>
             <node concept="2ShNRf" id="jpyKDg2Bn$" role="33vP2m">
               <node concept="1pGfFk" id="jpyKDg2BnA" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JScrollPane.&lt;init&gt;(java.awt.Component,int,int)" resolve="JScrollPane" />
+                <ref role="37wK5l" to="qqrq:~JBScrollPane.&lt;init&gt;(java.awt.Component,int,int)" resolve="JBScrollPane" />
                 <node concept="37vLTw" id="jpyKDg2BnB" role="37wK5m">
                   <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
                 </node>
@@ -3062,6 +3065,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="4EP4zG72nTb" role="3cqZAp" />
         <node concept="3clFbF" id="2Gn1WTgOnVb" role="3cqZAp">
           <node concept="2OqwBi" id="2Gn1WTgOnVc" role="3clFbG">
             <node concept="2OqwBi" id="2Gn1WTgOnVd" role="2Oq$k0">
@@ -3071,7 +3075,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2Gn1WTgOnVg" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
+              <ref role="37wK5l" to="3pb2:~JBTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
               <node concept="2ShNRf" id="2Gn1WTgOnVh" role="37wK5m">
                 <node concept="1pGfFk" id="2Gn1WTgOnVi" role="2ShVmc">
                   <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
@@ -3103,7 +3107,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2Gn1WTgOnVw" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.updateUI()" resolve="updateUI" />
+              <ref role="37wK5l" to="3pb2:~JBTable.updateUI()" resolve="updateUI" />
             </node>
           </node>
         </node>
@@ -3294,7 +3298,7 @@
               <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
             </node>
             <node concept="liA8E" id="jpyKDg2tIG" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
+              <ref role="37wK5l" to="3pb2:~JBTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
               <node concept="37vLTw" id="6wvhQs7njzP" role="37wK5m">
                 <ref role="3cqZAo" node="6wvhQs7njzx" resolve="tm" />
               </node>
@@ -5369,9 +5373,6 @@
     <property role="3GE5qa" value="search" />
     <property role="TrG5h" value="ResultTableModel" />
     <node concept="3Tm1VV" id="jpyKDg1OGI" role="1B3o_S" />
-    <node concept="3uibUv" id="5jGyeU5Xznt" role="EKbjA">
-      <ref role="3uigEE" to="c8ee:~TableModel" resolve="TableModel" />
-    </node>
     <node concept="312cEg" id="jpyKDg1OHg" role="jymVt">
       <property role="TrG5h" value="result" />
       <node concept="3Tm6S6" id="jpyKDg1OHh" role="1B3o_S" />
@@ -5935,6 +5936,9 @@
         <node concept="10Oyi0" id="5jGyeU5X$Pk" role="1tU5fm" />
       </node>
     </node>
+    <node concept="3uibUv" id="5jGyeU5Xznt" role="EKbjA">
+      <ref role="3uigEE" to="c8ee:~TableModel" resolve="TableModel" />
+    </node>
   </node>
   <node concept="Zd50a" id="60jO6Ca_l5b">
     <property role="3GE5qa" value="search" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
index 3dcd57dff99..4db4280e5c7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
@@ -30,6 +30,7 @@
     <dependency reexport="false">8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)</dependency>
     <dependency reexport="false">f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)</dependency>
     <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
+    <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -65,6 +66,7 @@
     <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="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
     <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
     <module reference="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="4" />

From c962c9d5acb90c20230f90da2b6420c2ba0d4697 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 11:25:09 +0100
Subject: [PATCH 02/38] core.base: replace the search icon

---
 .../models/com/mbeddr/core/base/pluginSolution/plugin.mps  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index b6acdb8cd60..a72546b2423 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2820,9 +2820,10 @@
             </node>
             <node concept="2ShNRf" id="2HzhasNzWTB" role="33vP2m">
               <node concept="1pGfFk" id="2HzhasNzWTC" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
-                <node concept="Xl_RD" id="2HzhasNzWTE" role="37wK5m">
-                  <property role="Xl_RC" value="go" />
+                <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(javax.swing.Icon)" resolve="JButton" />
+                <node concept="10M0yZ" id="4EP4zG76c_W" role="37wK5m">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
                 </node>
               </node>
             </node>

From 02c18a523b2507a1d550f0a24fdfb422020aab11 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 11:28:26 +0100
Subject: [PATCH 03/38] core.base: move the search tool to the bottom

---
 .../models/com/mbeddr/core/base/pluginSolution/plugin.mps        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index a72546b2423..2d4aacba360 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2096,7 +2096,6 @@
     <property role="TrG5h" value="MbeddrSearchViewer" />
     <property role="2XNbzY" value="Search" />
     <property role="3GE5qa" value="search" />
-    <property role="2bmUCM" value="2aGS$UDXOxV/RIGHT" />
     <node concept="2XrIbr" id="2HzhasNzPxh" role="2XNbBy">
       <property role="TrG5h" value="setModel" />
       <node concept="3cqZAl" id="2HzhasNzPxn" role="3clF45" />

From 7ce3a3615fd6010efede2fa67b823cebde7a396a Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 12:29:19 +0100
Subject: [PATCH 04/38] core.base: only adjust the icon column of the search
 tool

---
 .../core/base/pluginSolution/plugin.mps       | 364 +++---------------
 1 file changed, 51 insertions(+), 313 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 2d4aacba360..4ff932b1e40 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -110,7 +110,7 @@
     <import index="sud2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui.table(MPS.IDEA/)" />
     <import index="qqrq" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.ui.components(MPS.ThirdParty/)" />
     <import index="3pb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.table(MPS.IDEA/)" />
-    <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" implicit="true" />
+    <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
@@ -2956,7 +2956,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2HzhasNzWTD" role="3cqZAp" />
       </node>
     </node>
     <node concept="3clFb_" id="2HzhasNzNJ3" role="jymVt">
@@ -3305,79 +3304,69 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6wvhQs7ni2U" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7niak" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7ni9S" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7ni3g" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7ni2V" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7ni9z" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7ni9Y" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7ni9Z" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
+        <node concept="3clFbF" id="1GW3SvffHR7" role="3cqZAp">
+          <node concept="1rXfSq" id="1GW3SvffHR5" role="3clFbG">
+            <ref role="37wK5l" node="1GW3SvfftX3" resolve="adjustColumnSizes" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6wvhQs7njzx" role="3clF46">
+        <property role="TrG5h" value="tm" />
+        <node concept="3uibUv" id="6wvhQs7njzy" role="1tU5fm">
+          <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GW3SvffaLw" role="jymVt" />
+    <node concept="3clFb_" id="1GW3SvfftX3" role="jymVt">
+      <property role="TrG5h" value="adjustColumnSizes" />
+      <node concept="3clFbS" id="1GW3SvfftX6" role="3clF47">
+        <node concept="3clFbF" id="1GW3SvfiBU5" role="3cqZAp">
+          <node concept="2OqwBi" id="1GW3SvfiHpF" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfiBU3" role="2Oq$k0">
+              <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
             </node>
-            <node concept="liA8E" id="6wvhQs7niaq" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setWidth(int)" resolve="setWidth" />
-              <node concept="3cmrfG" id="6wvhQs7niar" role="37wK5m">
-                <property role="3cmrfH" value="20" />
+            <node concept="liA8E" id="1GW3SvfiL3j" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int)" resolve="setAutoResizeMode" />
+              <node concept="10M0yZ" id="1GW3SvfiQ8G" role="37wK5m">
+                <ref role="3cqZAo" to="dxuu:~JTable.AUTO_RESIZE_NEXT_COLUMN" resolve="AUTO_RESIZE_NEXT_COLUMN" />
+                <ref role="1PxDUh" to="dxuu:~JTable" resolve="JTable" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6wvhQs7np9z" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7np9$" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7np9_" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7np9A" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7np9B" role="2Oq$k0">
+        <node concept="3cpWs8" id="1GW3SvfiV6s" role="3cqZAp">
+          <node concept="3cpWsn" id="1GW3SvfiV6t" role="3cpWs9">
+            <property role="TrG5h" value="IconColumn" />
+            <node concept="3uibUv" id="1GW3SvfiQ_b" role="1tU5fm">
+              <ref role="3uigEE" to="c8ee:~TableColumn" resolve="TableColumn" />
+            </node>
+            <node concept="2OqwBi" id="1GW3SvfiV6u" role="33vP2m">
+              <node concept="2OqwBi" id="1GW3SvfiV6v" role="2Oq$k0">
+                <node concept="37vLTw" id="1GW3SvfiV6w" role="2Oq$k0">
                   <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
                 </node>
-                <node concept="liA8E" id="6wvhQs7np9C" role="2OqNvi">
+                <node concept="liA8E" id="1GW3SvfiV6x" role="2OqNvi">
                   <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
                 </node>
               </node>
-              <node concept="liA8E" id="6wvhQs7np9D" role="2OqNvi">
+              <node concept="liA8E" id="1GW3SvfiV6y" role="2OqNvi">
                 <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7np9E" role="37wK5m">
+                <node concept="3cmrfG" id="1GW3SvfiV6z" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="6wvhQs7np9F" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMinWidth(int)" resolve="setMinWidth" />
-              <node concept="3cmrfG" id="6wvhQs7np9G" role="37wK5m">
-                <property role="3cmrfH" value="20" />
-              </node>
-            </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6wvhQs7np9H" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7np9I" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7np9J" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7np9K" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7np9L" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7np9M" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7np9N" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7np9O" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
+        <node concept="3clFbF" id="1GW3Svfs06s" role="3cqZAp">
+          <node concept="2OqwBi" id="1GW3Svfs06t" role="3clFbG">
+            <node concept="37vLTw" id="1GW3Svfs06u" role="2Oq$k0">
+              <ref role="3cqZAo" node="1GW3SvfiV6t" resolve="column" />
             </node>
-            <node concept="liA8E" id="6wvhQs7np9P" role="2OqNvi">
+            <node concept="liA8E" id="1GW3Svfs06v" role="2OqNvi">
               <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
-              <node concept="3cmrfG" id="6wvhQs7np9Q" role="37wK5m">
+              <node concept="3cmrfG" id="1GW3Svfs06w" role="37wK5m">
                 <property role="3cmrfH" value="20" />
               </node>
             </node>
@@ -3385,21 +3374,8 @@
         </node>
         <node concept="3clFbF" id="6wvhQs7np9T" role="3cqZAp">
           <node concept="2OqwBi" id="6wvhQs7np9U" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7np9V" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7np9W" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7np9X" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7np9Y" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7np9Z" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7npa0" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="1GW3SvfiV6B" role="2Oq$k0">
+              <ref role="3cqZAo" node="1GW3SvfiV6t" resolve="column" />
             </node>
             <node concept="liA8E" id="6wvhQs7npa1" role="2OqNvi">
               <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
@@ -3409,242 +3385,7 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6wvhQs7nqyU" role="3cqZAp" />
-        <node concept="3clFbF" id="6wvhQs7nnJ1" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nnKg" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nnJO" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nnJn" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nnJ2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nnJt" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nnJU" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nnJV" role="37wK5m">
-                  <property role="3cmrfH" value="1" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nnKm" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMinWidth(int)" resolve="setMinWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nnKn" role="37wK5m">
-                <property role="3cmrfH" value="100" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqyV" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqyW" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqyX" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqyY" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqyZ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqz0" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nqz1" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nqz2" role="37wK5m">
-                  <property role="3cmrfH" value="1" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nqz3" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nqz4" role="37wK5m">
-                <property role="3cmrfH" value="1000" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqz5" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqz6" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqz7" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqz8" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqz9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqza" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nqzb" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nqzc" role="37wK5m">
-                  <property role="3cmrfH" value="1" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nqzd" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nqze" role="37wK5m">
-                <property role="3cmrfH" value="150" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nq$4" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nq$5" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nq$6" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nq$7" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nq$8" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nq$9" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nq$a" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nq$b" role="37wK5m">
-                  <property role="3cmrfH" value="2" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nq$c" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMinWidth(int)" resolve="setMinWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nq$d" role="37wK5m">
-                <property role="3cmrfH" value="100" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqzU" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqzV" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqzW" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqzX" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqzY" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqzZ" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nq$0" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nq$1" role="37wK5m">
-                  <property role="3cmrfH" value="2" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nq$2" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nq$3" role="37wK5m">
-                <property role="3cmrfH" value="1000" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqzK" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqzL" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqzM" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqzN" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqzO" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqzP" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nqzQ" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nqzR" role="37wK5m">
-                  <property role="3cmrfH" value="2" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nqzS" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nqzT" role="37wK5m">
-                <property role="3cmrfH" value="150" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqzA" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqzB" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqzC" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqzD" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqzE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqzF" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nqzG" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nqzH" role="37wK5m">
-                  <property role="3cmrfH" value="3" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nqzI" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMinWidth(int)" resolve="setMinWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nqzJ" role="37wK5m">
-                <property role="3cmrfH" value="100" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqzs" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqzt" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqzu" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqzv" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqzw" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqzx" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nqzy" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nqzz" role="37wK5m">
-                  <property role="3cmrfH" value="3" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nqz$" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nqz_" role="37wK5m">
-                <property role="3cmrfH" value="500" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6wvhQs7nqzi" role="3cqZAp">
-          <node concept="2OqwBi" id="6wvhQs7nqzj" role="3clFbG">
-            <node concept="2OqwBi" id="6wvhQs7nqzk" role="2Oq$k0">
-              <node concept="2OqwBi" id="6wvhQs7nqzl" role="2Oq$k0">
-                <node concept="37vLTw" id="6wvhQs7nqzm" role="2Oq$k0">
-                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                </node>
-                <node concept="liA8E" id="6wvhQs7nqzn" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6wvhQs7nqzo" role="2OqNvi">
-                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
-                <node concept="3cmrfG" id="6wvhQs7nqzp" role="37wK5m">
-                  <property role="3cmrfH" value="3" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6wvhQs7nqzq" role="2OqNvi">
-              <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
-              <node concept="3cmrfG" id="6wvhQs7nqzr" role="37wK5m">
-                <property role="3cmrfH" value="200" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6wvhQs7nqzf" role="3cqZAp" />
+        <node concept="3clFbH" id="1GW3SvfiqmF" role="3cqZAp" />
         <node concept="3clFbF" id="jpyKDg2tIK" role="3cqZAp">
           <node concept="2OqwBi" id="jpyKDg2tIL" role="3clFbG">
             <node concept="37vLTw" id="jpyKDg2tIM" role="2Oq$k0">
@@ -3656,13 +3397,10 @@
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6wvhQs7njzx" role="3clF46">
-        <property role="TrG5h" value="tm" />
-        <node concept="3uibUv" id="6wvhQs7njzy" role="1tU5fm">
-          <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
-        </node>
-      </node>
+      <node concept="3Tm6S6" id="1GW3SvfflVa" role="1B3o_S" />
+      <node concept="3cqZAl" id="1GW3SvffqpK" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="1GW3SvffaLy" role="jymVt" />
     <node concept="3clFb_" id="jpyKDg2SuJ" role="jymVt">
       <property role="TrG5h" value="openSelectionInEditor" />
       <node concept="3Tm6S6" id="jpyKDg2SuK" role="1B3o_S" />

From d9e5cec08b9d1ba685c99f997e10650c34d3733c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 12:34:16 +0100
Subject: [PATCH 05/38] core.base: remove creating ellises of label in search
 labels

---
 .../core/base/pluginSolution/plugin.mps       | 43 -------------------
 1 file changed, 43 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 4ff932b1e40..0d99609be95 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -4626,49 +4626,6 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="3clFbJ" id="7DRyZmErXyr" role="3cqZAp">
-                                                    <node concept="3clFbS" id="7DRyZmErXyt" role="3clFbx">
-                                                      <node concept="3clFbF" id="7DRyZmEscKr" role="3cqZAp">
-                                                        <node concept="37vLTI" id="7DRyZmEsenf" role="3clFbG">
-                                                          <node concept="3cpWs3" id="7DRyZmEsEKJ" role="37vLTx">
-                                                            <node concept="Xl_RD" id="7DRyZmEsFdT" role="3uHU7w">
-                                                              <property role="Xl_RC" value="..." />
-                                                            </node>
-                                                            <node concept="2OqwBi" id="7DRyZmEshiu" role="3uHU7B">
-                                                              <node concept="37vLTw" id="7DRyZmEsfFg" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="7DRyZmErRzm" resolve="label" />
-                                                              </node>
-                                                              <node concept="liA8E" id="7DRyZmEsjex" role="2OqNvi">
-                                                                <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
-                                                                <node concept="3cmrfG" id="7DRyZmEsuUF" role="37wK5m">
-                                                                  <property role="3cmrfH" value="0" />
-                                                                </node>
-                                                                <node concept="3cmrfG" id="7DRyZmEsA2U" role="37wK5m">
-                                                                  <property role="3cmrfH" value="30" />
-                                                                </node>
-                                                              </node>
-                                                            </node>
-                                                          </node>
-                                                          <node concept="37vLTw" id="7DRyZmEscKp" role="37vLTJ">
-                                                            <ref role="3cqZAo" node="7DRyZmErRzm" resolve="label" />
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                    <node concept="3eOSWO" id="7DRyZmEs6_I" role="3clFbw">
-                                                      <node concept="3cmrfG" id="7DRyZmEs72S" role="3uHU7w">
-                                                        <property role="3cmrfH" value="30" />
-                                                      </node>
-                                                      <node concept="2OqwBi" id="7DRyZmEs0Fb" role="3uHU7B">
-                                                        <node concept="37vLTw" id="7DRyZmErZk4" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="7DRyZmErRzm" resolve="label" />
-                                                        </node>
-                                                        <node concept="liA8E" id="7DRyZmEs1PQ" role="2OqNvi">
-                                                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                  </node>
                                                   <node concept="3clFbJ" id="7DRyZmEEif8" role="3cqZAp">
                                                     <node concept="3clFbS" id="7DRyZmEEif9" role="3clFbx">
                                                       <node concept="3clFbF" id="7DRyZmEEifa" role="3cqZAp">

From 194ad706d1dfeeccee9cd2c2f4c4f6ed82d7b64b Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 12:38:08 +0100
Subject: [PATCH 06/38] core.base: don't use the global repository in the
 search tool

---
 .../core/base/pluginSolution/plugin.mps       | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 0d99609be95..e6f2e30c47d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2958,12 +2958,14 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfBzhC" role="jymVt" />
     <node concept="3clFb_" id="2HzhasNzNJ3" role="jymVt">
       <property role="TrG5h" value="dispose" />
       <node concept="3Tm1VV" id="2HzhasNzNJ4" role="1B3o_S" />
       <node concept="3cqZAl" id="2HzhasNzNJ5" role="3clF45" />
       <node concept="3clFbS" id="2HzhasNzNJ6" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="1GW3SvfBC1$" role="jymVt" />
     <node concept="3clFb_" id="jpyKDg0M3F" role="jymVt">
       <property role="TrG5h" value="setModel" />
       <node concept="3cqZAl" id="jpyKDg0M3G" role="3clF45" />
@@ -3004,6 +3006,7 @@
         <node concept="H_c77" id="jpyKDg0M3U" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfBGLw" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgNQ7i" role="jymVt">
       <property role="TrG5h" value="setSolution" />
       <node concept="3cqZAl" id="2Gn1WTgNQ7j" role="3clF45" />
@@ -3046,6 +3049,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfBLxs" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgOnVE" role="jymVt">
       <property role="TrG5h" value="cleanUp" />
       <node concept="3Tm6S6" id="2Gn1WTgOnVF" role="1B3o_S" />
@@ -3078,6 +3082,17 @@
               <node concept="2ShNRf" id="2Gn1WTgOnVh" role="37wK5m">
                 <node concept="1pGfFk" id="2Gn1WTgOnVi" role="2ShVmc">
                   <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
+                  <node concept="2OqwBi" id="1GW3SvfBbMr" role="37wK5m">
+                    <node concept="2OqwBi" id="1GW3SvfAZNn" role="2Oq$k0">
+                      <node concept="Xjq3P" id="1GW3SvfARdM" role="2Oq$k0" />
+                      <node concept="2OwXpG" id="1GW3SvfB3Ef" role="2OqNvi">
+                        <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1GW3SvfBg$C" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                    </node>
+                  </node>
                   <node concept="10Nm6u" id="2Gn1WTgOnVj" role="37wK5m" />
                 </node>
               </node>
@@ -3125,6 +3140,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfBQho" role="jymVt" />
     <node concept="3clFb_" id="jpyKDg2tIn" role="jymVt">
       <property role="TrG5h" value="runSearch" />
       <node concept="3Tm6S6" id="jpyKDg2tIo" role="1B3o_S" />
@@ -3187,6 +3203,17 @@
                 <node concept="2ShNRf" id="jpyKDg2tIH" role="37wK5m">
                   <node concept="1pGfFk" id="jpyKDg2tII" role="2ShVmc">
                     <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
+                    <node concept="2OqwBi" id="1GW3SvfBjDL" role="37wK5m">
+                      <node concept="2OqwBi" id="1GW3SvfBjDM" role="2Oq$k0">
+                        <node concept="Xjq3P" id="1GW3SvfBjDN" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="1GW3SvfBjDO" role="2OqNvi">
+                          <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1GW3SvfBjDP" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
                     <node concept="37vLTw" id="5Hxjapwgwuz" role="37wK5m">
                       <ref role="3cqZAo" node="jpyKDg2tIm" resolve="result" />
                     </node>
@@ -3262,6 +3289,17 @@
                 <node concept="2ShNRf" id="2Gn1WTgPaZk" role="37wK5m">
                   <node concept="1pGfFk" id="2Gn1WTgPaZl" role="2ShVmc">
                     <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
+                    <node concept="2OqwBi" id="1GW3SvfBmI2" role="37wK5m">
+                      <node concept="2OqwBi" id="1GW3SvfBmI3" role="2Oq$k0">
+                        <node concept="Xjq3P" id="1GW3SvfBmI4" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="1GW3SvfBmI5" role="2OqNvi">
+                          <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1GW3SvfBmI6" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
                     <node concept="37vLTw" id="2Gn1WTgPaZm" role="37wK5m">
                       <ref role="3cqZAo" node="2Gn1WTgPaZ9" resolve="result" />
                     </node>
@@ -3286,6 +3324,7 @@
         <node concept="10P_77" id="7DRyZmDokoK" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfBplv" role="jymVt" />
     <node concept="3clFb_" id="6wvhQs7njzg" role="jymVt">
       <property role="TrG5h" value="setTableModel" />
       <node concept="3cqZAl" id="6wvhQs7njzh" role="3clF45" />
@@ -5077,10 +5116,31 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="1GW3SvfAtF8" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <node concept="3Tm6S6" id="1GW3SvfAsVi" role="1B3o_S" />
+      <node concept="3uibUv" id="1GW3SvfAtyO" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GW3SvfArqh" role="jymVt" />
     <node concept="3clFbW" id="jpyKDg1OH8" role="jymVt">
       <node concept="3cqZAl" id="jpyKDg1OH9" role="3clF45" />
       <node concept="3Tm1VV" id="jpyKDg1OHa" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg1OHb" role="3clF47">
+        <node concept="3clFbF" id="1GW3SvfAvVr" role="3cqZAp">
+          <node concept="37vLTI" id="1GW3SvfAwZl" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfAymN" role="37vLTx">
+              <ref role="3cqZAo" node="1GW3SvfAu7e" resolve="repository" />
+            </node>
+            <node concept="2OqwBi" id="1GW3SvfAwdC" role="37vLTJ">
+              <node concept="Xjq3P" id="1GW3SvfAvVp" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1GW3SvfAwyi" role="2OqNvi">
+                <ref role="2Oxat5" node="1GW3SvfAtF8" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="jpyKDg1OHn" role="3cqZAp">
           <node concept="37vLTI" id="jpyKDg1OI9" role="3clFbG">
             <node concept="37vLTw" id="jpyKDg1OIc" role="37vLTx">
@@ -5095,6 +5155,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="1GW3SvfAu7e" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="1GW3SvfAurc" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
       <node concept="37vLTG" id="jpyKDg1OHc" role="3clF46">
         <property role="TrG5h" value="res" />
         <node concept="_YKpA" id="jpyKDg1OHd" role="1tU5fm">
@@ -5104,6 +5170,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfAywI" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xznu" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getRowCount" />
@@ -5136,6 +5203,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfAzSO" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzny" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getColumnCount" />
@@ -5150,6 +5218,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfAzsh" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5XznA" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getColumnName" />
@@ -5222,6 +5291,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfA$Iu" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5XznI" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getColumnClass" />
@@ -5260,6 +5330,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfA_b1" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5XznR" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="isCellEditable" />
@@ -5280,6 +5351,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfA_B$" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgZUvE" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getModelAt" />
@@ -5311,6 +5383,7 @@
         <node concept="10Oyi0" id="2Gn1WTgZVY6" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfAA47" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzo1" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getValueAt" />
@@ -5451,6 +5524,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="1GW3SvfAAIL" role="ukAjM">
+                  <ref role="3cqZAo" node="1GW3SvfAtF8" resolve="repository" />
+                </node>
               </node>
               <node concept="3cpWs6" id="5jGyeU5XzqK" role="3cqZAp">
                 <node concept="37vLTw" id="19PERUGKUiI" role="3cqZAk">

From 96f16649f0a9a1d78b01de2fa6d9a95bc5a58ef1 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 14:19:46 +0100
Subject: [PATCH 07/38] core.base: use a toolbar for the buttons in the search
 tool

---
 .../core/base/pluginSolution/plugin.mps       | 661 +++++++++++-------
 1 file changed, 396 insertions(+), 265 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index e6f2e30c47d..411a52bae2e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -111,6 +111,8 @@
     <import index="qqrq" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.ui.components(MPS.ThirdParty/)" />
     <import index="3pb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.table(MPS.IDEA/)" />
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" />
+    <import index="82te" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.ui.util(MPS.Platform/)" />
+    <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
@@ -214,6 +216,9 @@
       <concept id="1208528650020" name="jetbrains.mps.lang.plugin.structure.ToolType" flags="in" index="1xUVSX">
         <reference id="1208529537963" name="tool" index="1xYkEM" />
       </concept>
+      <concept id="3205675194086589964" name="jetbrains.mps.lang.plugin.structure.ActionAccessOperation" flags="nn" index="3$FdUm">
+        <reference id="3205675194086671728" name="action" index="3$FpRE" />
+      </concept>
       <concept id="1217252042208" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterDeclaration" flags="ng" index="1DS2jV">
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
@@ -2351,8 +2356,8 @@
     <property role="TrG5h" value="SearchViewer" />
     <property role="3GE5qa" value="search" />
     <node concept="3Tm1VV" id="2HzhasNzNEX" role="1B3o_S" />
-    <node concept="3uibUv" id="2HzhasNzNEY" role="1zkMxy">
-      <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
+    <node concept="3uibUv" id="1GW3SvfI5RI" role="1zkMxy">
+      <ref role="3uigEE" to="jkm4:~SimpleToolWindowPanel" resolve="SimpleToolWindowPanel" />
     </node>
     <node concept="312cEg" id="2HzhasNzNGZ" role="jymVt">
       <property role="TrG5h" value="myProject" />
@@ -2382,22 +2387,9 @@
       </node>
       <node concept="2ShNRf" id="jpyKDg1Mqs" role="33vP2m">
         <node concept="1pGfFk" id="jpyKDg1MMr" role="2ShVmc">
-          <ref role="37wK5l" to="qqrq:~JBTextField.&lt;init&gt;()" resolve="JBTextField" />
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="7DRyZmDjH3S" role="jymVt">
-      <property role="TrG5h" value="searchAll" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="7DRyZmDjH3T" role="1B3o_S" />
-      <node concept="3uibUv" id="7DRyZmDjJ7K" role="1tU5fm">
-        <ref role="3uigEE" to="qqrq:~JBCheckBox" resolve="JBCheckBox" />
-      </node>
-      <node concept="2ShNRf" id="7DRyZmDjH3V" role="33vP2m">
-        <node concept="1pGfFk" id="7DRyZmDkgDI" role="2ShVmc">
-          <ref role="37wK5l" to="qqrq:~JBCheckBox.&lt;init&gt;(java.lang.String)" resolve="JBCheckBox" />
-          <node concept="Xl_RD" id="7DRyZmDkhhS" role="37wK5m">
-            <property role="Xl_RC" value="all" />
+          <ref role="37wK5l" to="qqrq:~JBTextField.&lt;init&gt;(int)" resolve="JBTextField" />
+          <node concept="3cmrfG" id="6KjVnJoBVk7" role="37wK5m">
+            <property role="3cmrfH" value="200" />
           </node>
         </node>
       </node>
@@ -2415,6 +2407,13 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="1GW3SvfTEs3" role="jymVt">
+      <property role="TrG5h" value="searchAll" />
+      <node concept="3Tm6S6" id="1GW3SvfTpNl" role="1B3o_S" />
+      <node concept="10P_77" id="1GW3SvfTsEI" role="1tU5fm" />
+      <node concept="3clFbT" id="1GW3SvfTLCa" role="33vP2m" />
+    </node>
+    <node concept="2tJIrI" id="1GW3SvfSRyG" role="jymVt" />
     <node concept="3clFbW" id="2HzhasNzNH5" role="jymVt">
       <node concept="3Tm1VV" id="2HzhasNzNH6" role="1B3o_S" />
       <node concept="3cqZAl" id="2HzhasNzNH7" role="3clF45" />
@@ -2432,6 +2431,10 @@
         </node>
       </node>
       <node concept="3clFbS" id="2HzhasNzNHc" role="3clF47">
+        <node concept="XkiVB" id="1GW3SvfJ3Z6" role="3cqZAp">
+          <ref role="37wK5l" to="jkm4:~SimpleToolWindowPanel.&lt;init&gt;(boolean)" resolve="SimpleToolWindowPanel" />
+          <node concept="3clFbT" id="1GW3SvfJnCP" role="37wK5m" />
+        </node>
         <node concept="3clFbF" id="2HzhasNzNHj" role="3cqZAp">
           <node concept="37vLTI" id="2HzhasNzNHk" role="3clFbG">
             <node concept="37vLTw" id="2HzhasNzNHl" role="37vLTJ">
@@ -2502,121 +2505,16 @@
             </node>
             <node concept="liA8E" id="2HzhasNzV0l" role="2OqNvi">
               <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager)" resolve="setLayout" />
-              <node concept="2ShNRf" id="2HzhasNzV0B" role="37wK5m">
-                <node concept="1pGfFk" id="2HzhasNzV0F" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~GridLayout.&lt;init&gt;(int,int)" resolve="GridLayout" />
-                  <node concept="3cmrfG" id="2HzhasNzV0G" role="37wK5m">
-                    <property role="3cmrfH" value="1" />
-                  </node>
-                  <node concept="3cmrfG" id="2HzhasNzV0I" role="37wK5m">
-                    <property role="3cmrfH" value="1" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2HzhasNzWRG" role="3cqZAp" />
-        <node concept="3cpWs8" id="2HzhasNzWRM" role="3cqZAp">
-          <node concept="3cpWsn" id="2HzhasNzWRN" role="3cpWs9">
-            <property role="TrG5h" value="searchPanel" />
-            <node concept="3uibUv" id="2HzhasNzWRO" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
-            </node>
-            <node concept="2ShNRf" id="2HzhasNzWRQ" role="33vP2m">
-              <node concept="1pGfFk" id="2HzhasNzWRR" role="2ShVmc">
-                <ref role="37wK5l" to="qqrq:~JBPanel.&lt;init&gt;()" resolve="JBPanel" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2HzhasNzWRT" role="3cqZAp">
-          <node concept="2OqwBi" id="2HzhasNzWSb" role="3clFbG">
-            <node concept="37vLTw" id="2HzhasNzWRU" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWRN" resolve="searchPanel" />
-            </node>
-            <node concept="liA8E" id="2HzhasNzWSh" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager)" resolve="setLayout" />
-              <node concept="2ShNRf" id="2HzhasNzWSi" role="37wK5m">
-                <node concept="1pGfFk" id="2HzhasNzWSm" role="2ShVmc">
+              <node concept="2ShNRf" id="6KjVnJozm$0" role="37wK5m">
+                <node concept="1pGfFk" id="6KjVnJozvq3" role="2ShVmc">
+                  <property role="373rjd" value="true" />
                   <ref role="37wK5l" to="z60i:~BorderLayout.&lt;init&gt;()" resolve="BorderLayout" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2HzhasNzWTu" role="3cqZAp" />
-        <node concept="3clFbF" id="2HzhasNzWSo" role="3cqZAp">
-          <node concept="2OqwBi" id="2HzhasNzWSE" role="3clFbG">
-            <node concept="37vLTw" id="2HzhasNzWSp" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWRN" resolve="searchPanel" />
-            </node>
-            <node concept="liA8E" id="2HzhasNzWSK" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="jpyKDg2gTY" role="37wK5m">
-                <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
-              </node>
-              <node concept="10M0yZ" id="2HzhasNzWT3" role="37wK5m">
-                <ref role="1PxDUh" to="z60i:~BorderLayout" resolve="BorderLayout" />
-                <ref role="3cqZAo" to="z60i:~BorderLayout.CENTER" resolve="CENTER" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7DRyZmDkY$h" role="3cqZAp" />
-        <node concept="3cpWs8" id="7DRyZmDl2ww" role="3cqZAp">
-          <node concept="3cpWsn" id="7DRyZmDl2wx" role="3cpWs9">
-            <property role="TrG5h" value="eastPanel" />
-            <node concept="3uibUv" id="7DRyZmDl2wy" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
-            </node>
-            <node concept="2ShNRf" id="7DRyZmDl4N5" role="33vP2m">
-              <node concept="1pGfFk" id="7DRyZmDl4b2" role="2ShVmc">
-                <ref role="37wK5l" to="qqrq:~JBPanel.&lt;init&gt;(java.awt.LayoutManager)" resolve="JBPanel" />
-                <node concept="2ShNRf" id="7DRyZmDng6G" role="37wK5m">
-                  <node concept="1pGfFk" id="7DRyZmDnjYj" role="2ShVmc">
-                    <ref role="37wK5l" to="z60i:~BorderLayout.&lt;init&gt;()" resolve="BorderLayout" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7DRyZmDkhkO" role="3cqZAp">
-          <node concept="2OqwBi" id="7DRyZmDkhkP" role="3clFbG">
-            <node concept="37vLTw" id="7DRyZmDkhkQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWRN" resolve="searchPanel" />
-            </node>
-            <node concept="liA8E" id="7DRyZmDkhkR" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="7DRyZmDl6vT" role="37wK5m">
-                <ref role="3cqZAo" node="7DRyZmDl2wx" resolve="eastPanel" />
-              </node>
-              <node concept="10M0yZ" id="7DRyZmDkjSH" role="37wK5m">
-                <ref role="3cqZAo" to="z60i:~BorderLayout.EAST" resolve="EAST" />
-                <ref role="1PxDUh" to="z60i:~BorderLayout" resolve="BorderLayout" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7DRyZmDl9dN" role="3cqZAp">
-          <node concept="2OqwBi" id="7DRyZmDlb4Y" role="3clFbG">
-            <node concept="37vLTw" id="7DRyZmDl9dL" role="2Oq$k0">
-              <ref role="3cqZAo" node="7DRyZmDl2wx" resolve="eastPanel" />
-            </node>
-            <node concept="liA8E" id="7DRyZmDlcIV" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="7DRyZmDldZC" role="37wK5m">
-                <ref role="3cqZAo" node="7DRyZmDjH3S" resolve="searchAll" />
-              </node>
-              <node concept="10M0yZ" id="7DRyZmDnnUl" role="37wK5m">
-                <ref role="3cqZAo" to="z60i:~BorderLayout.WEST" resolve="WEST" />
-                <ref role="1PxDUh" to="z60i:~BorderLayout" resolve="BorderLayout" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="jpyKDg2wwU" role="3cqZAp" />
+        <node concept="3clFbH" id="2HzhasNzWRG" role="3cqZAp" />
         <node concept="3clFbF" id="2HzhasNzWL4" role="3cqZAp">
           <node concept="2OqwBi" id="2HzhasNzWLm" role="3clFbG">
             <node concept="37vLTw" id="jpyKDg1MN7" role="2Oq$k0">
@@ -2673,13 +2571,8 @@
                             <node concept="3clFbF" id="jpyKDg2tLm" role="3cqZAp">
                               <node concept="3P9mCS" id="jpyKDg2tLn" role="3clFbG">
                                 <ref role="37wK5l" node="jpyKDg2tIn" resolve="runSearch" />
-                                <node concept="2OqwBi" id="7DRyZmDoecU" role="37wK5m">
-                                  <node concept="37vLTw" id="7DRyZmDocJt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7DRyZmDjH3S" resolve="searchAll" />
-                                  </node>
-                                  <node concept="liA8E" id="7DRyZmDoh2A" role="2OqNvi">
-                                    <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
-                                  </node>
+                                <node concept="1rXfSq" id="1GW3SvfWykh" role="37wK5m">
+                                  <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
                                 </node>
                               </node>
                             </node>
@@ -2694,19 +2587,19 @@
           </node>
         </node>
         <node concept="3clFbH" id="2HzhasNzWSO" role="3cqZAp" />
-        <node concept="3clFbF" id="2HzhasNzYgh" role="3cqZAp">
-          <node concept="2OqwBi" id="2HzhasNzYgz" role="3clFbG">
-            <node concept="37vLTw" id="2HzhasNzYgi" role="2Oq$k0">
+        <node concept="3clFbF" id="6KjVnJoO74C" role="3cqZAp">
+          <node concept="2OqwBi" id="6KjVnJoOcnA" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJoO74A" role="2Oq$k0">
               <ref role="3cqZAo" node="2HzhasNzUYU" resolve="topPanel" />
             </node>
-            <node concept="liA8E" id="2HzhasNzYgD" role="2OqNvi">
+            <node concept="liA8E" id="6KjVnJoOj3b" role="2OqNvi">
               <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="2HzhasNzYgE" role="37wK5m">
-                <ref role="3cqZAo" node="2HzhasNzWRN" resolve="searchPanel" />
+              <node concept="37vLTw" id="6KjVnJoSHaB" role="37wK5m">
+                <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
               </node>
-              <node concept="10M0yZ" id="jpyKDg2Bog" role="37wK5m">
+              <node concept="10M0yZ" id="6KjVnJoO_i2" role="37wK5m">
+                <ref role="3cqZAo" to="z60i:~BorderLayout.CENTER" resolve="CENTER" />
                 <ref role="1PxDUh" to="z60i:~BorderLayout" resolve="BorderLayout" />
-                <ref role="3cqZAo" to="z60i:~BorderLayout.NORTH" resolve="NORTH" />
               </node>
             </node>
           </node>
@@ -2810,155 +2703,123 @@
           </node>
         </node>
         <node concept="3clFbH" id="2HzhasN$aAA" role="3cqZAp" />
-        <node concept="3cpWs8" id="2HzhasNzWTz" role="3cqZAp">
-          <node concept="3cpWsn" id="2HzhasNzWT$" role="3cpWs9">
-            <property role="TrG5h" value="searchButton" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="2HzhasNzWT_" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
+        <node concept="3cpWs8" id="3sIEoj5JplF" role="3cqZAp">
+          <node concept="3cpWsn" id="3sIEoj5JplG" role="3cpWs9">
+            <property role="TrG5h" value="group" />
+            <node concept="3uibUv" id="3sIEoj5JplH" role="1tU5fm">
+              <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
             </node>
-            <node concept="2ShNRf" id="2HzhasNzWTB" role="33vP2m">
-              <node concept="1pGfFk" id="2HzhasNzWTC" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(javax.swing.Icon)" resolve="JButton" />
-                <node concept="10M0yZ" id="4EP4zG76c_W" role="37wK5m">
-                  <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-                  <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
-                </node>
+            <node concept="2ShNRf" id="3sIEoj5JplI" role="33vP2m">
+              <node concept="1pGfFk" id="3sIEoj5JplJ" role="2ShVmc">
+                <ref role="37wK5l" to="qkt:~DefaultActionGroup.&lt;init&gt;()" resolve="DefaultActionGroup" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="jpyKDg2l2o" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg2l2I" role="3clFbG">
-            <node concept="37vLTw" id="jpyKDg2l2p" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWT$" resolve="searchButton" />
-            </node>
-            <node concept="liA8E" id="jpyKDg2l2O" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setMinimumSize(java.awt.Dimension)" resolve="setMinimumSize" />
-              <node concept="2ShNRf" id="jpyKDg2mpR" role="37wK5m">
-                <node concept="1pGfFk" id="jpyKDg2mSN" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                  <node concept="3cmrfG" id="jpyKDg2mTB" role="37wK5m">
-                    <property role="3cmrfH" value="30" />
-                  </node>
-                  <node concept="3cmrfG" id="jpyKDg2mTD" role="37wK5m">
-                    <property role="3cmrfH" value="8" />
-                  </node>
-                </node>
-              </node>
+        <node concept="3clFbF" id="3sIEoj5MSUV" role="3cqZAp">
+          <node concept="1rXfSq" id="3sIEoj5MSUU" role="3clFbG">
+            <ref role="37wK5l" node="6ysF3v1j_gh" resolve="registerActions" />
+            <node concept="37vLTw" id="3sIEoj5N23L" role="37wK5m">
+              <ref role="3cqZAo" node="3sIEoj5JplG" resolve="group" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="jpyKDg2mTE" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg2mTF" role="3clFbG">
-            <node concept="37vLTw" id="jpyKDg2mTG" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWT$" resolve="searchButton" />
+        <node concept="3cpWs8" id="3sIEoj5Jpmt" role="3cqZAp">
+          <node concept="3cpWsn" id="3sIEoj5Jpmu" role="3cpWs9">
+            <property role="TrG5h" value="toolbar" />
+            <node concept="3uibUv" id="3sIEoj5Jpmv" role="1tU5fm">
+              <ref role="3uigEE" to="qkt:~ActionToolbar" resolve="ActionToolbar" />
             </node>
-            <node concept="liA8E" id="jpyKDg2mTH" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setMaximumSize(java.awt.Dimension)" resolve="setMaximumSize" />
-              <node concept="2ShNRf" id="jpyKDg2mTI" role="37wK5m">
-                <node concept="1pGfFk" id="jpyKDg2mTJ" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                  <node concept="3cmrfG" id="jpyKDg2mTK" role="37wK5m">
-                    <property role="3cmrfH" value="30" />
-                  </node>
-                  <node concept="3cmrfG" id="jpyKDg2mTL" role="37wK5m">
-                    <property role="3cmrfH" value="8" />
-                  </node>
+            <node concept="2OqwBi" id="3sIEoj5Jpmw" role="33vP2m">
+              <node concept="2YIFZM" id="3sIEoj5Jpmx" role="2Oq$k0">
+                <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
+                <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="3sIEoj5Jpmy" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~ActionManager.createActionToolbar(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,boolean)" resolve="createActionToolbar" />
+                <node concept="10M0yZ" id="3sIEoj5Jpmz" role="37wK5m">
+                  <ref role="1PxDUh" to="qkt:~ActionPlaces" resolve="ActionPlaces" />
+                  <ref role="3cqZAo" to="qkt:~ActionPlaces.TOOLBAR" resolve="TOOLBAR" />
+                </node>
+                <node concept="37vLTw" id="46QvZZVPOHu" role="37wK5m">
+                  <ref role="3cqZAo" node="3sIEoj5JplG" resolve="group" />
+                </node>
+                <node concept="3clFbT" id="3sIEoj5Jpm_" role="37wK5m">
+                  <property role="3clFbU" value="false" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="jpyKDg2mTM" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg2mTN" role="3clFbG">
-            <node concept="37vLTw" id="jpyKDg2mTO" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWT$" resolve="searchButton" />
+        <node concept="3clFbF" id="4Pz0ne7QNB2" role="3cqZAp">
+          <node concept="2OqwBi" id="4Pz0ne7QObc" role="3clFbG">
+            <node concept="37vLTw" id="4Pz0ne7QNB0" role="2Oq$k0">
+              <ref role="3cqZAo" node="3sIEoj5Jpmu" resolve="toolbar" />
             </node>
-            <node concept="liA8E" id="jpyKDg2mTP" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
-              <node concept="2ShNRf" id="jpyKDg2mTQ" role="37wK5m">
-                <node concept="1pGfFk" id="jpyKDg2mTR" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                  <node concept="3cmrfG" id="jpyKDg2mTS" role="37wK5m">
-                    <property role="3cmrfH" value="30" />
-                  </node>
-                  <node concept="3cmrfG" id="jpyKDg2mTT" role="37wK5m">
-                    <property role="3cmrfH" value="8" />
-                  </node>
-                </node>
-              </node>
+            <node concept="liA8E" id="4Pz0ne7QOpX" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~ActionToolbar.setTargetComponent(javax.swing.JComponent)" resolve="setTargetComponent" />
+              <node concept="Xjq3P" id="1GW3SvfPaI5" role="37wK5m" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2HzhasNzWTJ" role="3cqZAp">
-          <node concept="2OqwBi" id="2HzhasNzWU1" role="3clFbG">
-            <node concept="37vLTw" id="7DRyZmDm_EU" role="2Oq$k0">
-              <ref role="3cqZAo" node="7DRyZmDl2wx" resolve="eastPanel" />
-            </node>
-            <node concept="liA8E" id="2HzhasNzWU7" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="7DRyZmDmAqV" role="37wK5m">
-                <ref role="3cqZAo" node="2HzhasNzWT$" resolve="searchButton" />
+        <node concept="3clFbF" id="1mPs3EDYgl$" role="3cqZAp">
+          <node concept="1rXfSq" id="1mPs3EDYgly" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~SimpleToolWindowPanel.setToolbar(javax.swing.JComponent)" resolve="setToolbar" />
+            <node concept="2OqwBi" id="1mPs3EDYjUf" role="37wK5m">
+              <node concept="37vLTw" id="1mPs3EDYiPu" role="2Oq$k0">
+                <ref role="3cqZAo" node="3sIEoj5Jpmu" resolve="toolbar" />
               </node>
-              <node concept="10M0yZ" id="7DRyZmDnqSG" role="37wK5m">
-                <ref role="3cqZAo" to="z60i:~BorderLayout.CENTER" resolve="CENTER" />
-                <ref role="1PxDUh" to="z60i:~BorderLayout" resolve="BorderLayout" />
+              <node concept="liA8E" id="1mPs3EDYnxS" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2HzhasN$akf" role="3cqZAp">
-          <node concept="2OqwBi" id="2HzhasN$akx" role="3clFbG">
-            <node concept="37vLTw" id="2HzhasN$akg" role="2Oq$k0">
-              <ref role="3cqZAo" node="2HzhasNzWT$" resolve="searchButton" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GW3SvfJERX" role="jymVt" />
+    <node concept="3clFb_" id="6ysF3v1j_gh" role="jymVt">
+      <property role="TrG5h" value="registerActions" />
+      <node concept="3Tmbuc" id="4gO8Grv2szj" role="1B3o_S" />
+      <node concept="3cqZAl" id="3sIEoj5OA4K" role="3clF45" />
+      <node concept="3clFbS" id="6ysF3v1j_gm" role="3clF47">
+        <node concept="3clFbF" id="1GW3SvfX8wa" role="3cqZAp">
+          <node concept="2OqwBi" id="1GW3SvfXbZb" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfX8w8" role="2Oq$k0">
+              <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
             </node>
-            <node concept="liA8E" id="2HzhasN$akB" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
-              <node concept="2ShNRf" id="2HzhasN$akC" role="37wK5m">
-                <node concept="YeOm9" id="2HzhasN$akG" role="2ShVmc">
-                  <node concept="1Y3b0j" id="2HzhasN$akH" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <node concept="3Tm1VV" id="2HzhasN$akI" role="1B3o_S" />
-                    <node concept="3clFb_" id="2HzhasN$akJ" role="jymVt">
-                      <property role="1EzhhJ" value="false" />
-                      <property role="TrG5h" value="actionPerformed" />
-                      <property role="DiZV1" value="false" />
-                      <node concept="3Tm1VV" id="2HzhasN$akK" role="1B3o_S" />
-                      <node concept="3cqZAl" id="2HzhasN$akL" role="3clF45" />
-                      <node concept="37vLTG" id="2HzhasN$akM" role="3clF46">
-                        <property role="TrG5h" value="p0" />
-                        <node concept="3uibUv" id="2HzhasN$akN" role="1tU5fm">
-                          <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="2HzhasN$akO" role="3clF47">
-                        <node concept="3clFbF" id="jpyKDg2tIO" role="3cqZAp">
-                          <node concept="3P9mCS" id="jpyKDg2tIP" role="3clFbG">
-                            <ref role="37wK5l" node="jpyKDg2tIn" resolve="runSearch" />
-                            <node concept="2OqwBi" id="7DRyZmDo7d2" role="37wK5m">
-                              <node concept="37vLTw" id="7DRyZmDo5JD" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7DRyZmDjH3S" resolve="searchAll" />
-                              </node>
-                              <node concept="liA8E" id="7DRyZmDojXY" role="2OqNvi">
-                                <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+            <node concept="liA8E" id="1GW3SvfXhFR" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+              <node concept="2ShNRf" id="1GW3SvfRAwn" role="37wK5m">
+                <node concept="1pGfFk" id="1GW3SvfS72I" role="2ShVmc">
+                  <ref role="37wK5l" node="1GW3SvfRWTF" resolve="SearchAllToggleAction" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6ysF3v1j_gs" role="3cqZAp">
+          <node concept="2OqwBi" id="6ysF3v1j_gt" role="3clFbG">
+            <node concept="37vLTw" id="791RMwCWCHr" role="2Oq$k0">
+              <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
+            </node>
+            <node concept="liA8E" id="6ysF3v1j_gv" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+              <node concept="3$FdUm" id="1GW3SvfQP1l" role="37wK5m">
+                <ref role="3$FpRE" node="1GW3SvfQllV" resolve="MbeddrSearch" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="3sIEoj5P59E" role="3clF46">
+        <property role="TrG5h" value="group" />
+        <node concept="3uibUv" id="3sIEoj5P59D" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
+        </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1GW3SvfBzhC" role="jymVt" />
+    <node concept="2tJIrI" id="1GW3SvfLS3K" role="jymVt" />
     <node concept="3clFb_" id="2HzhasNzNJ3" role="jymVt">
       <property role="TrG5h" value="dispose" />
       <node concept="3Tm1VV" id="2HzhasNzNJ4" role="1B3o_S" />
@@ -3143,7 +3004,7 @@
     <node concept="2tJIrI" id="1GW3SvfBQho" role="jymVt" />
     <node concept="3clFb_" id="jpyKDg2tIn" role="jymVt">
       <property role="TrG5h" value="runSearch" />
-      <node concept="3Tm6S6" id="jpyKDg2tIo" role="1B3o_S" />
+      <node concept="3Tm1VV" id="1GW3SvfYRm_" role="1B3o_S" />
       <node concept="3cqZAl" id="jpyKDg2tIp" role="3clF45" />
       <node concept="3clFbS" id="jpyKDg2tIq" role="3clF47">
         <node concept="3clFbJ" id="2Gn1WTgOYVW" role="3cqZAp">
@@ -3398,6 +3259,15 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="1GW3SvfZSD3" role="3cqZAp">
+          <node concept="3cpWsn" id="1GW3SvfZSD6" role="3cpWs9">
+            <property role="TrG5h" value="width" />
+            <node concept="10Oyi0" id="1GW3SvfZSD1" role="1tU5fm" />
+            <node concept="3cmrfG" id="6KjVnJo8cYo" role="33vP2m">
+              <property role="3cmrfH" value="40" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="1GW3Svfs06s" role="3cqZAp">
           <node concept="2OqwBi" id="1GW3Svfs06t" role="3clFbG">
             <node concept="37vLTw" id="1GW3Svfs06u" role="2Oq$k0">
@@ -3405,8 +3275,8 @@
             </node>
             <node concept="liA8E" id="1GW3Svfs06v" role="2OqNvi">
               <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
-              <node concept="3cmrfG" id="1GW3Svfs06w" role="37wK5m">
-                <property role="3cmrfH" value="20" />
+              <node concept="37vLTw" id="1GW3Svg1bCj" role="37wK5m">
+                <ref role="3cqZAo" node="1GW3SvfZSD6" resolve="width" />
               </node>
             </node>
           </node>
@@ -3418,8 +3288,8 @@
             </node>
             <node concept="liA8E" id="6wvhQs7npa1" role="2OqNvi">
               <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
-              <node concept="3cmrfG" id="6wvhQs7npa2" role="37wK5m">
-                <property role="3cmrfH" value="20" />
+              <node concept="37vLTw" id="1GW3Svg1mJS" role="37wK5m">
+                <ref role="3cqZAo" node="1GW3SvfZSD6" resolve="width" />
               </node>
             </node>
           </node>
@@ -3582,6 +3452,41 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1GW3SvfU4wz" role="jymVt" />
+    <node concept="3clFb_" id="1GW3SvfUCam" role="jymVt">
+      <property role="TrG5h" value="isSearchAll" />
+      <node concept="3clFbS" id="1GW3SvfUCap" role="3clF47">
+        <node concept="3clFbF" id="1GW3SvfV2HP" role="3cqZAp">
+          <node concept="37vLTw" id="1GW3SvfV2HO" role="3clFbG">
+            <ref role="3cqZAo" node="1GW3SvfTEs3" resolve="searchAll" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GW3SvfUx7G" role="1B3o_S" />
+      <node concept="10P_77" id="1GW3SvfUVDk" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="1GW3SvfV8_G" role="jymVt" />
+    <node concept="3clFb_" id="1GW3SvfVrnD" role="jymVt">
+      <property role="TrG5h" value="toggleSearchAll" />
+      <node concept="3clFbS" id="1GW3SvfVrnG" role="3clF47">
+        <node concept="3clFbF" id="1GW3SvfVLYk" role="3cqZAp">
+          <node concept="37vLTI" id="1GW3SvfVRHq" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfVYtV" role="37vLTx">
+              <ref role="3cqZAo" node="1GW3SvfV_bG" resolve="flag" />
+            </node>
+            <node concept="37vLTw" id="1GW3SvfVLYj" role="37vLTJ">
+              <ref role="3cqZAo" node="1GW3SvfTEs3" resolve="searchAll" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GW3SvfVcoo" role="1B3o_S" />
+      <node concept="3cqZAl" id="1GW3SvfVe1d" role="3clF45" />
+      <node concept="37vLTG" id="1GW3SvfV_bG" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="1GW3SvfV_bF" role="1tU5fm" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="2HzhasNzNJV">
     <property role="3GE5qa" value="search" />
@@ -22299,5 +22204,231 @@
       <ref role="3uigEE" to="zyr2:~InspectorEditorComponent" resolve="InspectorEditorComponent" />
     </node>
   </node>
+  <node concept="sE7Ow" id="1GW3SvfQllV">
+    <property role="1rBW0U" value="true" />
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="MbeddrSearch" />
+    <property role="2uzpH1" value="Search" />
+    <node concept="1DS2jV" id="1GW3SvfXE9e" role="1NuT2Z">
+      <property role="TrG5h" value="project" />
+      <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+      <node concept="1oajcY" id="1GW3SvfXE9f" role="1oa70y" />
+    </node>
+    <node concept="tnohg" id="1GW3SvfQllW" role="tncku">
+      <node concept="3clFbS" id="1GW3SvfQllX" role="2VODD2">
+        <node concept="3cpWs8" id="1GW3SvfY6yT" role="3cqZAp">
+          <node concept="3cpWsn" id="1GW3SvfY6yU" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="1GW3SvfY6yV" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="1GW3SvfYx$_" role="33vP2m">
+              <node concept="3uibUv" id="1GW3SvfYxU9" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2OqwBi" id="1GW3SvfXGn4" role="10QFUP">
+                <node concept="2OqwBi" id="1GW3SvfXFyN" role="2Oq$k0">
+                  <node concept="2OqwBi" id="1GW3SvfXEUa" role="2Oq$k0">
+                    <node concept="2WthIp" id="1GW3SvfXEUd" role="2Oq$k0" />
+                    <node concept="1DTwFV" id="1GW3SvfXEUf" role="2OqNvi">
+                      <ref role="2WH_rO" node="1GW3SvfXE9e" resolve="project" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="1GW3SvfXG8o" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1GW3SvfY6pW" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1GW3SvfYyk4" role="3cqZAp">
+          <node concept="2OqwBi" id="1GW3SvfY$$V" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfYyk2" role="2Oq$k0">
+              <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="1GW3SvfZ281" role="2OqNvi">
+              <ref role="37wK5l" node="jpyKDg2tIn" resolve="runSearch" />
+              <node concept="2OqwBi" id="1GW3SvfZ2Nw" role="37wK5m">
+                <node concept="37vLTw" id="1GW3SvfZ2hk" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="1GW3SvfZ3mt" role="2OqNvi">
+                  <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1QGGSu" id="1GW3SvfQlES" role="3Uehp1">
+      <node concept="10M0yZ" id="1GW3SvfQoEd" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="1GW3SvfRw80">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchAllNodePresentationsToggleAction" />
+    <node concept="2tJIrI" id="1GW3SvfRx_5" role="jymVt" />
+    <node concept="2tJIrI" id="1GW3SvfZ4Io" role="jymVt" />
+    <node concept="3clFbW" id="1GW3SvfRWTF" role="jymVt">
+      <node concept="3cqZAl" id="1GW3SvfRWTG" role="3clF45" />
+      <node concept="3clFbS" id="1GW3SvfRWTI" role="3clF47">
+        <node concept="XkiVB" id="1GW3SvfRXmW" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="ToggleAction" />
+          <node concept="Xl_RD" id="1GW3SvfRXL$" role="37wK5m">
+            <property role="Xl_RC" value="Search All Node Presentations" />
+          </node>
+          <node concept="Xl_RD" id="1GW3Svg2Xsr" role="37wK5m">
+            <property role="Xl_RC" value="Search All Node Presentations" />
+          </node>
+          <node concept="10M0yZ" id="1GW3Svg2wzW" role="37wK5m">
+            <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.InlayGlobe" resolve="InlayGlobe" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GW3SvfRWTJ" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="1GW3SvfRxFf" role="jymVt" />
+    <node concept="3Tm1VV" id="1GW3SvfRw81" role="1B3o_S" />
+    <node concept="3uibUv" id="1GW3SvfRxeU" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+    </node>
+    <node concept="3clFb_" id="1GW3SvfRxfB" role="jymVt">
+      <property role="TrG5h" value="isSelected" />
+      <node concept="3Tm1VV" id="1GW3SvfRxfC" role="1B3o_S" />
+      <node concept="10P_77" id="1GW3SvfRxfE" role="3clF45" />
+      <node concept="37vLTG" id="1GW3SvfRxfF" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="1GW3SvfRxfG" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="1GW3SvfRxfH" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="1GW3SvfRxfI" role="3clF47">
+        <node concept="3cpWs8" id="1GW3SvfZ3KB" role="3cqZAp">
+          <node concept="3cpWsn" id="1GW3SvfZ3KC" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="1GW3SvfZ3KD" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="1GW3SvfZ3KE" role="33vP2m">
+              <node concept="3uibUv" id="1GW3SvfZ3KF" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="1GW3SvfZofZ" role="10QFUP">
+                <node concept="2EnYce" id="1GW3SvfZnII" role="2Oq$k0">
+                  <node concept="2OqwBi" id="1GW3SvfZdrn" role="2Oq$k0">
+                    <node concept="37vLTw" id="1GW3SvfZcKw" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1GW3SvfRxfF" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="1GW3SvfZe2g" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="1GW3SvfZ3KL" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1GW3SvfZ3KM" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1GW3SvfZ3KN" role="3cqZAp">
+          <node concept="2EnYce" id="1GW3SvfZoZm" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfZ3KP" role="2Oq$k0">
+              <ref role="3cqZAo" node="1GW3SvfZ3KC" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="1GW3SvfZ3KQ" role="2OqNvi">
+              <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1GW3SvfRxfJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GW3SvfRYl9" role="jymVt" />
+    <node concept="3clFb_" id="1GW3SvfRxfM" role="jymVt">
+      <property role="TrG5h" value="setSelected" />
+      <node concept="3Tm1VV" id="1GW3SvfRxfN" role="1B3o_S" />
+      <node concept="3cqZAl" id="1GW3SvfRxfP" role="3clF45" />
+      <node concept="37vLTG" id="1GW3SvfRxfQ" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="1GW3SvfRxfR" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="1GW3SvfRxfS" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1GW3SvfRxfT" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="1GW3SvfRxfU" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="1GW3SvfRxfV" role="3clF47">
+        <node concept="3cpWs8" id="1GW3SvfZfb6" role="3cqZAp">
+          <node concept="3cpWsn" id="1GW3SvfZfb7" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="1GW3SvfZfb8" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="1GW3SvfZfb9" role="33vP2m">
+              <node concept="3uibUv" id="1GW3SvfZfba" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="1GW3SvfZpPX" role="10QFUP">
+                <node concept="2EnYce" id="1GW3SvfZrfo" role="2Oq$k0">
+                  <node concept="2EnYce" id="1GW3SvfZqvN" role="2Oq$k0">
+                    <node concept="37vLTw" id="1GW3SvfZfbe" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1GW3SvfRxfQ" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="1GW3SvfZfbf" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="1GW3SvfZfbg" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1GW3SvfZfbh" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1GW3SvfZfbi" role="3cqZAp">
+          <node concept="2EnYce" id="1GW3SvfZqRL" role="3clFbG">
+            <node concept="37vLTw" id="1GW3SvfZfbk" role="2Oq$k0">
+              <ref role="3cqZAo" node="1GW3SvfZfb7" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="1GW3SvfZiSB" role="2OqNvi">
+              <ref role="37wK5l" node="1GW3SvfVrnD" resolve="toggleSearchAll" />
+              <node concept="37vLTw" id="1GW3SvfZk_7" role="37wK5m">
+                <ref role="3cqZAo" node="1GW3SvfRxfT" resolve="flag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1GW3SvfRxfW" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 852ac7a9fe7a0d6a6316b359865629c122d1147b Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 15:23:44 +0100
Subject: [PATCH 08/38] core.pointers: add a missing null check

---
 .../languageModels/behavior.mps               | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
index bd58f973f38..631378d4552 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
@@ -2899,17 +2899,28 @@
       <node concept="3Tm1VV" id="5MaVmNI51Wh" role="1B3o_S" />
       <node concept="3clFbS" id="5MaVmNI51Wm" role="3clF47">
         <node concept="3clFbF" id="5MaVmNI5n1_" role="3cqZAp">
-          <node concept="2OqwBi" id="5MaVmNI5v1m" role="3clFbG">
-            <node concept="2OqwBi" id="5MaVmNI5nf7" role="2Oq$k0">
-              <node concept="13iPFW" id="5MaVmNI5n1y" role="2Oq$k0" />
-              <node concept="3TrcHB" id="5MaVmNI5tda" role="2OqNvi">
-                <ref role="3TsBF5" to="yq40:5jmmCdx$f5U" resolve="value" />
+          <node concept="1Wc70l" id="6KjVnJpTKyq" role="3clFbG">
+            <node concept="3y3z36" id="6KjVnJpTNHJ" role="3uHU7B">
+              <node concept="10Nm6u" id="6KjVnJpTOCf" role="3uHU7w" />
+              <node concept="2OqwBi" id="6KjVnJpTKT4" role="3uHU7B">
+                <node concept="13iPFW" id="6KjVnJpTKz_" role="2Oq$k0" />
+                <node concept="3TrcHB" id="6KjVnJpTKVe" role="2OqNvi">
+                  <ref role="3TsBF5" to="yq40:5jmmCdx$f5U" resolve="value" />
+                </node>
               </node>
             </node>
-            <node concept="liA8E" id="5MaVmNI5xUz" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-              <node concept="37vLTw" id="5MaVmNI5xYb" role="37wK5m">
-                <ref role="3cqZAo" node="5MaVmNI51Wn" resolve="text" />
+            <node concept="2OqwBi" id="5MaVmNI5v1m" role="3uHU7w">
+              <node concept="2OqwBi" id="5MaVmNI5nf7" role="2Oq$k0">
+                <node concept="13iPFW" id="5MaVmNI5n1y" role="2Oq$k0" />
+                <node concept="3TrcHB" id="5MaVmNI5tda" role="2OqNvi">
+                  <ref role="3TsBF5" to="yq40:5jmmCdx$f5U" resolve="value" />
+                </node>
+              </node>
+              <node concept="liA8E" id="5MaVmNI5xUz" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                <node concept="37vLTw" id="5MaVmNI5xYb" role="37wK5m">
+                  <ref role="3cqZAo" node="5MaVmNI51Wn" resolve="text" />
+                </node>
               </node>
             </node>
           </node>

From 52f0442a0b4e90e04eabac826d471d3dfa950ba6 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 15:23:59 +0100
Subject: [PATCH 09/38] core.base: implement searching for the project scope

---
 .../core/base/pluginSolution/plugin.mps       | 2233 +++++++++--------
 1 file changed, 1205 insertions(+), 1028 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 411a52bae2e..4a942aca2a8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -113,6 +113,10 @@
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" />
     <import index="82te" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.ui.util(MPS.Platform/)" />
     <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
+    <import index="mte5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Platform/)" />
+    <import index="mte6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
@@ -319,7 +323,9 @@
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
       <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
@@ -511,6 +517,7 @@
         <child id="1144231399730" name="condition" index="1Dwp0S" />
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
         <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
@@ -751,6 +758,7 @@
       </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
+        <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
@@ -2101,6 +2109,26 @@
     <property role="TrG5h" value="MbeddrSearchViewer" />
     <property role="2XNbzY" value="Search" />
     <property role="3GE5qa" value="search" />
+    <node concept="2XrIbr" id="6KjVnJoXq9s" role="2XNbBy">
+      <property role="TrG5h" value="setProject" />
+      <node concept="3cqZAl" id="6KjVnJoXr8T" role="3clF45" />
+      <node concept="3clFbS" id="6KjVnJoXq9u" role="3clF47">
+        <node concept="3clFbF" id="6KjVnJoXrsS" role="3cqZAp">
+          <node concept="2OqwBi" id="6KjVnJoXuB3" role="3clFbG">
+            <node concept="2OqwBi" id="6KjVnJoXrEV" role="2Oq$k0">
+              <node concept="2WthIp" id="6KjVnJoXrsR" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="6KjVnJoXrSU" role="2OqNvi">
+                <ref role="2WH_rO" node="2HzhasNzNDV" resolve="myComponent" />
+              </node>
+            </node>
+            <node concept="liA8E" id="6KjVnJoXx1Z" role="2OqNvi">
+              <ref role="37wK5l" node="6KjVnJoW8X3" resolve="setProjectScope" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6KjVnJoXqPg" role="1B3o_S" />
+    </node>
     <node concept="2XrIbr" id="2HzhasNzPxh" role="2XNbBy">
       <property role="TrG5h" value="setModel" />
       <node concept="3cqZAl" id="2HzhasNzPxn" role="3clF45" />
@@ -2114,7 +2142,7 @@
               </node>
             </node>
             <node concept="liA8E" id="jpyKDg0M52" role="2OqNvi">
-              <ref role="37wK5l" node="jpyKDg0M3F" resolve="setModel" />
+              <ref role="37wK5l" node="jpyKDg0M3F" resolve="setModelScope" />
               <node concept="37vLTw" id="jpyKDg0M57" role="37wK5m">
                 <ref role="3cqZAo" node="2HzhasNzPxo" resolve="m" />
               </node>
@@ -2165,7 +2193,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2Gn1WTgMSe6" role="2OqNvi">
-              <ref role="37wK5l" node="2Gn1WTgNQ7i" resolve="setSolution" />
+              <ref role="37wK5l" node="2Gn1WTgNQ7i" resolve="setSolutionScope" />
               <node concept="37vLTw" id="2Gn1WTgMSe7" role="37wK5m">
                 <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
               </node>
@@ -2366,16 +2394,11 @@
       </node>
       <node concept="3Tm6S6" id="2HzhasNzNH1" role="1B3o_S" />
     </node>
-    <node concept="312cEg" id="2HzhasNzPws" role="jymVt">
-      <property role="TrG5h" value="model" />
-      <node concept="3Tm6S6" id="2HzhasNzPwt" role="1B3o_S" />
-      <node concept="H_c77" id="2HzhasNzPwv" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="2Gn1WTgOgQB" role="jymVt">
-      <property role="TrG5h" value="solution" />
-      <node concept="3Tm6S6" id="2Gn1WTgOgQC" role="1B3o_S" />
-      <node concept="3uibUv" id="2Gn1WTgOn5S" role="1tU5fm">
-        <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
+    <node concept="312cEg" id="6KjVnJp5uC_" role="jymVt">
+      <property role="TrG5h" value="scope" />
+      <node concept="3Tm6S6" id="6KjVnJp5uCA" role="1B3o_S" />
+      <node concept="3uibUv" id="6KjVnJp5uCB" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
       </node>
     </node>
     <node concept="312cEg" id="jpyKDg1Mqe" role="jymVt">
@@ -2828,30 +2851,22 @@
     </node>
     <node concept="2tJIrI" id="1GW3SvfBC1$" role="jymVt" />
     <node concept="3clFb_" id="jpyKDg0M3F" role="jymVt">
-      <property role="TrG5h" value="setModel" />
+      <property role="TrG5h" value="setModelScope" />
       <node concept="3cqZAl" id="jpyKDg0M3G" role="3clF45" />
       <node concept="3Tm1VV" id="jpyKDg0M3H" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg0M3I" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg0M45" role="3cqZAp">
-          <node concept="37vLTI" id="jpyKDg0M4R" role="3clFbG">
-            <node concept="37vLTw" id="jpyKDg0M4U" role="37vLTx">
-              <ref role="3cqZAo" node="jpyKDg0M3T" resolve="m" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg0M4r" role="37vLTJ">
-              <node concept="Xjq3P" id="jpyKDg0M46" role="2Oq$k0" />
-              <node concept="2OwXpG" id="jpyKDg0M4x" role="2OqNvi">
-                <ref role="2Oxat5" node="2HzhasNzPws" resolve="model" />
-              </node>
+        <node concept="3clFbF" id="6KjVnJp7Odw" role="3cqZAp">
+          <node concept="37vLTI" id="6KjVnJp8re2" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJp7Odu" role="37vLTJ">
+              <ref role="3cqZAo" node="6KjVnJp5uC_" resolve="scope" />
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2Gn1WTgOBM2" role="3cqZAp">
-          <node concept="37vLTI" id="2Gn1WTgON1D" role="3clFbG">
-            <node concept="10Nm6u" id="2Gn1WTgONjb" role="37vLTx" />
-            <node concept="2OqwBi" id="2Gn1WTgOCbL" role="37vLTJ">
-              <node concept="Xjq3P" id="2Gn1WTgOBM0" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2Gn1WTgOJn2" role="2OqNvi">
-                <ref role="2Oxat5" node="2Gn1WTgOgQB" resolve="solution" />
+            <node concept="2ShNRf" id="6KjVnJp8XyK" role="37vLTx">
+              <node concept="1pGfFk" id="6KjVnJp8XyL" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="mte6:~ModelsScope.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel...)" resolve="ModelsScope" />
+                <node concept="37vLTw" id="6KjVnJp8XyM" role="37wK5m">
+                  <ref role="3cqZAo" node="jpyKDg0M3T" resolve="m" />
+                </node>
               </node>
             </node>
           </node>
@@ -2869,30 +2884,22 @@
     </node>
     <node concept="2tJIrI" id="1GW3SvfBGLw" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgNQ7i" role="jymVt">
-      <property role="TrG5h" value="setSolution" />
+      <property role="TrG5h" value="setSolutionScope" />
       <node concept="3cqZAl" id="2Gn1WTgNQ7j" role="3clF45" />
       <node concept="3Tm1VV" id="2Gn1WTgNQ7k" role="1B3o_S" />
       <node concept="3clFbS" id="2Gn1WTgNQ7l" role="3clF47">
-        <node concept="3clFbF" id="2Gn1WTgNQ7m" role="3cqZAp">
-          <node concept="37vLTI" id="2Gn1WTgNQ7n" role="3clFbG">
-            <node concept="37vLTw" id="2Gn1WTgNQ7o" role="37vLTx">
-              <ref role="3cqZAo" node="2Gn1WTgNQ7Y" resolve="s" />
+        <node concept="3clFbF" id="6KjVnJp9WD3" role="3cqZAp">
+          <node concept="37vLTI" id="6KjVnJpa6bk" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJp9WD1" role="37vLTJ">
+              <ref role="3cqZAo" node="6KjVnJp5uC_" resolve="scope" />
             </node>
-            <node concept="2OqwBi" id="2Gn1WTgNQ7p" role="37vLTJ">
-              <node concept="Xjq3P" id="2Gn1WTgNQ7q" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2Gn1WTgOBCT" role="2OqNvi">
-                <ref role="2Oxat5" node="2Gn1WTgOgQB" resolve="solution" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2Gn1WTgONtq" role="3cqZAp">
-          <node concept="37vLTI" id="2Gn1WTgOYF7" role="3clFbG">
-            <node concept="10Nm6u" id="2Gn1WTgOYGR" role="37vLTx" />
-            <node concept="2OqwBi" id="2Gn1WTgONRM" role="37vLTJ">
-              <node concept="Xjq3P" id="2Gn1WTgONto" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2Gn1WTgOV4c" role="2OqNvi">
-                <ref role="2Oxat5" node="2HzhasNzPws" resolve="model" />
+            <node concept="2ShNRf" id="6KjVnJpa7LE" role="37vLTx">
+              <node concept="1pGfFk" id="6KjVnJpa7LF" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="mte6:~ModulesScope.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModule...)" resolve="ModulesScope" />
+                <node concept="37vLTw" id="6KjVnJpa7LG" role="37wK5m">
+                  <ref role="3cqZAo" node="2Gn1WTgNQ7Y" resolve="solution" />
+                </node>
               </node>
             </node>
           </node>
@@ -2904,12 +2911,43 @@
         </node>
       </node>
       <node concept="37vLTG" id="2Gn1WTgNQ7Y" role="3clF46">
-        <property role="TrG5h" value="s" />
+        <property role="TrG5h" value="solution" />
         <node concept="3uibUv" id="2Gn1WTgOgJl" role="1tU5fm">
           <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6KjVnJoW8WZ" role="jymVt" />
+    <node concept="3clFb_" id="6KjVnJoW8X3" role="jymVt">
+      <property role="TrG5h" value="setProjectScope" />
+      <node concept="3cqZAl" id="6KjVnJoW8X4" role="3clF45" />
+      <node concept="3Tm1VV" id="6KjVnJoW8X5" role="1B3o_S" />
+      <node concept="3clFbS" id="6KjVnJoW8X6" role="3clF47">
+        <node concept="3clFbF" id="6KjVnJpbEqy" role="3cqZAp">
+          <node concept="37vLTI" id="6KjVnJpcEgI" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJpclTB" role="37vLTJ">
+              <ref role="3cqZAo" node="6KjVnJp5uC_" resolve="scope" />
+            </node>
+            <node concept="2OqwBi" id="vqDSpa3Q0I" role="37vLTx">
+              <node concept="2OqwBi" id="vqDSpa3_is" role="2Oq$k0">
+                <node concept="Xjq3P" id="vqDSpa3mYh" role="2Oq$k0" />
+                <node concept="2OwXpG" id="vqDSpa3HpD" role="2OqNvi">
+                  <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                </node>
+              </node>
+              <node concept="liA8E" id="vqDSpa3Vj8" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6KjVnJoW8Xp" role="3cqZAp">
+          <node concept="1rXfSq" id="6KjVnJoW8Xq" role="3clFbG">
+            <ref role="37wK5l" node="2Gn1WTgOnVE" resolve="cleanUp" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="1GW3SvfBLxs" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgOnVE" role="jymVt">
       <property role="TrG5h" value="cleanUp" />
@@ -3007,177 +3045,100 @@
       <node concept="3Tm1VV" id="1GW3SvfYRm_" role="1B3o_S" />
       <node concept="3cqZAl" id="jpyKDg2tIp" role="3clF45" />
       <node concept="3clFbS" id="jpyKDg2tIq" role="3clF47">
-        <node concept="3clFbJ" id="2Gn1WTgOYVW" role="3cqZAp">
-          <node concept="3clFbS" id="2Gn1WTgOYVZ" role="3clFbx">
-            <node concept="3cpWs8" id="jpyKDg2tIr" role="3cqZAp">
-              <node concept="3cpWsn" id="jpyKDg2tIl" role="3cpWs9">
-                <property role="TrG5h" value="helper" />
-                <node concept="3uibUv" id="jpyKDg2tIs" role="1tU5fm">
-                  <ref role="3uigEE" node="2HzhasN$akP" resolve="SearchEngine" />
-                </node>
-                <node concept="2ShNRf" id="jpyKDg2tIt" role="33vP2m">
-                  <node concept="1pGfFk" id="jpyKDg2tIu" role="2ShVmc">
-                    <ref role="37wK5l" node="2HzhasN$aqz" resolve="SearchEngine" />
-                    <node concept="37vLTw" id="4Q2Vz3iBchx" role="37wK5m">
-                      <ref role="3cqZAo" node="2HzhasNzPws" resolve="model" />
-                    </node>
-                    <node concept="37vLTw" id="4Q2Vz3iBc$c" role="37wK5m">
-                      <ref role="3cqZAo" node="2HzhasNzNGZ" resolve="myProject" />
-                    </node>
-                  </node>
-                </node>
-              </node>
+        <node concept="3cpWs8" id="jpyKDg2tIr" role="3cqZAp">
+          <node concept="3cpWsn" id="jpyKDg2tIl" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="jpyKDg2tIs" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasN$akP" resolve="SearchEngine" />
             </node>
-            <node concept="3cpWs8" id="jpyKDg2tIv" role="3cqZAp">
-              <node concept="3cpWsn" id="jpyKDg2tIm" role="3cpWs9">
-                <property role="TrG5h" value="result" />
-                <property role="3TUv4t" value="true" />
-                <node concept="2OqwBi" id="jpyKDg2tIw" role="33vP2m">
-                  <node concept="37vLTw" id="jpyKDg2tIx" role="2Oq$k0">
-                    <ref role="3cqZAo" node="jpyKDg2tIl" resolve="helper" />
-                  </node>
-                  <node concept="liA8E" id="jpyKDg2tIy" role="2OqNvi">
-                    <ref role="37wK5l" node="4Q2Vz3iAFh6" resolve="search" />
-                    <node concept="2OqwBi" id="jpyKDg2tI$" role="37wK5m">
-                      <node concept="37vLTw" id="jpyKDg2tI_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
-                      </node>
-                      <node concept="liA8E" id="jpyKDg2tIA" role="2OqNvi">
-                        <ref role="37wK5l" to="r791:~JTextComponent.getText()" resolve="getText" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="7DRyZmDonn0" role="37wK5m">
-                      <ref role="3cqZAo" node="7DRyZmDokoL" resolve="searchAll" />
-                    </node>
-                  </node>
+            <node concept="2ShNRf" id="jpyKDg2tIt" role="33vP2m">
+              <node concept="1pGfFk" id="jpyKDg2tIu" role="2ShVmc">
+                <ref role="37wK5l" node="6KjVnJoYZE3" resolve="SearchEngine" />
+                <node concept="37vLTw" id="4Q2Vz3iBchx" role="37wK5m">
+                  <ref role="3cqZAo" node="6KjVnJp5uC_" resolve="scope" />
                 </node>
-                <node concept="_YKpA" id="jpyKDg2tIB" role="1tU5fm">
-                  <node concept="3uibUv" id="jpyKDg2tIC" role="_ZDj9">
-                    <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="6wvhQs7njzN" role="3cqZAp">
-              <node concept="3P9mCS" id="6wvhQs7njzO" role="3clFbG">
-                <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
-                <node concept="2ShNRf" id="jpyKDg2tIH" role="37wK5m">
-                  <node concept="1pGfFk" id="jpyKDg2tII" role="2ShVmc">
-                    <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
-                    <node concept="2OqwBi" id="1GW3SvfBjDL" role="37wK5m">
-                      <node concept="2OqwBi" id="1GW3SvfBjDM" role="2Oq$k0">
-                        <node concept="Xjq3P" id="1GW3SvfBjDN" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="1GW3SvfBjDO" role="2OqNvi">
-                          <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="1GW3SvfBjDP" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="5Hxjapwgwuz" role="37wK5m">
-                      <ref role="3cqZAo" node="jpyKDg2tIm" resolve="result" />
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="4Q2Vz3iBc$c" role="37wK5m">
+                  <ref role="3cqZAo" node="2HzhasNzNGZ" resolve="myProject" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="2Gn1WTgPauR" role="3clFbw">
-            <node concept="10Nm6u" id="2Gn1WTgPaA$" role="3uHU7w" />
-            <node concept="2OqwBi" id="2Gn1WTgOZBb" role="3uHU7B">
-              <node concept="Xjq3P" id="2Gn1WTgOZ5S" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2Gn1WTgP6Ru" role="2OqNvi">
-                <ref role="2Oxat5" node="2HzhasNzPws" resolve="model" />
-              </node>
-            </node>
-          </node>
         </node>
-        <node concept="3clFbJ" id="2Gn1WTgPaYZ" role="3cqZAp">
-          <node concept="3clFbS" id="2Gn1WTgPaZ0" role="3clFbx">
-            <node concept="3cpWs8" id="2Gn1WTgPaZ1" role="3cqZAp">
-              <node concept="3cpWsn" id="2Gn1WTgPaZ2" role="3cpWs9">
-                <property role="TrG5h" value="helper" />
-                <node concept="3uibUv" id="2Gn1WTgPaZ3" role="1tU5fm">
-                  <ref role="3uigEE" node="2HzhasN$akP" resolve="SearchEngine" />
-                </node>
-                <node concept="2ShNRf" id="2Gn1WTgPaZ4" role="33vP2m">
-                  <node concept="1pGfFk" id="2Gn1WTgPaZ5" role="2ShVmc">
-                    <ref role="37wK5l" node="4Q2Vz3iAmrH" resolve="SearchEngine" />
-                    <node concept="37vLTw" id="2Gn1WTgPeWy" role="37wK5m">
-                      <ref role="3cqZAo" node="2Gn1WTgOgQB" resolve="solution" />
-                    </node>
-                    <node concept="37vLTw" id="2Gn1WTgPaZ7" role="37wK5m">
-                      <ref role="3cqZAo" node="2HzhasNzNGZ" resolve="myProject" />
-                    </node>
-                  </node>
-                </node>
-              </node>
+        <node concept="3clFbF" id="7ipIhbo70mr" role="3cqZAp">
+          <node concept="2OqwBi" id="jpyKDg2tIw" role="3clFbG">
+            <node concept="37vLTw" id="jpyKDg2tIx" role="2Oq$k0">
+              <ref role="3cqZAo" node="jpyKDg2tIl" resolve="helper" />
             </node>
-            <node concept="3cpWs8" id="2Gn1WTgPaZ8" role="3cqZAp">
-              <node concept="3cpWsn" id="2Gn1WTgPaZ9" role="3cpWs9">
-                <property role="TrG5h" value="result" />
-                <property role="3TUv4t" value="true" />
-                <node concept="2OqwBi" id="2Gn1WTgPaZa" role="33vP2m">
-                  <node concept="37vLTw" id="2Gn1WTgPaZb" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2Gn1WTgPaZ2" resolve="helper" />
-                  </node>
-                  <node concept="liA8E" id="2Gn1WTgPaZc" role="2OqNvi">
-                    <ref role="37wK5l" node="4Q2Vz3iAFh6" resolve="search" />
-                    <node concept="2OqwBi" id="2Gn1WTgPaZd" role="37wK5m">
-                      <node concept="37vLTw" id="2Gn1WTgPaZe" role="2Oq$k0">
-                        <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
-                      </node>
-                      <node concept="liA8E" id="2Gn1WTgPaZf" role="2OqNvi">
-                        <ref role="37wK5l" to="r791:~JTextComponent.getText()" resolve="getText" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="7DRyZmDood6" role="37wK5m">
-                      <ref role="3cqZAo" node="7DRyZmDokoL" resolve="searchAll" />
-                    </node>
-                  </node>
+            <node concept="liA8E" id="jpyKDg2tIy" role="2OqNvi">
+              <ref role="37wK5l" node="4Q2Vz3iAFh6" resolve="search" />
+              <node concept="2OqwBi" id="jpyKDg2tI$" role="37wK5m">
+                <node concept="37vLTw" id="jpyKDg2tI_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
                 </node>
-                <node concept="_YKpA" id="2Gn1WTgPaZg" role="1tU5fm">
-                  <node concept="3uibUv" id="2Gn1WTgPaZh" role="_ZDj9">
-                    <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
-                  </node>
+                <node concept="liA8E" id="jpyKDg2tIA" role="2OqNvi">
+                  <ref role="37wK5l" to="r791:~JTextComponent.getText()" resolve="getText" />
                 </node>
               </node>
-            </node>
-            <node concept="3clFbF" id="2Gn1WTgPaZi" role="3cqZAp">
-              <node concept="3P9mCS" id="2Gn1WTgPaZj" role="3clFbG">
-                <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
-                <node concept="2ShNRf" id="2Gn1WTgPaZk" role="37wK5m">
-                  <node concept="1pGfFk" id="2Gn1WTgPaZl" role="2ShVmc">
-                    <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
-                    <node concept="2OqwBi" id="1GW3SvfBmI2" role="37wK5m">
-                      <node concept="2OqwBi" id="1GW3SvfBmI3" role="2Oq$k0">
-                        <node concept="Xjq3P" id="1GW3SvfBmI4" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="1GW3SvfBmI5" role="2OqNvi">
-                          <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+              <node concept="37vLTw" id="7DRyZmDonn0" role="37wK5m">
+                <ref role="3cqZAo" node="7DRyZmDokoL" resolve="searchAll" />
+              </node>
+              <node concept="2ShNRf" id="7ipIhbo7evk" role="37wK5m">
+                <node concept="YeOm9" id="7ipIhbo7maw" role="2ShVmc">
+                  <node concept="1Y3b0j" id="7ipIhbo7maz" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <property role="373rjd" value="true" />
+                    <ref role="1Y3XeK" node="7ipIhbnXbz3" resolve="SearchCallback" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                    <node concept="3Tm1VV" id="7ipIhbo7ma$" role="1B3o_S" />
+                    <node concept="3clFb_" id="7ipIhbo7maX" role="jymVt">
+                      <property role="TrG5h" value="resultsReceived" />
+                      <node concept="3Tm1VV" id="7ipIhbo7maZ" role="1B3o_S" />
+                      <node concept="3cqZAl" id="7ipIhbo7mb0" role="3clF45" />
+                      <node concept="37vLTG" id="7ipIhbo7mb1" role="3clF46">
+                        <property role="TrG5h" value="results" />
+                        <node concept="_YKpA" id="7ipIhbo7mb2" role="1tU5fm">
+                          <node concept="3uibUv" id="7ipIhbo7mb3" role="_ZDj9">
+                            <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="1GW3SvfBmI6" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      <node concept="3clFbS" id="7ipIhbo7mb4" role="3clF47">
+                        <node concept="3clFbF" id="6wvhQs7njzN" role="3cqZAp">
+                          <node concept="3P9mCS" id="6wvhQs7njzO" role="3clFbG">
+                            <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
+                            <node concept="2ShNRf" id="jpyKDg2tIH" role="37wK5m">
+                              <node concept="1pGfFk" id="jpyKDg2tII" role="2ShVmc">
+                                <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
+                                <node concept="2OqwBi" id="1GW3SvfBjDL" role="37wK5m">
+                                  <node concept="2OqwBi" id="1GW3SvfBjDM" role="2Oq$k0">
+                                    <node concept="Xjq3P" id="1GW3SvfBjDN" role="2Oq$k0">
+                                      <ref role="1HBi2w" node="2HzhasNzNEW" resolve="SearchViewer" />
+                                    </node>
+                                    <node concept="2OwXpG" id="1GW3SvfBjDO" role="2OqNvi">
+                                      <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="1GW3SvfBjDP" role="2OqNvi">
+                                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="5Hxjapwgwuz" role="37wK5m">
+                                  <ref role="3cqZAo" node="7ipIhbo7mb1" resolve="results" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="7ipIhbo7mb6" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" />
                       </node>
-                    </node>
-                    <node concept="37vLTw" id="2Gn1WTgPaZm" role="37wK5m">
-                      <ref role="3cqZAo" node="2Gn1WTgPaZ9" resolve="result" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="2Gn1WTgPaZo" role="3clFbw">
-            <node concept="10Nm6u" id="2Gn1WTgPaZp" role="3uHU7w" />
-            <node concept="2OqwBi" id="2Gn1WTgPaZq" role="3uHU7B">
-              <node concept="Xjq3P" id="2Gn1WTgPaZr" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2Gn1WTgPeTC" role="2OqNvi">
-                <ref role="2Oxat5" node="2Gn1WTgOgQB" resolve="solution" />
-              </node>
-            </node>
-          </node>
         </node>
       </node>
       <node concept="37vLTG" id="7DRyZmDokoL" role="3clF46">
@@ -3581,135 +3542,65 @@
     <node concept="3Tm1VV" id="2HzhasN$akQ" role="1B3o_S" />
     <node concept="2tJIrI" id="4Q2Vz3i$yYf" role="jymVt" />
     <node concept="312cEg" id="4Q2Vz3i_rqf" role="jymVt">
-      <property role="TrG5h" value="p" />
+      <property role="TrG5h" value="project" />
       <node concept="3Tm6S6" id="4Q2Vz3i_rqg" role="1B3o_S" />
       <node concept="3uibUv" id="4Q2Vz3i_rqi" role="1tU5fm">
         <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
       </node>
     </node>
-    <node concept="312cEg" id="4Q2Vz3i_uA1" role="jymVt">
-      <property role="TrG5h" value="model" />
-      <node concept="3Tm6S6" id="4Q2Vz3i_uA2" role="1B3o_S" />
-      <node concept="H_c77" id="4Q2Vz3i_uA4" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="4Q2Vz3iApdn" role="jymVt">
-      <property role="TrG5h" value="solution" />
-      <node concept="3Tm6S6" id="4Q2Vz3iApdo" role="1B3o_S" />
-      <node concept="3uibUv" id="4Q2Vz3iApdq" role="1tU5fm">
-        <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4Q2Vz3i_J5K" role="jymVt" />
-    <node concept="312cEg" id="4Q2Vz3i_bj8" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="results" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="4Q2Vz3i_8lf" role="1B3o_S" />
-      <node concept="_YKpA" id="4Q2Vz3i_ba4" role="1tU5fm">
-        <node concept="3uibUv" id="4Q2Vz3i_biG" role="_ZDj9">
-          <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4Q2Vz3i_esj" role="33vP2m">
-        <node concept="Tc6Ow" id="4Q2Vz3i_es9" role="2ShVmc">
-          <node concept="3uibUv" id="4Q2Vz3i_esa" role="HW$YZ">
-            <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
-          </node>
-        </node>
+    <node concept="312cEg" id="6KjVnJoXOSb" role="jymVt">
+      <property role="TrG5h" value="scope" />
+      <node concept="3Tm6S6" id="6KjVnJoXNHm" role="1B3o_S" />
+      <node concept="3uibUv" id="6KjVnJoYnZ6" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4Q2Vz3i$_Xb" role="jymVt" />
-    <node concept="3clFbW" id="2HzhasN$aqz" role="jymVt">
-      <node concept="37vLTG" id="4Q2Vz3i_owp" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <property role="3TUv4t" value="true" />
-        <node concept="H_c77" id="4Q2Vz3i_oHL" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="4Q2Vz3i_ovK" role="3clF46">
-        <property role="TrG5h" value="p" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="4Q2Vz3i_ovL" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2HzhasN$aq$" role="3clF45" />
-      <node concept="3Tm1VV" id="2HzhasN$aq_" role="1B3o_S" />
-      <node concept="3clFbS" id="2HzhasN$aqA" role="3clF47">
-        <node concept="3clFbF" id="4Q2Vz3i_rqj" role="3cqZAp">
-          <node concept="37vLTI" id="4Q2Vz3i_rql" role="3clFbG">
-            <node concept="2OqwBi" id="4Q2Vz3i_rqp" role="37vLTJ">
-              <node concept="Xjq3P" id="4Q2Vz3i_rqs" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4Q2Vz3i_rqo" role="2OqNvi">
-                <ref role="2Oxat5" node="4Q2Vz3i_rqf" resolve="p" />
-              </node>
+    <node concept="2tJIrI" id="7ipIhbnWQxE" role="jymVt" />
+    <node concept="2tJIrI" id="7ipIhbnWU8L" role="jymVt" />
+    <node concept="3clFbW" id="6KjVnJoYZE3" role="jymVt">
+      <node concept="3cqZAl" id="6KjVnJoYZE4" role="3clF45" />
+      <node concept="3clFbS" id="6KjVnJoYZE6" role="3clF47">
+        <node concept="3clFbF" id="6KjVnJoZ7oI" role="3cqZAp">
+          <node concept="37vLTI" id="6KjVnJoZ9_T" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJoZavF" role="37vLTx">
+              <ref role="3cqZAo" node="6KjVnJoZ35V" resolve="scope" />
             </node>
-            <node concept="37vLTw" id="4Q2Vz3i_rqt" role="37vLTx">
-              <ref role="3cqZAo" node="4Q2Vz3i_ovK" resolve="p" />
+            <node concept="2OqwBi" id="6KjVnJoZ7wa" role="37vLTJ">
+              <node concept="Xjq3P" id="6KjVnJoZ7oH" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6KjVnJoZ8zJ" role="2OqNvi">
+                <ref role="2Oxat5" node="6KjVnJoXOSb" resolve="scope" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4Q2Vz3i_uA5" role="3cqZAp">
-          <node concept="37vLTI" id="4Q2Vz3i_uA7" role="3clFbG">
-            <node concept="2OqwBi" id="4Q2Vz3i_uAb" role="37vLTJ">
-              <node concept="Xjq3P" id="4Q2Vz3i_uAe" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4Q2Vz3i_uAa" role="2OqNvi">
-                <ref role="2Oxat5" node="4Q2Vz3i_uA1" resolve="model" />
+        <node concept="3clFbF" id="6KjVnJoZcgc" role="3cqZAp">
+          <node concept="37vLTI" id="6KjVnJoZfyz" role="3clFbG">
+            <node concept="2OqwBi" id="6KjVnJoZcoG" role="37vLTJ">
+              <node concept="Xjq3P" id="6KjVnJoZcga" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6KjVnJoZdsP" role="2OqNvi">
+                <ref role="2Oxat5" node="4Q2Vz3i_rqf" resolve="repository" />
               </node>
             </node>
-            <node concept="37vLTw" id="4Q2Vz3i_uAf" role="37vLTx">
-              <ref role="3cqZAo" node="4Q2Vz3i_owp" resolve="m" />
+            <node concept="37vLTw" id="6KjVnJp0501" role="37vLTx">
+              <ref role="3cqZAo" node="6KjVnJoZSAt" resolve="project" />
             </node>
           </node>
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="4Q2Vz3iAzOm" role="jymVt" />
-    <node concept="3clFbW" id="4Q2Vz3iAmrH" role="jymVt">
-      <node concept="37vLTG" id="4Q2Vz3iAmrI" role="3clF46">
-        <property role="TrG5h" value="s" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="4Q2Vz3iAp2d" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
+      <node concept="3Tm1VV" id="6KjVnJoYXC0" role="1B3o_S" />
+      <node concept="37vLTG" id="6KjVnJoZ35V" role="3clF46">
+        <property role="TrG5h" value="scope" />
+        <node concept="3uibUv" id="6KjVnJoZ35U" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
         </node>
       </node>
-      <node concept="37vLTG" id="4Q2Vz3iAmrK" role="3clF46">
-        <property role="TrG5h" value="p" />
+      <node concept="37vLTG" id="6KjVnJoZSAt" role="3clF46">
+        <property role="TrG5h" value="project" />
         <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="4Q2Vz3iAmrL" role="1tU5fm">
+        <node concept="3uibUv" id="6KjVnJoZSAu" role="1tU5fm">
           <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
       </node>
-      <node concept="3cqZAl" id="4Q2Vz3iAmrM" role="3clF45" />
-      <node concept="3Tm1VV" id="4Q2Vz3iAmrN" role="1B3o_S" />
-      <node concept="3clFbS" id="4Q2Vz3iAmrO" role="3clF47">
-        <node concept="3clFbF" id="4Q2Vz3iAmrP" role="3cqZAp">
-          <node concept="37vLTI" id="4Q2Vz3iAmrQ" role="3clFbG">
-            <node concept="2OqwBi" id="4Q2Vz3iAmrR" role="37vLTJ">
-              <node concept="Xjq3P" id="4Q2Vz3iAmrS" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4Q2Vz3iAmrT" role="2OqNvi">
-                <ref role="2Oxat5" node="4Q2Vz3i_rqf" resolve="p" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="4Q2Vz3iAmrU" role="37vLTx">
-              <ref role="3cqZAo" node="4Q2Vz3iAmrK" resolve="p" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4Q2Vz3iApdr" role="3cqZAp">
-          <node concept="37vLTI" id="4Q2Vz3iApdt" role="3clFbG">
-            <node concept="2OqwBi" id="4Q2Vz3iApdx" role="37vLTJ">
-              <node concept="Xjq3P" id="4Q2Vz3iApd$" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4Q2Vz3iApdw" role="2OqNvi">
-                <ref role="2Oxat5" node="4Q2Vz3iApdn" resolve="solution" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="4Q2Vz3iApd_" role="37vLTx">
-              <ref role="3cqZAo" node="4Q2Vz3iAmrI" resolve="s" />
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="4Q2Vz3iAd$u" role="jymVt" />
     <node concept="3clFb_" id="4Q2Vz3iAFh6" role="jymVt">
@@ -3718,103 +3609,68 @@
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <node concept="3clFbS" id="4Q2Vz3iAFh9" role="3clF47">
+        <node concept="3cpWs8" id="7ipIhbo22bS" role="3cqZAp">
+          <node concept="3cpWsn" id="7ipIhbo22bV" role="3cpWs9">
+            <property role="TrG5h" value="models" />
+            <node concept="_YKpA" id="7ipIhbo22bO" role="1tU5fm">
+              <node concept="H_c77" id="vqDSp9U9G7" role="_ZDj9" />
+            </node>
+          </node>
+        </node>
         <node concept="1QHqEK" id="4Q2Vz3i$q4z" role="3cqZAp">
           <node concept="1QHqEC" id="4Q2Vz3i$q4$" role="1QHqEI">
             <node concept="3clFbS" id="4Q2Vz3i$q4_" role="1bW5cS">
-              <node concept="3clFbJ" id="4Q2Vz3iAJ01" role="3cqZAp">
-                <node concept="3clFbS" id="4Q2Vz3iAJ02" role="3clFbx">
-                  <node concept="3cpWs8" id="4Q2Vz3iAV2B" role="3cqZAp">
-                    <node concept="3cpWsn" id="4Q2Vz3iAV2C" role="3cpWs9">
-                      <property role="TrG5h" value="models" />
-                      <node concept="3uibUv" id="4Q2Vz3iAV2v" role="1tU5fm">
-                        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                        <node concept="3uibUv" id="4Q2Vz3iAV2y" role="11_B2D">
-                          <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="4Q2Vz3iAV2D" role="33vP2m">
-                        <node concept="37vLTw" id="4Q2Vz3iAV2E" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4Q2Vz3iApdn" resolve="solution" />
+              <node concept="3clFbF" id="7ipIhbo2Gei" role="3cqZAp">
+                <node concept="37vLTI" id="7ipIhbo2Gek" role="3clFbG">
+                  <node concept="2ShNRf" id="7ipIhbo28KY" role="37vLTx">
+                    <node concept="Tc6Ow" id="7ipIhbo2fiT" role="2ShVmc">
+                      <node concept="H_c77" id="vqDSp9UaFn" role="HW$YZ" />
+                      <node concept="2OqwBi" id="7ipIhbo1XHP" role="I$8f6">
+                        <node concept="37vLTw" id="7ipIhbo1XHQ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6KjVnJoXOSb" resolve="scope" />
                         </node>
-                        <node concept="liA8E" id="4Q2Vz3iAV2F" role="2OqNvi">
-                          <ref role="37wK5l" to="31cb:~SModuleBase.getModels()" resolve="getModels" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2Gpval" id="4Q2Vz3iAVyl" role="3cqZAp">
-                    <node concept="2GrKxI" id="4Q2Vz3iAVyo" role="2Gsz3X">
-                      <property role="TrG5h" value="m" />
-                    </node>
-                    <node concept="37vLTw" id="4Q2Vz3iAVBk" role="2GsD0m">
-                      <ref role="3cqZAo" node="4Q2Vz3iAV2C" resolve="models" />
-                    </node>
-                    <node concept="3clFbS" id="4Q2Vz3iAVyu" role="2LFqv$">
-                      <node concept="3clFbF" id="4Q2Vz3iAVR5" role="3cqZAp">
-                        <node concept="1rXfSq" id="4Q2Vz3iAVR4" role="3clFbG">
-                          <ref role="37wK5l" node="4Q2Vz3i$q3Z" resolve="searchModel" />
-                          <node concept="2GrUjf" id="4Q2Vz3iAVSP" role="37wK5m">
-                            <ref role="2Gs0qQ" node="4Q2Vz3iAVyo" resolve="m" />
-                          </node>
-                          <node concept="37vLTw" id="4Q2Vz3iAVYY" role="37wK5m">
-                            <ref role="3cqZAo" node="4Q2Vz3iAHai" resolve="text" />
-                          </node>
-                          <node concept="37vLTw" id="7DRyZmDov5Q" role="37wK5m">
-                            <ref role="3cqZAo" node="7DRyZmDopcL" resolve="searchAll" />
-                          </node>
+                        <node concept="liA8E" id="7ipIhbo1XHR" role="2OqNvi">
+                          <ref role="37wK5l" to="lui2:~SearchScope.getModels()" resolve="getModels" />
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-                <node concept="3y3z36" id="4Q2Vz3iAJf8" role="3clFbw">
-                  <node concept="10Nm6u" id="4Q2Vz3iAJhK" role="3uHU7w" />
-                  <node concept="37vLTw" id="4Q2Vz3iAJ0u" role="3uHU7B">
-                    <ref role="3cqZAo" node="4Q2Vz3iApdn" resolve="solution" />
-                  </node>
-                </node>
-                <node concept="9aQIb" id="4Q2Vz3iAJk7" role="9aQIa">
-                  <node concept="3clFbS" id="4Q2Vz3iAJk8" role="9aQI4">
-                    <node concept="3clFbF" id="4Q2Vz3iAJDp" role="3cqZAp">
-                      <node concept="1rXfSq" id="4Q2Vz3iAJDo" role="3clFbG">
-                        <ref role="37wK5l" node="4Q2Vz3i$q3Z" resolve="searchModel" />
-                        <node concept="37vLTw" id="4Q2Vz3iAJEY" role="37wK5m">
-                          <ref role="3cqZAo" node="4Q2Vz3i_uA1" resolve="model" />
-                        </node>
-                        <node concept="37vLTw" id="4Q2Vz3iAJJL" role="37wK5m">
-                          <ref role="3cqZAo" node="4Q2Vz3iAHai" resolve="text" />
-                        </node>
-                        <node concept="37vLTw" id="7DRyZmDoxX4" role="37wK5m">
-                          <ref role="3cqZAo" node="7DRyZmDopcL" resolve="searchAll" />
-                        </node>
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="7ipIhbo2Geo" role="37vLTJ">
+                    <ref role="3cqZAo" node="7ipIhbo22bV" resolve="models" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="3k8awrIlRg6" role="ukAjM">
+          <node concept="2OqwBi" id="6KjVnJp1Iuy" role="ukAjM">
             <node concept="37vLTw" id="3k8awrIlPn$" role="2Oq$k0">
-              <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="p" />
+              <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="project" />
             </node>
-            <node concept="liA8E" id="3k8awrIlSQc" role="2OqNvi">
+            <node concept="liA8E" id="6KjVnJp1JV$" role="2OqNvi">
               <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="4Q2Vz3iAJTi" role="3cqZAp">
-          <node concept="37vLTw" id="4Q2Vz3iAM3w" role="3cqZAk">
-            <ref role="3cqZAo" node="4Q2Vz3i_bj8" resolve="results" />
+        <node concept="3clFbF" id="4Q2Vz3iAVR5" role="3cqZAp">
+          <node concept="1rXfSq" id="4Q2Vz3iAVR4" role="3clFbG">
+            <ref role="37wK5l" node="4Q2Vz3i$q3Z" resolve="searchModel" />
+            <node concept="37vLTw" id="vqDSp9RPi7" role="37wK5m">
+              <ref role="3cqZAo" node="7ipIhbo22bV" resolve="models" />
+            </node>
+            <node concept="37vLTw" id="4Q2Vz3iAVYY" role="37wK5m">
+              <ref role="3cqZAo" node="4Q2Vz3iAHai" resolve="text" />
+            </node>
+            <node concept="37vLTw" id="7DRyZmDov5Q" role="37wK5m">
+              <ref role="3cqZAo" node="7DRyZmDopcL" resolve="searchAll" />
+            </node>
+            <node concept="37vLTw" id="vqDSp9RYfZ" role="37wK5m">
+              <ref role="3cqZAo" node="7ipIhbnXdOW" resolve="callback" />
+            </node>
           </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="4Q2Vz3iAQgf" role="1B3o_S" />
-      <node concept="_YKpA" id="4Q2Vz3iAF87" role="3clF45">
-        <node concept="3uibUv" id="4Q2Vz3iAFgR" role="_ZDj9">
-          <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
-        </node>
-      </node>
+      <node concept="3cqZAl" id="7ipIhbo1WXm" role="3clF45" />
       <node concept="37vLTG" id="4Q2Vz3iAHai" role="3clF46">
         <property role="TrG5h" value="text" />
         <node concept="17QB3L" id="4Q2Vz3iAHah" role="1tU5fm" />
@@ -3823,10 +3679,16 @@
         <property role="TrG5h" value="searchAll" />
         <node concept="10P_77" id="7DRyZmDoqKp" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="7ipIhbnXdOW" role="3clF46">
+        <property role="TrG5h" value="callback" />
+        <node concept="3uibUv" id="7ipIhbnXfIW" role="1tU5fm">
+          <ref role="3uigEE" node="7ipIhbnXbz3" resolve="SearchCallback" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="4Q2Vz3iAAJb" role="jymVt" />
     <node concept="3clFb_" id="4Q2Vz3i$q3Z" role="jymVt">
-      <property role="TrG5h" value="searchModel" />
+      <property role="TrG5h" value="searchModels" />
       <node concept="3Tm6S6" id="4Q2Vz3iAO9M" role="1B3o_S" />
       <node concept="3clFbS" id="4Q2Vz3i$q41" role="3clF47">
         <node concept="3clFbF" id="4Q2Vz3i$q4a" role="3cqZAp">
@@ -3841,14 +3703,14 @@
                 <node concept="YeOm9" id="4Q2Vz3i$q4f" role="2ShVmc">
                   <node concept="1Y3b0j" id="4Q2Vz3i$q4g" role="YeSDq">
                     <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="xygl:~Task$Modal" resolve="Task.Modal" />
-                    <ref role="37wK5l" to="xygl:~Task$Modal.&lt;init&gt;(com.intellij.openapi.project.Project,java.lang.String,boolean)" resolve="Task.Modal" />
+                    <ref role="1Y3XeK" to="xygl:~Task$Backgroundable" resolve="Backgroundable" />
+                    <ref role="37wK5l" to="xygl:~Task$Backgroundable.&lt;init&gt;(com.intellij.openapi.project.Project,java.lang.String,boolean)" resolve="Backgroundable" />
                     <node concept="3Tm1VV" id="4Q2Vz3i$q4h" role="1B3o_S" />
                     <node concept="2YIFZM" id="4Q2Vz3i$q4i" role="37wK5m">
                       <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
                       <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
                       <node concept="37vLTw" id="4Q2Vz3i_YVM" role="37wK5m">
-                        <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="p" />
+                        <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="project" />
                       </node>
                     </node>
                     <node concept="Xl_RD" id="4Q2Vz3i$q4k" role="37wK5m">
@@ -3873,94 +3735,163 @@
                         </node>
                       </node>
                       <node concept="3clFbS" id="4Q2Vz3i$q4s" role="3clF47">
-                        <node concept="1QHqEK" id="7DRyZmDiVJv" role="3cqZAp">
-                          <node concept="1QHqEC" id="7DRyZmDiVJx" role="1QHqEI">
-                            <node concept="3clFbS" id="7DRyZmDiVJz" role="1bW5cS">
-                              <node concept="3cpWs8" id="4Q2Vz3i$q4t" role="3cqZAp">
-                                <node concept="3cpWsn" id="4Q2Vz3i$q4u" role="3cpWs9">
-                                  <property role="TrG5h" value="progress" />
-                                  <property role="3TUv4t" value="true" />
-                                  <node concept="3uibUv" id="4Q2Vz3i$q4v" role="1tU5fm">
-                                    <ref role="3uigEE" to="mk90:~ProgressMonitorAdapter" resolve="ProgressMonitorAdapter" />
+                        <node concept="3cpWs8" id="7ipIhbo1zJF" role="3cqZAp">
+                          <node concept="3cpWsn" id="7ipIhbo1zJI" role="3cpWs9">
+                            <property role="TrG5h" value="results" />
+                            <node concept="_YKpA" id="4Q2Vz3i_ba4" role="1tU5fm">
+                              <node concept="3uibUv" id="4Q2Vz3i_biG" role="_ZDj9">
+                                <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
+                              </node>
+                            </node>
+                            <node concept="2ShNRf" id="7ipIhbo1CHr" role="33vP2m">
+                              <node concept="2Jqq0_" id="7ipIhbo1I_o" role="2ShVmc">
+                                <node concept="3uibUv" id="7ipIhbo1KxW" role="HW$YZ">
+                                  <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="7ipIhbo1vby" role="3cqZAp" />
+                        <node concept="3cpWs8" id="4Q2Vz3i$q4t" role="3cqZAp">
+                          <node concept="3cpWsn" id="4Q2Vz3i$q4u" role="3cpWs9">
+                            <property role="TrG5h" value="progress" />
+                            <property role="3TUv4t" value="true" />
+                            <node concept="3uibUv" id="4Q2Vz3i$q4v" role="1tU5fm">
+                              <ref role="3uigEE" to="mk90:~ProgressMonitorAdapter" resolve="ProgressMonitorAdapter" />
+                            </node>
+                            <node concept="2ShNRf" id="4Q2Vz3i$q4w" role="33vP2m">
+                              <node concept="1pGfFk" id="4Q2Vz3i$q4x" role="2ShVmc">
+                                <ref role="37wK5l" to="mk90:~ProgressMonitorAdapter.&lt;init&gt;(com.intellij.openapi.progress.ProgressIndicator)" resolve="ProgressMonitorAdapter" />
+                                <node concept="37vLTw" id="4Q2Vz3i$q4y" role="37wK5m">
+                                  <ref role="3cqZAo" node="4Q2Vz3i$q4p" resolve="pi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="4Q2Vz3i$q4M" role="3cqZAp">
+                          <node concept="2OqwBi" id="4Q2Vz3i$q4N" role="3clFbG">
+                            <node concept="37vLTw" id="4Q2Vz3i$q4O" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4Q2Vz3i$q4u" resolve="progress" />
+                            </node>
+                            <node concept="liA8E" id="4Q2Vz3i$q4P" role="2OqNvi">
+                              <ref role="37wK5l" to="mk8z:~ProgressMonitorBase.start(java.lang.String,int)" resolve="start" />
+                              <node concept="3cpWs3" id="vqDSp9Th0g" role="37wK5m">
+                                <node concept="Xl_RD" id="vqDSp9Tijc" role="3uHU7w">
+                                  <property role="Xl_RC" value=" models" />
+                                </node>
+                                <node concept="3cpWs3" id="vqDSp9T0hR" role="3uHU7B">
+                                  <node concept="Xl_RD" id="4Q2Vz3i$q4Q" role="3uHU7B">
+                                    <property role="Xl_RC" value="Searching: " />
                                   </node>
-                                  <node concept="2ShNRf" id="4Q2Vz3i$q4w" role="33vP2m">
-                                    <node concept="1pGfFk" id="4Q2Vz3i$q4x" role="2ShVmc">
-                                      <ref role="37wK5l" to="mk90:~ProgressMonitorAdapter.&lt;init&gt;(com.intellij.openapi.progress.ProgressIndicator)" resolve="ProgressMonitorAdapter" />
-                                      <node concept="37vLTw" id="4Q2Vz3i$q4y" role="37wK5m">
-                                        <ref role="3cqZAo" node="4Q2Vz3i$q4p" resolve="pi" />
-                                      </node>
+                                  <node concept="2OqwBi" id="vqDSp9T5rH" role="3uHU7w">
+                                    <node concept="37vLTw" id="vqDSp9T2kr" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="models" />
                                     </node>
+                                    <node concept="34oBXx" id="vqDSp9T9TC" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs8" id="7DRyZmDoGX7" role="3cqZAp">
-                                <node concept="3cpWsn" id="7DRyZmDoGXa" role="3cpWs9">
-                                  <property role="TrG5h" value="toBeSearched" />
-                                  <node concept="2hMVRd" id="7DRyZmDoGX3" role="1tU5fm">
-                                    <node concept="3Tqbb2" id="7DRyZmDoIhK" role="2hN53Y" />
-                                  </node>
-                                  <node concept="2ShNRf" id="7DRyZmDoMR1" role="33vP2m">
-                                    <node concept="2i4dXS" id="7DRyZmDoMpP" role="2ShVmc">
-                                      <node concept="3Tqbb2" id="7DRyZmDoMpQ" role="HW$YZ" />
-                                    </node>
+                              <node concept="2OqwBi" id="vqDSp9TsMQ" role="37wK5m">
+                                <node concept="37vLTw" id="vqDSp9Tps0" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="models" />
+                                </node>
+                                <node concept="34oBXx" id="vqDSp9TxiS" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3cpWs8" id="vqDSp9YA8B" role="3cqZAp">
+                          <node concept="3cpWsn" id="vqDSp9YA8E" role="3cpWs9">
+                            <property role="TrG5h" value="modelIndex" />
+                            <node concept="10Oyi0" id="vqDSp9YA8_" role="1tU5fm" />
+                            <node concept="3cmrfG" id="vqDSp9YHmf" role="33vP2m">
+                              <property role="3cmrfH" value="1" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2Gpval" id="vqDSp9Sb6J" role="3cqZAp">
+                          <node concept="2GrKxI" id="vqDSp9Sb6L" role="2Gsz3X">
+                            <property role="TrG5h" value="model" />
+                          </node>
+                          <node concept="37vLTw" id="vqDSp9SoOL" role="2GsD0m">
+                            <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="models" />
+                          </node>
+                          <node concept="3clFbS" id="vqDSp9Sb6P" role="2LFqv$">
+                            <node concept="3cpWs8" id="7DRyZmDoGX7" role="3cqZAp">
+                              <node concept="3cpWsn" id="7DRyZmDoGXa" role="3cpWs9">
+                                <property role="TrG5h" value="toBeSearched" />
+                                <node concept="2hMVRd" id="7DRyZmDoGX3" role="1tU5fm">
+                                  <node concept="3Tqbb2" id="7DRyZmDoIhK" role="2hN53Y" />
+                                </node>
+                                <node concept="2ShNRf" id="7DRyZmDoMR1" role="33vP2m">
+                                  <node concept="2i4dXS" id="7DRyZmDoMpP" role="2ShVmc">
+                                    <node concept="3Tqbb2" id="7DRyZmDoMpQ" role="HW$YZ" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbJ" id="7DRyZmDp1RM" role="3cqZAp">
-                                <node concept="3clFbS" id="7DRyZmDp1RO" role="3clFbx">
-                                  <node concept="3clFbF" id="7DRyZmDphXJ" role="3cqZAp">
-                                    <node concept="2OqwBi" id="7DRyZmDpjPM" role="3clFbG">
-                                      <node concept="37vLTw" id="7DRyZmDphXH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
-                                      </node>
-                                      <node concept="X8dFx" id="76N1O$Ki_Nz" role="2OqNvi">
-                                        <node concept="2OqwBi" id="76N1O$Ki_Nw" role="25WWJ7">
-                                          <node concept="37vLTw" id="76N1O$Ki_Nx" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="m" />
+                            </node>
+                            <node concept="1QHqEK" id="7DRyZmDiVJv" role="3cqZAp">
+                              <node concept="1QHqEC" id="7DRyZmDiVJx" role="1QHqEI">
+                                <node concept="3clFbS" id="7DRyZmDiVJz" role="1bW5cS">
+                                  <node concept="3clFbJ" id="7DRyZmDp1RM" role="3cqZAp">
+                                    <node concept="3clFbS" id="7DRyZmDp1RO" role="3clFbx">
+                                      <node concept="3clFbF" id="7DRyZmDphXJ" role="3cqZAp">
+                                        <node concept="2OqwBi" id="7DRyZmDpjPM" role="3clFbG">
+                                          <node concept="37vLTw" id="7DRyZmDphXH" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                          </node>
+                                          <node concept="X8dFx" id="76N1O$Ki_Nz" role="2OqNvi">
+                                            <node concept="2OqwBi" id="76N1O$Ki_Nw" role="25WWJ7">
+                                              <node concept="2SmgA7" id="76N1O$Ki_Ny" role="2OqNvi" />
+                                              <node concept="2GrUjf" id="vqDSp9TAPS" role="2Oq$k0">
+                                                <ref role="2Gs0qQ" node="vqDSp9Sb6L" resolve="model" />
+                                              </node>
+                                            </node>
                                           </node>
-                                          <node concept="2SmgA7" id="76N1O$Ki_Ny" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
-                                  </node>
-                                </node>
-                                <node concept="37vLTw" id="7DRyZmDp3UQ" role="3clFbw">
-                                  <ref role="3cqZAo" node="7DRyZmDozcG" resolve="searchAll" />
-                                </node>
-                                <node concept="9aQIb" id="7DRyZmDp6b5" role="9aQIa">
-                                  <node concept="3clFbS" id="7DRyZmDp6b6" role="9aQI4">
-                                    <node concept="3clFbF" id="7DRyZmDp8_I" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7DRyZmDpaNF" role="3clFbG">
-                                        <node concept="37vLTw" id="7DRyZmDp8_H" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
-                                        </node>
-                                        <node concept="X8dFx" id="76N1O$Ki_NC" role="2OqNvi">
-                                          <node concept="2OqwBi" id="76N1O$Ki_N$" role="25WWJ7">
-                                            <node concept="37vLTw" id="76N1O$Ki_N_" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="m" />
+                                    <node concept="37vLTw" id="7DRyZmDp3UQ" role="3clFbw">
+                                      <ref role="3cqZAo" node="7DRyZmDozcG" resolve="searchAll" />
+                                    </node>
+                                    <node concept="9aQIb" id="7DRyZmDp6b5" role="9aQIa">
+                                      <node concept="3clFbS" id="7DRyZmDp6b6" role="9aQI4">
+                                        <node concept="3clFbF" id="7DRyZmDp8_I" role="3cqZAp">
+                                          <node concept="2OqwBi" id="7DRyZmDpaNF" role="3clFbG">
+                                            <node concept="37vLTw" id="7DRyZmDp8_H" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
                                             </node>
-                                            <node concept="2SmgA7" id="76N1O$Ki_NA" role="2OqNvi">
-                                              <node concept="chp4Y" id="76N1O$Ki_NB" role="1dBWTz">
-                                                <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
+                                            <node concept="X8dFx" id="76N1O$Ki_NC" role="2OqNvi">
+                                              <node concept="2OqwBi" id="76N1O$Ki_N$" role="25WWJ7">
+                                                <node concept="2SmgA7" id="76N1O$Ki_NA" role="2OqNvi">
+                                                  <node concept="chp4Y" id="76N1O$Ki_NB" role="1dBWTz">
+                                                    <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
+                                                  </node>
+                                                </node>
+                                                <node concept="2GrUjf" id="vqDSp9TFst" role="2Oq$k0">
+                                                  <ref role="2Gs0qQ" node="vqDSp9Sb6L" resolve="model" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbF" id="7DRyZmDpeMV" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7DRyZmDpeMW" role="3clFbG">
-                                        <node concept="37vLTw" id="7DRyZmDpeMX" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
-                                        </node>
-                                        <node concept="X8dFx" id="76N1O$Ki_NH" role="2OqNvi">
-                                          <node concept="2OqwBi" id="76N1O$Ki_ND" role="25WWJ7">
-                                            <node concept="37vLTw" id="76N1O$Ki_NE" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="m" />
+                                        <node concept="3clFbF" id="7DRyZmDpeMV" role="3cqZAp">
+                                          <node concept="2OqwBi" id="7DRyZmDpeMW" role="3clFbG">
+                                            <node concept="37vLTw" id="7DRyZmDpeMX" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
                                             </node>
-                                            <node concept="2SmgA7" id="76N1O$Ki_NF" role="2OqNvi">
-                                              <node concept="chp4Y" id="76N1O$Ki_NG" role="1dBWTz">
-                                                <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                            <node concept="X8dFx" id="76N1O$Ki_NH" role="2OqNvi">
+                                              <node concept="2OqwBi" id="76N1O$Ki_ND" role="25WWJ7">
+                                                <node concept="2SmgA7" id="76N1O$Ki_NF" role="2OqNvi">
+                                                  <node concept="chp4Y" id="76N1O$Ki_NG" role="1dBWTz">
+                                                    <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                                  </node>
+                                                </node>
+                                                <node concept="2GrUjf" id="vqDSp9TKk2" role="2Oq$k0">
+                                                  <ref role="2Gs0qQ" node="vqDSp9Sb6L" resolve="model" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
@@ -3970,760 +3901,884 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="4Q2Vz3i$q4M" role="3cqZAp">
-                                <node concept="2OqwBi" id="4Q2Vz3i$q4N" role="3clFbG">
-                                  <node concept="37vLTw" id="4Q2Vz3i$q4O" role="2Oq$k0">
+                              <node concept="2OqwBi" id="3k8awrIlWr_" role="ukAjM">
+                                <node concept="37vLTw" id="3k8awrIlU$u" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="project" />
+                                </node>
+                                <node concept="liA8E" id="3k8awrIlY4_" role="2OqNvi">
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs8" id="vqDSp9UErm" role="3cqZAp">
+                              <node concept="3cpWsn" id="vqDSp9UErn" role="3cpWs9">
+                                <property role="TrG5h" value="subTask" />
+                                <node concept="3uibUv" id="vqDSp9UE2N" role="1tU5fm">
+                                  <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
+                                </node>
+                                <node concept="2OqwBi" id="vqDSp9UEro" role="33vP2m">
+                                  <node concept="37vLTw" id="vqDSp9UErp" role="2Oq$k0">
                                     <ref role="3cqZAo" node="4Q2Vz3i$q4u" resolve="progress" />
                                   </node>
-                                  <node concept="liA8E" id="4Q2Vz3i$q4P" role="2OqNvi">
-                                    <ref role="37wK5l" to="mk8z:~ProgressMonitorBase.start(java.lang.String,int)" resolve="start" />
-                                    <node concept="Xl_RD" id="4Q2Vz3i$q4Q" role="37wK5m">
-                                      <property role="Xl_RC" value="Searching..." />
-                                    </node>
-                                    <node concept="2OqwBi" id="4Q2Vz3i$q4V" role="37wK5m">
-                                      <node concept="37vLTw" id="7DRyZmDpuU_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
-                                      </node>
-                                      <node concept="34oBXx" id="4Q2Vz3i$q4X" role="2OqNvi" />
+                                  <node concept="liA8E" id="vqDSp9UErq" role="2OqNvi">
+                                    <ref role="37wK5l" to="mk8z:~ProgressMonitorBase.subTask(int)" resolve="subTask" />
+                                    <node concept="3cmrfG" id="vqDSpa0wem" role="37wK5m">
+                                      <property role="3cmrfH" value="1" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="4Q2Vz3i$q4Y" role="3cqZAp" />
-                              <node concept="3cpWs8" id="4Q2Vz3i$q4Z" role="3cqZAp">
-                                <node concept="3cpWsn" id="4Q2Vz3i$q50" role="3cpWs9">
-                                  <property role="TrG5h" value="found" />
-                                  <node concept="2hMVRd" id="4Q2Vz3i$q51" role="1tU5fm">
-                                    <node concept="3Tqbb2" id="4Q2Vz3i$q52" role="2hN53Y" />
+                            </node>
+                            <node concept="3clFbF" id="vqDSp9VPOW" role="3cqZAp">
+                              <node concept="2OqwBi" id="vqDSp9VSq4" role="3clFbG">
+                                <node concept="37vLTw" id="vqDSp9VPOU" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="vqDSp9UErn" resolve="subTask" />
+                                </node>
+                                <node concept="liA8E" id="vqDSp9VUfi" role="2OqNvi">
+                                  <ref role="37wK5l" to="yyf4:~ProgressMonitor.start(java.lang.String,int)" resolve="start" />
+                                  <node concept="3cpWs3" id="vqDSp9ZpG7" role="37wK5m">
+                                    <node concept="2OqwBi" id="vqDSp9ZuIK" role="3uHU7w">
+                                      <node concept="37vLTw" id="vqDSp9Zrbn" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="models" />
+                                      </node>
+                                      <node concept="34oBXx" id="vqDSp9Zxgt" role="2OqNvi" />
+                                    </node>
+                                    <node concept="3cpWs3" id="vqDSp9ZjJL" role="3uHU7B">
+                                      <node concept="3cpWs3" id="vqDSp9YPzi" role="3uHU7B">
+                                        <node concept="Xl_RD" id="vqDSp9YLd9" role="3uHU7B">
+                                          <property role="Xl_RC" value="Model " />
+                                        </node>
+                                        <node concept="1eOMI4" id="vqDSp9YZ3$" role="3uHU7w">
+                                          <node concept="3uNrnE" id="vqDSp9Z5xa" role="1eOMHV">
+                                            <node concept="37vLTw" id="vqDSp9Z5xc" role="2$L3a6">
+                                              <ref role="3cqZAo" node="vqDSp9YA8E" resolve="modelIndex" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="Xl_RD" id="vqDSp9ZlRg" role="3uHU7w">
+                                        <property role="Xl_RC" value=" of " />
+                                      </node>
+                                    </node>
                                   </node>
-                                  <node concept="2ShNRf" id="4Q2Vz3i$q53" role="33vP2m">
-                                    <node concept="2i4dXS" id="4Q2Vz3i$q54" role="2ShVmc">
-                                      <node concept="3Tqbb2" id="4Q2Vz3i$q55" role="HW$YZ" />
+                                  <node concept="2OqwBi" id="vqDSp9WpZl" role="37wK5m">
+                                    <node concept="37vLTw" id="vqDSp9WpZm" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
                                     </node>
+                                    <node concept="34oBXx" id="vqDSp9WpZn" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2Gpval" id="7DRyZmDp$pP" role="3cqZAp">
-                                <node concept="2GrKxI" id="7DRyZmDp$pR" role="2Gsz3X">
-                                  <property role="TrG5h" value="it" />
+                            </node>
+                            <node concept="3clFbH" id="vqDSp9VVcZ" role="3cqZAp" />
+                            <node concept="3cpWs8" id="4Q2Vz3i$q4Z" role="3cqZAp">
+                              <node concept="3cpWsn" id="4Q2Vz3i$q50" role="3cpWs9">
+                                <property role="TrG5h" value="found" />
+                                <node concept="2hMVRd" id="4Q2Vz3i$q51" role="1tU5fm">
+                                  <node concept="3Tqbb2" id="4Q2Vz3i$q52" role="2hN53Y" />
                                 </node>
-                                <node concept="37vLTw" id="7DRyZmDpABx" role="2GsD0m">
-                                  <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                <node concept="2ShNRf" id="4Q2Vz3i$q53" role="33vP2m">
+                                  <node concept="2i4dXS" id="4Q2Vz3i$q54" role="2ShVmc">
+                                    <node concept="3Tqbb2" id="4Q2Vz3i$q55" role="HW$YZ" />
+                                  </node>
                                 </node>
-                                <node concept="3clFbS" id="7DRyZmDp$pV" role="2LFqv$">
-                                  <node concept="3clFbF" id="4Q2Vz3i$q5l" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4Q2Vz3i$q5m" role="3clFbG">
-                                      <node concept="37vLTw" id="4Q2Vz3i$q5n" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4Q2Vz3i$q4u" resolve="progress" />
-                                      </node>
-                                      <node concept="liA8E" id="4Q2Vz3i$q5o" role="2OqNvi">
-                                        <ref role="37wK5l" to="mk8z:~ProgressMonitorBase.advance(int)" resolve="advance" />
-                                        <node concept="3cmrfG" id="4Q2Vz3i$q5p" role="37wK5m">
-                                          <property role="3cmrfH" value="1" />
-                                        </node>
+                              </node>
+                            </node>
+                            <node concept="2Gpval" id="7DRyZmDp$pP" role="3cqZAp">
+                              <node concept="2GrKxI" id="7DRyZmDp$pR" role="2Gsz3X">
+                                <property role="TrG5h" value="it" />
+                              </node>
+                              <node concept="37vLTw" id="7DRyZmDpABx" role="2GsD0m">
+                                <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                              </node>
+                              <node concept="3clFbS" id="7DRyZmDp$pV" role="2LFqv$">
+                                <node concept="3clFbF" id="4Q2Vz3i$q5l" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4Q2Vz3i$q5m" role="3clFbG">
+                                    <node concept="37vLTw" id="4Q2Vz3i$q5n" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="vqDSp9UErn" resolve="subTask" />
+                                    </node>
+                                    <node concept="liA8E" id="4Q2Vz3i$q5o" role="2OqNvi">
+                                      <ref role="37wK5l" to="yyf4:~ProgressMonitor.advance(int)" resolve="advance" />
+                                      <node concept="3cmrfG" id="4Q2Vz3i$q5p" role="37wK5m">
+                                        <property role="3cmrfH" value="1" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbJ" id="4Q2Vz3i$q5q" role="3cqZAp">
-                                    <node concept="3clFbS" id="4Q2Vz3i$q5r" role="3clFbx">
-                                      <node concept="3zACq4" id="4Q2Vz3i$q5s" role="3cqZAp" />
+                                </node>
+                                <node concept="3clFbJ" id="4Q2Vz3i$q5q" role="3cqZAp">
+                                  <node concept="3clFbS" id="4Q2Vz3i$q5r" role="3clFbx">
+                                    <node concept="3zACq4" id="4Q2Vz3i$q5s" role="3cqZAp" />
+                                  </node>
+                                  <node concept="2OqwBi" id="4Q2Vz3i$q5t" role="3clFbw">
+                                    <node concept="37vLTw" id="4Q2Vz3i$q5u" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4Q2Vz3i$q4p" resolve="pi" />
                                     </node>
-                                    <node concept="2OqwBi" id="4Q2Vz3i$q5t" role="3clFbw">
-                                      <node concept="37vLTw" id="4Q2Vz3i$q5u" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4Q2Vz3i$q4p" resolve="pi" />
-                                      </node>
-                                      <node concept="liA8E" id="4Q2Vz3i$q5v" role="2OqNvi">
-                                        <ref role="37wK5l" to="xygl:~ProgressIndicator.isCanceled()" resolve="isCanceled" />
-                                      </node>
+                                    <node concept="liA8E" id="4Q2Vz3i$q5v" role="2OqNvi">
+                                      <ref role="37wK5l" to="xygl:~ProgressIndicator.isCanceled()" resolve="isCanceled" />
                                     </node>
                                   </node>
-                                  <node concept="3clFbJ" id="4Q2Vz3i$q5w" role="3cqZAp">
-                                    <node concept="3clFbS" id="4Q2Vz3i$q5x" role="3clFbx">
-                                      <node concept="3N13vt" id="4Q2Vz3i$q5y" role="3cqZAp" />
+                                </node>
+                                <node concept="3clFbH" id="7ipIhboa9PF" role="3cqZAp" />
+                                <node concept="3clFbJ" id="4Q2Vz3i$q5w" role="3cqZAp">
+                                  <node concept="3clFbS" id="4Q2Vz3i$q5x" role="3clFbx">
+                                    <node concept="3N13vt" id="4Q2Vz3i$q5y" role="3cqZAp" />
+                                  </node>
+                                  <node concept="2OqwBi" id="4Q2Vz3i$q5z" role="3clFbw">
+                                    <node concept="2GrUjf" id="4Q2Vz3i$q5$" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                     </node>
-                                    <node concept="2OqwBi" id="4Q2Vz3i$q5z" role="3clFbw">
-                                      <node concept="2GrUjf" id="4Q2Vz3i$q5$" role="2Oq$k0">
-                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                      </node>
-                                      <node concept="1mIQ4w" id="4Q2Vz3i$q5_" role="2OqNvi">
-                                        <node concept="chp4Y" id="4Q2Vz3i$q5A" role="cj9EA">
-                                          <ref role="cht4Q" to="vs0r:Ug1QzfhXN3" resolve="IEmpty" />
-                                        </node>
+                                    <node concept="1mIQ4w" id="4Q2Vz3i$q5_" role="2OqNvi">
+                                      <node concept="chp4Y" id="4Q2Vz3i$q5A" role="cj9EA">
+                                        <ref role="cht4Q" to="vs0r:Ug1QzfhXN3" resolve="IEmpty" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbJ" id="7DRyZmEC7t2" role="3cqZAp">
-                                    <node concept="3clFbS" id="7DRyZmEC7t3" role="3clFbx">
-                                      <node concept="3cpWs8" id="7DRyZmEC7t4" role="3cqZAp">
-                                        <node concept="3cpWsn" id="7DRyZmEC7t5" role="3cpWs9">
-                                          <property role="TrG5h" value="iss" />
-                                          <node concept="3Tqbb2" id="7DRyZmEC7t6" role="1tU5fm">
-                                            <ref role="ehGHo" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
-                                          </node>
-                                          <node concept="1PxgMI" id="7DRyZmEC7t7" role="33vP2m">
-                                            <node concept="chp4Y" id="7DRyZmEC7t8" role="3oSUPX">
-                                              <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
-                                            </node>
-                                            <node concept="2GrUjf" id="7DRyZmEC7t9" role="1m5AlR">
-                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3clFbJ" id="7DRyZmEC7ta" role="3cqZAp">
-                                        <node concept="3clFbS" id="7DRyZmEC7tb" role="3clFbx">
-                                          <node concept="3cpWs8" id="7DRyZmEC7tc" role="3cqZAp">
-                                            <node concept="3cpWsn" id="7DRyZmEC7td" role="3cpWs9">
-                                              <property role="TrG5h" value="resultNode" />
-                                              <node concept="3Tqbb2" id="7DRyZmEC7te" role="1tU5fm" />
-                                              <node concept="2OqwBi" id="7DRyZmEC7tf" role="33vP2m">
-                                                <node concept="2qgKlT" id="7DRyZmEC7tg" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hwgx:4ueXZrqtaGB" resolve="getResultNode" />
+                                </node>
+                                <node concept="3clFbH" id="7ipIhboab7s" role="3cqZAp" />
+                                <node concept="1QHqEK" id="7ipIhbo92tM" role="3cqZAp">
+                                  <node concept="1QHqEC" id="7ipIhbo92tO" role="1QHqEI">
+                                    <node concept="3clFbS" id="7ipIhbo92tQ" role="1bW5cS">
+                                      <node concept="3clFbJ" id="7DRyZmEC7t2" role="3cqZAp">
+                                        <node concept="3clFbS" id="7DRyZmEC7t3" role="3clFbx">
+                                          <node concept="3cpWs8" id="7DRyZmEC7t4" role="3cqZAp">
+                                            <node concept="3cpWsn" id="7DRyZmEC7t5" role="3cpWs9">
+                                              <property role="TrG5h" value="iss" />
+                                              <node concept="3Tqbb2" id="7DRyZmEC7t6" role="1tU5fm">
+                                                <ref role="ehGHo" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
+                                              </node>
+                                              <node concept="1PxgMI" id="7DRyZmEC7t7" role="33vP2m">
+                                                <node concept="chp4Y" id="7DRyZmEC7t8" role="3oSUPX">
+                                                  <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
                                                 </node>
-                                                <node concept="37vLTw" id="7DRyZmEC7th" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
+                                                <node concept="2GrUjf" id="7DRyZmEC7t9" role="1m5AlR">
+                                                  <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="3clFbJ" id="7DRyZmEDijE" role="3cqZAp">
-                                            <node concept="3clFbS" id="7DRyZmEDijG" role="3clFbx">
-                                              <node concept="3clFbF" id="7DRyZmEC7ti" role="3cqZAp">
-                                                <node concept="2OqwBi" id="7DRyZmEC7tj" role="3clFbG">
-                                                  <node concept="37vLTw" id="7DRyZmEC7tk" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
-                                                  </node>
-                                                  <node concept="TSZUe" id="7DRyZmEC7tl" role="2OqNvi">
-                                                    <node concept="37vLTw" id="7DRyZmEC7tm" role="25WWJ7">
-                                                      <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
+                                          <node concept="3clFbJ" id="7DRyZmEC7ta" role="3cqZAp">
+                                            <node concept="3clFbS" id="7DRyZmEC7tb" role="3clFbx">
+                                              <node concept="3cpWs8" id="7DRyZmEC7tc" role="3cqZAp">
+                                                <node concept="3cpWsn" id="7DRyZmEC7td" role="3cpWs9">
+                                                  <property role="TrG5h" value="resultNode" />
+                                                  <node concept="3Tqbb2" id="7DRyZmEC7te" role="1tU5fm" />
+                                                  <node concept="2OqwBi" id="7DRyZmEC7tf" role="33vP2m">
+                                                    <node concept="2qgKlT" id="7DRyZmEC7tg" role="2OqNvi">
+                                                      <ref role="37wK5l" to="hwgx:4ueXZrqtaGB" resolve="getResultNode" />
+                                                    </node>
+                                                    <node concept="37vLTw" id="7DRyZmEC7th" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="3clFbF" id="7DRyZmEC7tn" role="3cqZAp">
-                                                <node concept="2OqwBi" id="7DRyZmEC7to" role="3clFbG">
-                                                  <node concept="37vLTw" id="7DRyZmEC7tp" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="4Q2Vz3i_bj8" resolve="results" />
-                                                  </node>
-                                                  <node concept="TSZUe" id="7DRyZmEC7tq" role="2OqNvi">
-                                                    <node concept="2ShNRf" id="7DRyZmEC7tr" role="25WWJ7">
-                                                      <node concept="1pGfFk" id="7DRyZmEC7ts" role="2ShVmc">
-                                                        <ref role="37wK5l" node="2HzhasN$atr" resolve="SearchResult" />
-                                                        <node concept="37vLTw" id="7DRyZmEC7tt" role="37wK5m">
-                                                          <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="m" />
+                                              <node concept="3clFbJ" id="7DRyZmEDijE" role="3cqZAp">
+                                                <node concept="3clFbS" id="7DRyZmEDijG" role="3clFbx">
+                                                  <node concept="3clFbF" id="7DRyZmEC7ti" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="7DRyZmEC7tj" role="3clFbG">
+                                                      <node concept="37vLTw" id="7DRyZmEC7tk" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                      </node>
+                                                      <node concept="TSZUe" id="7DRyZmEC7tl" role="2OqNvi">
+                                                        <node concept="37vLTw" id="7DRyZmEC7tm" role="25WWJ7">
+                                                          <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
                                                         </node>
-                                                        <node concept="2ShNRf" id="7DRyZmEC7tu" role="37wK5m">
-                                                          <node concept="1pGfFk" id="7DRyZmEC7tv" role="2ShVmc">
-                                                            <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
-                                                            <node concept="37vLTw" id="7DRyZmEC7tw" role="37wK5m">
-                                                              <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3clFbF" id="7DRyZmEC7tn" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="7DRyZmEC7to" role="3clFbG">
+                                                      <node concept="37vLTw" id="7DRyZmEC7tp" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                                                      </node>
+                                                      <node concept="TSZUe" id="7DRyZmEC7tq" role="2OqNvi">
+                                                        <node concept="2ShNRf" id="7DRyZmEC7tr" role="25WWJ7">
+                                                          <node concept="1pGfFk" id="7DRyZmEC7ts" role="2ShVmc">
+                                                            <ref role="37wK5l" node="2HzhasN$atr" resolve="SearchResult" />
+                                                            <node concept="2GrUjf" id="vqDSp9UQH1" role="37wK5m">
+                                                              <ref role="2Gs0qQ" node="vqDSp9Sb6L" resolve="model" />
+                                                            </node>
+                                                            <node concept="2ShNRf" id="7DRyZmEC7tu" role="37wK5m">
+                                                              <node concept="1pGfFk" id="7DRyZmEC7tv" role="2ShVmc">
+                                                                <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
+                                                                <node concept="37vLTw" id="7DRyZmEC7tw" role="37wK5m">
+                                                                  <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                            <node concept="2OqwBi" id="7DRyZmEC7tx" role="37wK5m">
+                                                              <node concept="37vLTw" id="7DRyZmEC7ty" role="2Oq$k0">
+                                                                <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
+                                                              </node>
+                                                              <node concept="2qgKlT" id="7DRyZmEC7tz" role="2OqNvi">
+                                                                <ref role="37wK5l" to="hwgx:jpyKDg1pW5" resolve="resultName" />
+                                                              </node>
+                                                            </node>
+                                                            <node concept="3P9mCS" id="7DRyZmEC7t$" role="37wK5m">
+                                                              <ref role="37wK5l" node="4Q2Vz3i$q7i" resolve="conceptLabel" />
+                                                              <node concept="37vLTw" id="7DRyZmEC7t_" role="37wK5m">
+                                                                <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
+                                                              </node>
+                                                            </node>
+                                                            <node concept="2OqwBi" id="7DRyZmEC7tA" role="37wK5m">
+                                                              <node concept="37vLTw" id="7DRyZmEC7tB" role="2Oq$k0">
+                                                                <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
+                                                              </node>
+                                                              <node concept="2qgKlT" id="7DRyZmEC7tC" role="2OqNvi">
+                                                                <ref role="37wK5l" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
+                                                              </node>
                                                             </node>
-                                                          </node>
-                                                        </node>
-                                                        <node concept="2OqwBi" id="7DRyZmEC7tx" role="37wK5m">
-                                                          <node concept="37vLTw" id="7DRyZmEC7ty" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
-                                                          </node>
-                                                          <node concept="2qgKlT" id="7DRyZmEC7tz" role="2OqNvi">
-                                                            <ref role="37wK5l" to="hwgx:jpyKDg1pW5" resolve="resultName" />
-                                                          </node>
-                                                        </node>
-                                                        <node concept="3P9mCS" id="7DRyZmEC7t$" role="37wK5m">
-                                                          <ref role="37wK5l" node="4Q2Vz3i$q7i" resolve="conceptLabel" />
-                                                          <node concept="37vLTw" id="7DRyZmEC7t_" role="37wK5m">
-                                                            <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
-                                                          </node>
-                                                        </node>
-                                                        <node concept="2OqwBi" id="7DRyZmEC7tA" role="37wK5m">
-                                                          <node concept="37vLTw" id="7DRyZmEC7tB" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
-                                                          </node>
-                                                          <node concept="2qgKlT" id="7DRyZmEC7tC" role="2OqNvi">
-                                                            <ref role="37wK5l" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
                                                           </node>
                                                         </node>
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
-                                              </node>
-                                            </node>
-                                            <node concept="3fqX7Q" id="7DRyZmEDjeu" role="3clFbw">
-                                              <node concept="2OqwBi" id="7DRyZmEDpYe" role="3fr31v">
-                                                <node concept="37vLTw" id="7DRyZmEDnlo" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
-                                                </node>
-                                                <node concept="3JPx81" id="7DRyZmEDsXB" role="2OqNvi">
-                                                  <node concept="37vLTw" id="7DRyZmEDvEC" role="25WWJ7">
-                                                    <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
+                                                <node concept="3fqX7Q" id="7DRyZmEDjeu" role="3clFbw">
+                                                  <node concept="2OqwBi" id="7DRyZmEDpYe" role="3fr31v">
+                                                    <node concept="37vLTw" id="7DRyZmEDnlo" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                    </node>
+                                                    <node concept="3JPx81" id="7DRyZmEDsXB" role="2OqNvi">
+                                                      <node concept="37vLTw" id="7DRyZmEDvEC" role="25WWJ7">
+                                                        <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
+                                                      </node>
+                                                    </node>
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                          </node>
-                                        </node>
-                                        <node concept="2OqwBi" id="7DRyZmEC7tD" role="3clFbw">
-                                          <node concept="37vLTw" id="7DRyZmEC7tE" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
-                                          </node>
-                                          <node concept="2qgKlT" id="7DRyZmEC7tF" role="2OqNvi">
-                                            <ref role="37wK5l" to="hwgx:jpyKDg1onB" resolve="containsText" />
-                                            <node concept="37vLTw" id="7DRyZmEC7tG" role="37wK5m">
-                                              <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                            <node concept="2OqwBi" id="7DRyZmEC7tD" role="3clFbw">
+                                              <node concept="37vLTw" id="7DRyZmEC7tE" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
+                                              </node>
+                                              <node concept="2qgKlT" id="7DRyZmEC7tF" role="2OqNvi">
+                                                <ref role="37wK5l" to="hwgx:jpyKDg1onB" resolve="containsText" />
+                                                <node concept="37vLTw" id="7DRyZmEC7tG" role="37wK5m">
+                                                  <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                </node>
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="7DRyZmEC7tH" role="3clFbw">
-                                      <node concept="2GrUjf" id="7DRyZmEC7tI" role="2Oq$k0">
-                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                      </node>
-                                      <node concept="1mIQ4w" id="7DRyZmEC7tJ" role="2OqNvi">
-                                        <node concept="chp4Y" id="7DRyZmEC7tK" role="cj9EA">
-                                          <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbJ" id="7DRyZmECiAE" role="3cqZAp">
-                                    <node concept="3clFbS" id="7DRyZmECiAF" role="3clFbx">
-                                      <node concept="3cpWs8" id="7DRyZmECiBr" role="3cqZAp">
-                                        <node concept="3cpWsn" id="7DRyZmECiBs" role="3cpWs9">
-                                          <property role="TrG5h" value="in" />
-                                          <node concept="3Tqbb2" id="7DRyZmECiBt" role="1tU5fm">
-                                            <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                        <node concept="2OqwBi" id="7DRyZmEC7tH" role="3clFbw">
+                                          <node concept="2GrUjf" id="7DRyZmEC7tI" role="2Oq$k0">
+                                            <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                           </node>
-                                          <node concept="1PxgMI" id="7DRyZmECiBu" role="33vP2m">
-                                            <node concept="chp4Y" id="7DRyZmECiBv" role="3oSUPX">
-                                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                            </node>
-                                            <node concept="2GrUjf" id="7DRyZmECiBw" role="1m5AlR">
-                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                          <node concept="1mIQ4w" id="7DRyZmEC7tJ" role="2OqNvi">
+                                            <node concept="chp4Y" id="7DRyZmEC7tK" role="cj9EA">
+                                              <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3clFbJ" id="7DRyZmECiBx" role="3cqZAp">
-                                        <node concept="3clFbS" id="7DRyZmECiBy" role="3clFbx">
-                                          <node concept="3clFbJ" id="7DRyZmECiBz" role="3cqZAp">
-                                            <node concept="3clFbS" id="7DRyZmECiB$" role="3clFbx">
-                                              <node concept="3cpWs8" id="7DRyZmECiB_" role="3cqZAp">
-                                                <node concept="3cpWsn" id="7DRyZmECiBA" role="3cpWs9">
-                                                  <property role="TrG5h" value="ns" />
-                                                  <node concept="17QB3L" id="7DRyZmECiBB" role="1tU5fm" />
-                                                  <node concept="Xl_RD" id="7DRyZmECiBC" role="33vP2m">
-                                                    <property role="Xl_RC" value="" />
-                                                  </node>
+                                      <node concept="3clFbJ" id="7DRyZmECiAE" role="3cqZAp">
+                                        <node concept="3clFbS" id="7DRyZmECiAF" role="3clFbx">
+                                          <node concept="3cpWs8" id="7DRyZmECiBr" role="3cqZAp">
+                                            <node concept="3cpWsn" id="7DRyZmECiBs" role="3cpWs9">
+                                              <property role="TrG5h" value="in" />
+                                              <node concept="3Tqbb2" id="7DRyZmECiBt" role="1tU5fm">
+                                                <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                              </node>
+                                              <node concept="1PxgMI" id="7DRyZmECiBu" role="33vP2m">
+                                                <node concept="chp4Y" id="7DRyZmECiBv" role="3oSUPX">
+                                                  <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                                </node>
+                                                <node concept="2GrUjf" id="7DRyZmECiBw" role="1m5AlR">
+                                                  <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                 </node>
                                               </node>
-                                              <node concept="3clFbJ" id="7DRyZmECiBD" role="3cqZAp">
-                                                <node concept="3clFbS" id="7DRyZmECiBE" role="3clFbx">
-                                                  <node concept="3clFbF" id="7DRyZmECiBF" role="3cqZAp">
-                                                    <node concept="37vLTI" id="7DRyZmECiBG" role="3clFbG">
-                                                      <node concept="37vLTw" id="7DRyZmECiBH" role="37vLTJ">
-                                                        <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
-                                                      </node>
-                                                      <node concept="2OqwBi" id="7DRyZmECiBI" role="37vLTx">
-                                                        <node concept="1PxgMI" id="7DRyZmECiBJ" role="2Oq$k0">
-                                                          <node concept="2GrUjf" id="7DRyZmECiBK" role="1m5AlR">
-                                                            <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                          </node>
-                                                          <node concept="chp4Y" id="7DRyZmECiBL" role="3oSUPX">
-                                                            <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                                                          </node>
-                                                        </node>
-                                                        <node concept="2qgKlT" id="7DRyZmECiBM" role="2OqNvi">
-                                                          <ref role="37wK5l" to="hwgx:6wvhQs7n_YM" resolve="namespace" />
-                                                        </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbJ" id="7DRyZmECiBx" role="3cqZAp">
+                                            <node concept="3clFbS" id="7DRyZmECiBy" role="3clFbx">
+                                              <node concept="3clFbJ" id="7DRyZmECiBz" role="3cqZAp">
+                                                <node concept="3clFbS" id="7DRyZmECiB$" role="3clFbx">
+                                                  <node concept="3cpWs8" id="7DRyZmECiB_" role="3cqZAp">
+                                                    <node concept="3cpWsn" id="7DRyZmECiBA" role="3cpWs9">
+                                                      <property role="TrG5h" value="ns" />
+                                                      <node concept="17QB3L" id="7DRyZmECiBB" role="1tU5fm" />
+                                                      <node concept="Xl_RD" id="7DRyZmECiBC" role="33vP2m">
+                                                        <property role="Xl_RC" value="" />
                                                       </node>
                                                     </node>
                                                   </node>
-                                                </node>
-                                                <node concept="2OqwBi" id="7DRyZmECiBN" role="3clFbw">
-                                                  <node concept="2GrUjf" id="7DRyZmECiBO" role="2Oq$k0">
-                                                    <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                  </node>
-                                                  <node concept="1mIQ4w" id="7DRyZmECiBP" role="2OqNvi">
-                                                    <node concept="chp4Y" id="7DRyZmECiBQ" role="cj9EA">
-                                                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                                <node concept="9aQIb" id="7DRyZmECiBR" role="9aQIa">
-                                                  <node concept="3clFbS" id="7DRyZmECiBS" role="9aQI4">
-                                                    <node concept="3cpWs8" id="7DRyZmECiBT" role="3cqZAp">
-                                                      <node concept="3cpWsn" id="7DRyZmECiBU" role="3cpWs9">
-                                                        <property role="TrG5h" value="ancestor" />
-                                                        <node concept="3Tqbb2" id="7DRyZmECiBV" role="1tU5fm">
-                                                          <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                        </node>
-                                                        <node concept="2OqwBi" id="7DRyZmECiBW" role="33vP2m">
-                                                          <node concept="2GrUjf" id="7DRyZmECiBX" role="2Oq$k0">
-                                                            <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                  <node concept="3clFbJ" id="7DRyZmECiBD" role="3cqZAp">
+                                                    <node concept="3clFbS" id="7DRyZmECiBE" role="3clFbx">
+                                                      <node concept="3clFbF" id="7DRyZmECiBF" role="3cqZAp">
+                                                        <node concept="37vLTI" id="7DRyZmECiBG" role="3clFbG">
+                                                          <node concept="37vLTw" id="7DRyZmECiBH" role="37vLTJ">
+                                                            <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
                                                           </node>
-                                                          <node concept="2Xjw5R" id="7DRyZmECiBY" role="2OqNvi">
-                                                            <node concept="1xMEDy" id="7DRyZmECiBZ" role="1xVPHs">
-                                                              <node concept="chp4Y" id="7DRyZmECiC0" role="ri$Ld">
-                                                                <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                                          <node concept="2OqwBi" id="7DRyZmECiBI" role="37vLTx">
+                                                            <node concept="1PxgMI" id="7DRyZmECiBJ" role="2Oq$k0">
+                                                              <node concept="2GrUjf" id="7DRyZmECiBK" role="1m5AlR">
+                                                                <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                              </node>
+                                                              <node concept="chp4Y" id="7DRyZmECiBL" role="3oSUPX">
+                                                                <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
                                                               </node>
                                                             </node>
+                                                            <node concept="2qgKlT" id="7DRyZmECiBM" role="2OqNvi">
+                                                              <ref role="37wK5l" to="hwgx:6wvhQs7n_YM" resolve="namespace" />
+                                                            </node>
                                                           </node>
                                                         </node>
                                                       </node>
                                                     </node>
-                                                    <node concept="3clFbJ" id="7DRyZmECiC1" role="3cqZAp">
-                                                      <node concept="3clFbS" id="7DRyZmECiC2" role="3clFbx">
-                                                        <node concept="3clFbF" id="7DRyZmECiC3" role="3cqZAp">
-                                                          <node concept="37vLTI" id="7DRyZmECiC4" role="3clFbG">
-                                                            <node concept="37vLTw" id="7DRyZmECiC5" role="37vLTJ">
-                                                              <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
+                                                    <node concept="2OqwBi" id="7DRyZmECiBN" role="3clFbw">
+                                                      <node concept="2GrUjf" id="7DRyZmECiBO" role="2Oq$k0">
+                                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                      </node>
+                                                      <node concept="1mIQ4w" id="7DRyZmECiBP" role="2OqNvi">
+                                                        <node concept="chp4Y" id="7DRyZmECiBQ" role="cj9EA">
+                                                          <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="9aQIb" id="7DRyZmECiBR" role="9aQIa">
+                                                      <node concept="3clFbS" id="7DRyZmECiBS" role="9aQI4">
+                                                        <node concept="3cpWs8" id="7DRyZmECiBT" role="3cqZAp">
+                                                          <node concept="3cpWsn" id="7DRyZmECiBU" role="3cpWs9">
+                                                            <property role="TrG5h" value="ancestor" />
+                                                            <node concept="3Tqbb2" id="7DRyZmECiBV" role="1tU5fm">
+                                                              <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                                             </node>
-                                                            <node concept="3cpWs3" id="7DRyZmECiC6" role="37vLTx">
-                                                              <node concept="Xl_RD" id="7DRyZmECiC7" role="3uHU7w">
-                                                                <property role="Xl_RC" value="]" />
+                                                            <node concept="2OqwBi" id="7DRyZmECiBW" role="33vP2m">
+                                                              <node concept="2GrUjf" id="7DRyZmECiBX" role="2Oq$k0">
+                                                                <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                               </node>
-                                                              <node concept="3cpWs3" id="7DRyZmECiC8" role="3uHU7B">
-                                                                <node concept="3cpWs3" id="7DRyZmECiC9" role="3uHU7B">
-                                                                  <node concept="2OqwBi" id="7DRyZmECiCa" role="3uHU7B">
-                                                                    <node concept="37vLTw" id="7DRyZmECiCb" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
-                                                                    </node>
-                                                                    <node concept="3TrcHB" id="7DRyZmECiCc" role="2OqNvi">
-                                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                                    </node>
-                                                                  </node>
-                                                                  <node concept="Xl_RD" id="7DRyZmECiCd" role="3uHU7w">
-                                                                    <property role="Xl_RC" value=" [" />
+                                                              <node concept="2Xjw5R" id="7DRyZmECiBY" role="2OqNvi">
+                                                                <node concept="1xMEDy" id="7DRyZmECiBZ" role="1xVPHs">
+                                                                  <node concept="chp4Y" id="7DRyZmECiC0" role="ri$Ld">
+                                                                    <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                                                   </node>
                                                                 </node>
-                                                                <node concept="2OqwBi" id="7DRyZmECiCe" role="3uHU7w">
-                                                                  <node concept="2OqwBi" id="7DRyZmECiCf" role="2Oq$k0">
-                                                                    <node concept="37vLTw" id="7DRyZmECiCg" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
-                                                                    </node>
-                                                                    <node concept="2yIwOk" id="7DRyZmECiCh" role="2OqNvi" />
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                        <node concept="3clFbJ" id="7DRyZmECiC1" role="3cqZAp">
+                                                          <node concept="3clFbS" id="7DRyZmECiC2" role="3clFbx">
+                                                            <node concept="3clFbF" id="7DRyZmECiC3" role="3cqZAp">
+                                                              <node concept="37vLTI" id="7DRyZmECiC4" role="3clFbG">
+                                                                <node concept="37vLTw" id="7DRyZmECiC5" role="37vLTJ">
+                                                                  <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
+                                                                </node>
+                                                                <node concept="3cpWs3" id="7DRyZmECiC6" role="37vLTx">
+                                                                  <node concept="Xl_RD" id="7DRyZmECiC7" role="3uHU7w">
+                                                                    <property role="Xl_RC" value="]" />
                                                                   </node>
-                                                                  <node concept="liA8E" id="7DRyZmECiCi" role="2OqNvi">
-                                                                    <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
+                                                                  <node concept="3cpWs3" id="7DRyZmECiC8" role="3uHU7B">
+                                                                    <node concept="3cpWs3" id="7DRyZmECiC9" role="3uHU7B">
+                                                                      <node concept="2OqwBi" id="7DRyZmECiCa" role="3uHU7B">
+                                                                        <node concept="37vLTw" id="7DRyZmECiCb" role="2Oq$k0">
+                                                                          <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
+                                                                        </node>
+                                                                        <node concept="3TrcHB" id="7DRyZmECiCc" role="2OqNvi">
+                                                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                                        </node>
+                                                                      </node>
+                                                                      <node concept="Xl_RD" id="7DRyZmECiCd" role="3uHU7w">
+                                                                        <property role="Xl_RC" value=" [" />
+                                                                      </node>
+                                                                    </node>
+                                                                    <node concept="2OqwBi" id="7DRyZmECiCe" role="3uHU7w">
+                                                                      <node concept="2OqwBi" id="7DRyZmECiCf" role="2Oq$k0">
+                                                                        <node concept="37vLTw" id="7DRyZmECiCg" role="2Oq$k0">
+                                                                          <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
+                                                                        </node>
+                                                                        <node concept="2yIwOk" id="7DRyZmECiCh" role="2OqNvi" />
+                                                                      </node>
+                                                                      <node concept="liA8E" id="7DRyZmECiCi" role="2OqNvi">
+                                                                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
+                                                                      </node>
+                                                                    </node>
                                                                   </node>
                                                                 </node>
                                                               </node>
                                                             </node>
                                                           </node>
-                                                        </node>
-                                                      </node>
-                                                      <node concept="3y3z36" id="7DRyZmECiCj" role="3clFbw">
-                                                        <node concept="10Nm6u" id="7DRyZmECiCk" role="3uHU7w" />
-                                                        <node concept="37vLTw" id="7DRyZmECiCl" role="3uHU7B">
-                                                          <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
+                                                          <node concept="3y3z36" id="7DRyZmECiCj" role="3clFbw">
+                                                            <node concept="10Nm6u" id="7DRyZmECiCk" role="3uHU7w" />
+                                                            <node concept="37vLTw" id="7DRyZmECiCl" role="3uHU7B">
+                                                              <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
+                                                            </node>
+                                                          </node>
                                                         </node>
                                                       </node>
                                                     </node>
                                                   </node>
-                                                </node>
-                                              </node>
-                                              <node concept="3clFbJ" id="7DRyZmEDFGj" role="3cqZAp">
-                                                <node concept="3clFbS" id="7DRyZmEDFGl" role="3clFbx">
-                                                  <node concept="3clFbF" id="7DRyZmEE0d7" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="7DRyZmEE0d8" role="3clFbG">
-                                                      <node concept="37vLTw" id="7DRyZmEE0d9" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
-                                                      </node>
-                                                      <node concept="TSZUe" id="7DRyZmEE0da" role="2OqNvi">
-                                                        <node concept="2GrUjf" id="7DRyZmEE7zS" role="25WWJ7">
-                                                          <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                  <node concept="3clFbJ" id="7DRyZmEDFGj" role="3cqZAp">
+                                                    <node concept="3clFbS" id="7DRyZmEDFGl" role="3clFbx">
+                                                      <node concept="3clFbF" id="7DRyZmEE0d7" role="3cqZAp">
+                                                        <node concept="2OqwBi" id="7DRyZmEE0d8" role="3clFbG">
+                                                          <node concept="37vLTw" id="7DRyZmEE0d9" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                          </node>
+                                                          <node concept="TSZUe" id="7DRyZmEE0da" role="2OqNvi">
+                                                            <node concept="2GrUjf" id="7DRyZmEE7zS" role="25WWJ7">
+                                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                            </node>
+                                                          </node>
                                                         </node>
                                                       </node>
-                                                    </node>
-                                                  </node>
-                                                  <node concept="3cpWs8" id="7DRyZmECiCm" role="3cqZAp">
-                                                    <node concept="3cpWsn" id="7DRyZmECiCn" role="3cpWs9">
-                                                      <property role="TrG5h" value="resItem" />
-                                                      <node concept="3uibUv" id="7DRyZmECiCo" role="1tU5fm">
-                                                        <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
-                                                      </node>
-                                                      <node concept="2ShNRf" id="7DRyZmECiCp" role="33vP2m">
-                                                        <node concept="1pGfFk" id="7DRyZmECiCq" role="2ShVmc">
-                                                          <ref role="37wK5l" node="2HzhasN$atr" resolve="SearchResult" />
-                                                          <node concept="37vLTw" id="7DRyZmECiCr" role="37wK5m">
-                                                            <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="m" />
+                                                      <node concept="3cpWs8" id="7DRyZmECiCm" role="3cqZAp">
+                                                        <node concept="3cpWsn" id="7DRyZmECiCn" role="3cpWs9">
+                                                          <property role="TrG5h" value="resItem" />
+                                                          <node concept="3uibUv" id="7DRyZmECiCo" role="1tU5fm">
+                                                            <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
                                                           </node>
-                                                          <node concept="2ShNRf" id="7DRyZmECiCs" role="37wK5m">
-                                                            <node concept="1pGfFk" id="7DRyZmECiCt" role="2ShVmc">
-                                                              <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
-                                                              <node concept="2GrUjf" id="7DRyZmECiCu" role="37wK5m">
-                                                                <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                          <node concept="2ShNRf" id="7DRyZmECiCp" role="33vP2m">
+                                                            <node concept="1pGfFk" id="7DRyZmECiCq" role="2ShVmc">
+                                                              <ref role="37wK5l" node="2HzhasN$atr" resolve="SearchResult" />
+                                                              <node concept="2GrUjf" id="vqDSp9UNXg" role="37wK5m">
+                                                                <ref role="2Gs0qQ" node="vqDSp9Sb6L" resolve="model" />
+                                                              </node>
+                                                              <node concept="2ShNRf" id="7DRyZmECiCs" role="37wK5m">
+                                                                <node concept="1pGfFk" id="7DRyZmECiCt" role="2ShVmc">
+                                                                  <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
+                                                                  <node concept="2GrUjf" id="7DRyZmECiCu" role="37wK5m">
+                                                                    <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                              <node concept="2OqwBi" id="7DRyZmECiCv" role="37wK5m">
+                                                                <node concept="37vLTw" id="7DRyZmECiCw" role="2Oq$k0">
+                                                                  <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                                </node>
+                                                                <node concept="3TrcHB" id="7DRyZmECiCx" role="2OqNvi">
+                                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                                </node>
+                                                              </node>
+                                                              <node concept="3P9mCS" id="7DRyZmECiCy" role="37wK5m">
+                                                                <ref role="37wK5l" node="4Q2Vz3i$q7i" resolve="conceptLabel" />
+                                                                <node concept="37vLTw" id="7DRyZmECiCz" role="37wK5m">
+                                                                  <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                                </node>
+                                                              </node>
+                                                              <node concept="37vLTw" id="7DRyZmECiC$" role="37wK5m">
+                                                                <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
                                                               </node>
                                                             </node>
                                                           </node>
-                                                          <node concept="2OqwBi" id="7DRyZmECiCv" role="37wK5m">
-                                                            <node concept="37vLTw" id="7DRyZmECiCw" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                                            </node>
-                                                            <node concept="3TrcHB" id="7DRyZmECiCx" role="2OqNvi">
-                                                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                            </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3clFbF" id="7DRyZmECiC_" role="3cqZAp">
+                                                        <node concept="2OqwBi" id="7DRyZmECiCA" role="3clFbG">
+                                                          <node concept="37vLTw" id="7DRyZmECiCB" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
                                                           </node>
-                                                          <node concept="3P9mCS" id="7DRyZmECiCy" role="37wK5m">
-                                                            <ref role="37wK5l" node="4Q2Vz3i$q7i" resolve="conceptLabel" />
-                                                            <node concept="37vLTw" id="7DRyZmECiCz" role="37wK5m">
-                                                              <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                          <node concept="TSZUe" id="7DRyZmECiCC" role="2OqNvi">
+                                                            <node concept="37vLTw" id="7DRyZmECiCD" role="25WWJ7">
+                                                              <ref role="3cqZAo" node="7DRyZmECiCn" resolve="resItem" />
                                                             </node>
                                                           </node>
-                                                          <node concept="37vLTw" id="7DRyZmECiC$" role="37wK5m">
-                                                            <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
-                                                          </node>
                                                         </node>
                                                       </node>
                                                     </node>
-                                                  </node>
-                                                  <node concept="3clFbF" id="7DRyZmECiC_" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="7DRyZmECiCA" role="3clFbG">
-                                                      <node concept="37vLTw" id="7DRyZmECiCB" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="4Q2Vz3i_bj8" resolve="results" />
-                                                      </node>
-                                                      <node concept="TSZUe" id="7DRyZmECiCC" role="2OqNvi">
-                                                        <node concept="37vLTw" id="7DRyZmECiCD" role="25WWJ7">
-                                                          <ref role="3cqZAo" node="7DRyZmECiCn" resolve="resItem" />
+                                                    <node concept="3fqX7Q" id="7DRyZmEDIu6" role="3clFbw">
+                                                      <node concept="2OqwBi" id="7DRyZmEDNUr" role="3fr31v">
+                                                        <node concept="37vLTw" id="7DRyZmEDL2a" role="2Oq$k0">
+                                                          <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                        </node>
+                                                        <node concept="3JPx81" id="7DRyZmEDW7E" role="2OqNvi">
+                                                          <node concept="2GrUjf" id="7DRyZmEDY_B" role="25WWJ7">
+                                                            <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                          </node>
                                                         </node>
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="3fqX7Q" id="7DRyZmEDIu6" role="3clFbw">
-                                                  <node concept="2OqwBi" id="7DRyZmEDNUr" role="3fr31v">
-                                                    <node concept="37vLTw" id="7DRyZmEDL2a" role="2Oq$k0">
+                                                <node concept="3fqX7Q" id="7DRyZmECiCE" role="3clFbw">
+                                                  <node concept="2OqwBi" id="7DRyZmECiCF" role="3fr31v">
+                                                    <node concept="37vLTw" id="7DRyZmECiCG" role="2Oq$k0">
                                                       <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
                                                     </node>
-                                                    <node concept="3JPx81" id="7DRyZmEDW7E" role="2OqNvi">
-                                                      <node concept="2GrUjf" id="7DRyZmEDY_B" role="25WWJ7">
+                                                    <node concept="3JPx81" id="7DRyZmECiCH" role="2OqNvi">
+                                                      <node concept="2GrUjf" id="7DRyZmECiCI" role="25WWJ7">
                                                         <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
+                                              <node concept="3clFbH" id="7DRyZmECiCJ" role="3cqZAp" />
                                             </node>
-                                            <node concept="3fqX7Q" id="7DRyZmECiCE" role="3clFbw">
-                                              <node concept="2OqwBi" id="7DRyZmECiCF" role="3fr31v">
-                                                <node concept="37vLTw" id="7DRyZmECiCG" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                            <node concept="1Wc70l" id="7DRyZmECiCK" role="3clFbw">
+                                              <node concept="3y3z36" id="7DRyZmECiCL" role="3uHU7B">
+                                                <node concept="2OqwBi" id="7DRyZmECiCM" role="3uHU7B">
+                                                  <node concept="37vLTw" id="7DRyZmECiCN" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                  </node>
+                                                  <node concept="3TrcHB" id="7DRyZmECiCO" role="2OqNvi">
+                                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                  </node>
+                                                </node>
+                                                <node concept="10Nm6u" id="7DRyZmECiCP" role="3uHU7w" />
+                                              </node>
+                                              <node concept="2OqwBi" id="7DRyZmECiCQ" role="3uHU7w">
+                                                <node concept="2OqwBi" id="7DRyZmECiCR" role="2Oq$k0">
+                                                  <node concept="37vLTw" id="7DRyZmECiCS" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                  </node>
+                                                  <node concept="3TrcHB" id="7DRyZmECiCT" role="2OqNvi">
+                                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                  </node>
                                                 </node>
-                                                <node concept="3JPx81" id="7DRyZmECiCH" role="2OqNvi">
-                                                  <node concept="2GrUjf" id="7DRyZmECiCI" role="25WWJ7">
-                                                    <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                <node concept="liA8E" id="7DRyZmECiCU" role="2OqNvi">
+                                                  <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                                                  <node concept="37vLTw" id="7DRyZmECiCV" role="37wK5m">
+                                                    <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="3clFbH" id="7DRyZmECiCJ" role="3cqZAp" />
                                         </node>
-                                        <node concept="1Wc70l" id="7DRyZmECiCK" role="3clFbw">
-                                          <node concept="3y3z36" id="7DRyZmECiCL" role="3uHU7B">
-                                            <node concept="2OqwBi" id="7DRyZmECiCM" role="3uHU7B">
-                                              <node concept="37vLTw" id="7DRyZmECiCN" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                              </node>
-                                              <node concept="3TrcHB" id="7DRyZmECiCO" role="2OqNvi">
-                                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                              </node>
-                                            </node>
-                                            <node concept="10Nm6u" id="7DRyZmECiCP" role="3uHU7w" />
+                                        <node concept="2OqwBi" id="7DRyZmECiCW" role="3clFbw">
+                                          <node concept="2GrUjf" id="7DRyZmECiCX" role="2Oq$k0">
+                                            <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                           </node>
-                                          <node concept="2OqwBi" id="7DRyZmECiCQ" role="3uHU7w">
-                                            <node concept="2OqwBi" id="7DRyZmECiCR" role="2Oq$k0">
-                                              <node concept="37vLTw" id="7DRyZmECiCS" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                              </node>
-                                              <node concept="3TrcHB" id="7DRyZmECiCT" role="2OqNvi">
-                                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                              </node>
-                                            </node>
-                                            <node concept="liA8E" id="7DRyZmECiCU" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                                              <node concept="37vLTw" id="7DRyZmECiCV" role="37wK5m">
-                                                <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
-                                              </node>
+                                          <node concept="1mIQ4w" id="7DRyZmECiCY" role="2OqNvi">
+                                            <node concept="chp4Y" id="7DRyZmECiCZ" role="cj9EA">
+                                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="7DRyZmECiCW" role="3clFbw">
-                                      <node concept="2GrUjf" id="7DRyZmECiCX" role="2Oq$k0">
-                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                      </node>
-                                      <node concept="1mIQ4w" id="7DRyZmECiCY" role="2OqNvi">
-                                        <node concept="chp4Y" id="7DRyZmECiCZ" role="cj9EA">
-                                          <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbJ" id="7DRyZmEwm8n" role="3cqZAp">
-                                    <node concept="3clFbS" id="7DRyZmEwm8p" role="3clFbx">
-                                      <node concept="3cpWs8" id="7DRyZmErI5d" role="3cqZAp">
-                                        <node concept="3cpWsn" id="7DRyZmErI5e" role="3cpWs9">
-                                          <property role="TrG5h" value="pres" />
-                                          <node concept="17QB3L" id="7DRyZmErI2h" role="1tU5fm" />
-                                          <node concept="2OqwBi" id="7DRyZmErI5f" role="33vP2m">
-                                            <node concept="2GrUjf" id="7DRyZmErI5g" role="2Oq$k0">
-                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                            </node>
-                                            <node concept="2qgKlT" id="7DRyZmErI5h" role="2OqNvi">
-                                              <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                                      <node concept="3clFbJ" id="7DRyZmEwm8n" role="3cqZAp">
+                                        <node concept="3clFbS" id="7DRyZmEwm8p" role="3clFbx">
+                                          <node concept="3cpWs8" id="7DRyZmErI5d" role="3cqZAp">
+                                            <node concept="3cpWsn" id="7DRyZmErI5e" role="3cpWs9">
+                                              <property role="TrG5h" value="pres" />
+                                              <node concept="17QB3L" id="7DRyZmErI2h" role="1tU5fm" />
+                                              <node concept="10Nm6u" id="vqDSpa5HHB" role="33vP2m" />
                                             </node>
                                           </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3clFbJ" id="7DRyZmExiht" role="3cqZAp">
-                                        <node concept="3clFbS" id="7DRyZmExihv" role="3clFbx">
-                                          <node concept="3clFbJ" id="7DRyZmErcIi" role="3cqZAp">
-                                            <node concept="3clFbS" id="7DRyZmErcIk" role="3clFbx">
-                                              <node concept="3clFbJ" id="7DRyZmEra8u" role="3cqZAp">
-                                                <node concept="3clFbS" id="7DRyZmEra8v" role="3clFbx">
-                                                  <node concept="3cpWs8" id="7DRyZmEyd9r" role="3cqZAp">
-                                                    <node concept="3cpWsn" id="7DRyZmEyd9s" role="3cpWs9">
-                                                      <property role="TrG5h" value="ancestor" />
-                                                      <node concept="3Tqbb2" id="7DRyZmEyd7n" role="1tU5fm">
-                                                        <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                      </node>
-                                                      <node concept="2OqwBi" id="7DRyZmEyd9t" role="33vP2m">
-                                                        <node concept="2GrUjf" id="7DRyZmEyd9u" role="2Oq$k0">
-                                                          <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                        </node>
-                                                        <node concept="2Xjw5R" id="7DRyZmEyd9v" role="2OqNvi">
-                                                          <node concept="1xMEDy" id="7DRyZmEyd9w" role="1xVPHs">
-                                                            <node concept="chp4Y" id="7DRyZmEyd9x" role="ri$Ld">
-                                                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                      </node>
+                                          <node concept="3clFbH" id="vqDSpa5zfp" role="3cqZAp" />
+                                          <node concept="3J1_TO" id="vqDSpa5fEd" role="3cqZAp">
+                                            <node concept="3uVAMA" id="vqDSpa5gEu" role="1zxBo5">
+                                              <node concept="XOnhg" id="vqDSpa5gEv" role="1zc67B">
+                                                <property role="TrG5h" value="e" />
+                                                <node concept="nSUau" id="vqDSpa5gEw" role="1tU5fm">
+                                                  <node concept="3uibUv" id="vqDSpa5hUN" role="nSUat">
+                                                    <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3clFbS" id="vqDSpa5gEx" role="1zc67A">
+                                                <node concept="3SKdUt" id="vqDSpa5PxC" role="3cqZAp">
+                                                  <node concept="1PaTwC" id="vqDSpa5PxD" role="1aUNEU">
+                                                    <node concept="3oM_SD" id="vqDSpa5Qxe" role="1PaTwD">
+                                                      <property role="3oM_SC" value="all" />
+                                                    </node>
+                                                    <node concept="3oM_SD" id="vqDSpa5Qxf" role="1PaTwD">
+                                                      <property role="3oM_SC" value="kind" />
+                                                    </node>
+                                                    <node concept="3oM_SD" id="vqDSpa5Ray" role="1PaTwD">
+                                                      <property role="3oM_SC" value="of" />
+                                                    </node>
+                                                    <node concept="3oM_SD" id="vqDSpa5Raz" role="1PaTwD">
+                                                      <property role="3oM_SC" value="issues" />
+                                                    </node>
+                                                    <node concept="3oM_SD" id="vqDSpa5SpG" role="1PaTwD">
+                                                      <property role="3oM_SC" value="could" />
+                                                    </node>
+                                                    <node concept="3oM_SD" id="vqDSpa5U7L" role="1PaTwD">
+                                                      <property role="3oM_SC" value="happen" />
+                                                    </node>
+                                                    <node concept="3oM_SD" id="vqDSpa5U7M" role="1PaTwD">
+                                                      <property role="3oM_SC" value="here" />
                                                     </node>
                                                   </node>
-                                                  <node concept="3cpWs8" id="7DRyZmEAuJu" role="3cqZAp">
-                                                    <node concept="3cpWsn" id="7DRyZmEAuJv" role="3cpWs9">
-                                                      <property role="TrG5h" value="ns" />
-                                                      <node concept="17QB3L" id="7DRyZmEAuJw" role="1tU5fm" />
-                                                      <node concept="Xl_RD" id="7DRyZmEButI" role="33vP2m">
-                                                        <property role="Xl_RC" value="" />
-                                                      </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="3clFbS" id="vqDSpa5fEf" role="1zxBo7">
+                                              <node concept="3clFbF" id="vqDSpa59hN" role="3cqZAp">
+                                                <node concept="37vLTI" id="vqDSpa59hP" role="3clFbG">
+                                                  <node concept="2OqwBi" id="7DRyZmErI5f" role="37vLTx">
+                                                    <node concept="2GrUjf" id="7DRyZmErI5g" role="2Oq$k0">
+                                                      <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                    </node>
+                                                    <node concept="2qgKlT" id="7DRyZmErI5h" role="2OqNvi">
+                                                      <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                                                     </node>
                                                   </node>
-                                                  <node concept="3clFbJ" id="7DRyZmEAods" role="3cqZAp">
-                                                    <node concept="3clFbS" id="7DRyZmEAodu" role="3clFbx">
-                                                      <node concept="3clFbF" id="7DRyZmEAHJF" role="3cqZAp">
-                                                        <node concept="37vLTI" id="7DRyZmEAJwS" role="3clFbG">
-                                                          <node concept="37vLTw" id="7DRyZmEAHJD" role="37vLTJ">
-                                                            <ref role="3cqZAo" node="7DRyZmEAuJv" resolve="ns" />
+                                                  <node concept="37vLTw" id="vqDSpa59hT" role="37vLTJ">
+                                                    <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbJ" id="7DRyZmExiht" role="3cqZAp">
+                                            <node concept="3clFbS" id="7DRyZmExihv" role="3clFbx">
+                                              <node concept="3clFbJ" id="7DRyZmErcIi" role="3cqZAp">
+                                                <node concept="3clFbS" id="7DRyZmErcIk" role="3clFbx">
+                                                  <node concept="3clFbJ" id="7DRyZmEra8u" role="3cqZAp">
+                                                    <node concept="3clFbS" id="7DRyZmEra8v" role="3clFbx">
+                                                      <node concept="3cpWs8" id="7DRyZmEyd9r" role="3cqZAp">
+                                                        <node concept="3cpWsn" id="7DRyZmEyd9s" role="3cpWs9">
+                                                          <property role="TrG5h" value="ancestor" />
+                                                          <node concept="3Tqbb2" id="7DRyZmEyd7n" role="1tU5fm">
+                                                            <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                                           </node>
-                                                          <node concept="3cpWs3" id="7DRyZmEytqZ" role="37vLTx">
-                                                            <node concept="Xl_RD" id="7DRyZmEytS9" role="3uHU7w">
-                                                              <property role="Xl_RC" value="]" />
+                                                          <node concept="2OqwBi" id="7DRyZmEyd9t" role="33vP2m">
+                                                            <node concept="2GrUjf" id="7DRyZmEyd9u" role="2Oq$k0">
+                                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                             </node>
-                                                            <node concept="3cpWs3" id="7DRyZmEyiKD" role="3uHU7B">
-                                                              <node concept="3cpWs3" id="7DRyZmEyeyY" role="3uHU7B">
-                                                                <node concept="2OqwBi" id="7DRyZmErxit" role="3uHU7B">
-                                                                  <node concept="37vLTw" id="7DRyZmEyd9y" role="2Oq$k0">
-                                                                    <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
-                                                                  </node>
-                                                                  <node concept="3TrcHB" id="7DRyZmEryhk" role="2OqNvi">
-                                                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                                  </node>
-                                                                </node>
-                                                                <node concept="Xl_RD" id="7DRyZmEyf08" role="3uHU7w">
-                                                                  <property role="Xl_RC" value=" [" />
+                                                            <node concept="2Xjw5R" id="7DRyZmEyd9v" role="2OqNvi">
+                                                              <node concept="1xMEDy" id="7DRyZmEyd9w" role="1xVPHs">
+                                                                <node concept="chp4Y" id="7DRyZmEyd9x" role="ri$Ld">
+                                                                  <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                                                 </node>
                                                               </node>
-                                                              <node concept="2OqwBi" id="7DRyZmEyp6j" role="3uHU7w">
-                                                                <node concept="2OqwBi" id="7DRyZmEymKz" role="2Oq$k0">
-                                                                  <node concept="37vLTw" id="7DRyZmEykVK" role="2Oq$k0">
-                                                                    <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
-                                                                  </node>
-                                                                  <node concept="2yIwOk" id="7DRyZmEynZT" role="2OqNvi" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3cpWs8" id="7DRyZmEAuJu" role="3cqZAp">
+                                                        <node concept="3cpWsn" id="7DRyZmEAuJv" role="3cpWs9">
+                                                          <property role="TrG5h" value="ns" />
+                                                          <node concept="17QB3L" id="7DRyZmEAuJw" role="1tU5fm" />
+                                                          <node concept="Xl_RD" id="7DRyZmEButI" role="33vP2m">
+                                                            <property role="Xl_RC" value="" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3clFbJ" id="7DRyZmEAods" role="3cqZAp">
+                                                        <node concept="3clFbS" id="7DRyZmEAodu" role="3clFbx">
+                                                          <node concept="3clFbF" id="7DRyZmEAHJF" role="3cqZAp">
+                                                            <node concept="37vLTI" id="7DRyZmEAJwS" role="3clFbG">
+                                                              <node concept="37vLTw" id="7DRyZmEAHJD" role="37vLTJ">
+                                                                <ref role="3cqZAo" node="7DRyZmEAuJv" resolve="ns" />
+                                                              </node>
+                                                              <node concept="3cpWs3" id="7DRyZmEytqZ" role="37vLTx">
+                                                                <node concept="Xl_RD" id="7DRyZmEytS9" role="3uHU7w">
+                                                                  <property role="Xl_RC" value="]" />
                                                                 </node>
-                                                                <node concept="liA8E" id="7DRyZmEyq_m" role="2OqNvi">
-                                                                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
+                                                                <node concept="3cpWs3" id="7DRyZmEyiKD" role="3uHU7B">
+                                                                  <node concept="3cpWs3" id="7DRyZmEyeyY" role="3uHU7B">
+                                                                    <node concept="2OqwBi" id="7DRyZmErxit" role="3uHU7B">
+                                                                      <node concept="37vLTw" id="7DRyZmEyd9y" role="2Oq$k0">
+                                                                        <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
+                                                                      </node>
+                                                                      <node concept="3TrcHB" id="7DRyZmEryhk" role="2OqNvi">
+                                                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                                      </node>
+                                                                    </node>
+                                                                    <node concept="Xl_RD" id="7DRyZmEyf08" role="3uHU7w">
+                                                                      <property role="Xl_RC" value=" [" />
+                                                                    </node>
+                                                                  </node>
+                                                                  <node concept="2OqwBi" id="7DRyZmEyp6j" role="3uHU7w">
+                                                                    <node concept="2OqwBi" id="7DRyZmEymKz" role="2Oq$k0">
+                                                                      <node concept="37vLTw" id="7DRyZmEykVK" role="2Oq$k0">
+                                                                        <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
+                                                                      </node>
+                                                                      <node concept="2yIwOk" id="7DRyZmEynZT" role="2OqNvi" />
+                                                                    </node>
+                                                                    <node concept="liA8E" id="7DRyZmEyq_m" role="2OqNvi">
+                                                                      <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
+                                                                    </node>
+                                                                  </node>
                                                                 </node>
                                                               </node>
                                                             </node>
                                                           </node>
                                                         </node>
-                                                      </node>
-                                                    </node>
-                                                    <node concept="3y3z36" id="7DRyZmEArLV" role="3clFbw">
-                                                      <node concept="10Nm6u" id="7DRyZmEAtuw" role="3uHU7w" />
-                                                      <node concept="37vLTw" id="7DRyZmEAqpC" role="3uHU7B">
-                                                        <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                  <node concept="3cpWs8" id="7DRyZmErRzj" role="3cqZAp">
-                                                    <node concept="3cpWsn" id="7DRyZmErRzm" role="3cpWs9">
-                                                      <property role="TrG5h" value="label" />
-                                                      <node concept="17QB3L" id="7DRyZmErRzh" role="1tU5fm" />
-                                                      <node concept="37vLTw" id="7DRyZmErW3z" role="33vP2m">
-                                                        <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                  <node concept="3clFbJ" id="7DRyZmEEif8" role="3cqZAp">
-                                                    <node concept="3clFbS" id="7DRyZmEEif9" role="3clFbx">
-                                                      <node concept="3clFbF" id="7DRyZmEEifa" role="3cqZAp">
-                                                        <node concept="2OqwBi" id="7DRyZmEEifb" role="3clFbG">
-                                                          <node concept="37vLTw" id="7DRyZmEEifc" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                        <node concept="3y3z36" id="7DRyZmEArLV" role="3clFbw">
+                                                          <node concept="10Nm6u" id="7DRyZmEAtuw" role="3uHU7w" />
+                                                          <node concept="37vLTw" id="7DRyZmEAqpC" role="3uHU7B">
+                                                            <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
                                                           </node>
-                                                          <node concept="TSZUe" id="7DRyZmEEifd" role="2OqNvi">
-                                                            <node concept="2GrUjf" id="7DRyZmEEife" role="25WWJ7">
-                                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                            </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3cpWs8" id="7DRyZmErRzj" role="3cqZAp">
+                                                        <node concept="3cpWsn" id="7DRyZmErRzm" role="3cpWs9">
+                                                          <property role="TrG5h" value="label" />
+                                                          <node concept="17QB3L" id="7DRyZmErRzh" role="1tU5fm" />
+                                                          <node concept="37vLTw" id="7DRyZmErW3z" role="33vP2m">
+                                                            <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
                                                           </node>
                                                         </node>
                                                       </node>
-                                                      <node concept="3cpWs8" id="7DRyZmEra8M" role="3cqZAp">
-                                                        <node concept="3cpWsn" id="7DRyZmEra8N" role="3cpWs9">
-                                                          <property role="TrG5h" value="resItem" />
-                                                          <node concept="3uibUv" id="7DRyZmEra8O" role="1tU5fm">
-                                                            <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
+                                                      <node concept="3clFbJ" id="7DRyZmEEif8" role="3cqZAp">
+                                                        <node concept="3clFbS" id="7DRyZmEEif9" role="3clFbx">
+                                                          <node concept="3clFbF" id="7DRyZmEEifa" role="3cqZAp">
+                                                            <node concept="2OqwBi" id="7DRyZmEEifb" role="3clFbG">
+                                                              <node concept="37vLTw" id="7DRyZmEEifc" role="2Oq$k0">
+                                                                <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                              </node>
+                                                              <node concept="TSZUe" id="7DRyZmEEifd" role="2OqNvi">
+                                                                <node concept="2GrUjf" id="7DRyZmEEife" role="25WWJ7">
+                                                                  <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                                </node>
+                                                              </node>
+                                                            </node>
                                                           </node>
-                                                          <node concept="2ShNRf" id="7DRyZmEra8P" role="33vP2m">
-                                                            <node concept="1pGfFk" id="7DRyZmEra8Q" role="2ShVmc">
-                                                              <ref role="37wK5l" node="2HzhasN$atr" resolve="SearchResult" />
-                                                              <node concept="37vLTw" id="7DRyZmEra8R" role="37wK5m">
-                                                                <ref role="3cqZAo" node="4Q2Vz3i$q7T" resolve="m" />
+                                                          <node concept="3cpWs8" id="7DRyZmEra8M" role="3cqZAp">
+                                                            <node concept="3cpWsn" id="7DRyZmEra8N" role="3cpWs9">
+                                                              <property role="TrG5h" value="resItem" />
+                                                              <node concept="3uibUv" id="7DRyZmEra8O" role="1tU5fm">
+                                                                <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
                                                               </node>
-                                                              <node concept="2ShNRf" id="7DRyZmEra8S" role="37wK5m">
-                                                                <node concept="1pGfFk" id="7DRyZmEra8T" role="2ShVmc">
-                                                                  <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
-                                                                  <node concept="2GrUjf" id="7DRyZmEra8U" role="37wK5m">
-                                                                    <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                              <node concept="2ShNRf" id="7DRyZmEra8P" role="33vP2m">
+                                                                <node concept="1pGfFk" id="7DRyZmEra8Q" role="2ShVmc">
+                                                                  <ref role="37wK5l" node="2HzhasN$atr" resolve="SearchResult" />
+                                                                  <node concept="2GrUjf" id="vqDSp9ULwZ" role="37wK5m">
+                                                                    <ref role="2Gs0qQ" node="vqDSp9Sb6L" resolve="model" />
+                                                                  </node>
+                                                                  <node concept="2ShNRf" id="7DRyZmEra8S" role="37wK5m">
+                                                                    <node concept="1pGfFk" id="7DRyZmEra8T" role="2ShVmc">
+                                                                      <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
+                                                                      <node concept="2GrUjf" id="7DRyZmEra8U" role="37wK5m">
+                                                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                                      </node>
+                                                                    </node>
+                                                                  </node>
+                                                                  <node concept="37vLTw" id="7DRyZmErTA0" role="37wK5m">
+                                                                    <ref role="3cqZAo" node="7DRyZmErRzm" resolve="label" />
+                                                                  </node>
+                                                                  <node concept="3P9mCS" id="7DRyZmEra8Y" role="37wK5m">
+                                                                    <ref role="37wK5l" node="4Q2Vz3i$q7i" resolve="conceptLabel" />
+                                                                    <node concept="2GrUjf" id="7DRyZmErGyt" role="37wK5m">
+                                                                      <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                                    </node>
+                                                                  </node>
+                                                                  <node concept="37vLTw" id="7DRyZmEra90" role="37wK5m">
+                                                                    <ref role="3cqZAo" node="7DRyZmEAuJv" resolve="ns" />
                                                                   </node>
                                                                 </node>
                                                               </node>
-                                                              <node concept="37vLTw" id="7DRyZmErTA0" role="37wK5m">
-                                                                <ref role="3cqZAo" node="7DRyZmErRzm" resolve="label" />
+                                                            </node>
+                                                          </node>
+                                                          <node concept="3clFbF" id="7DRyZmEra91" role="3cqZAp">
+                                                            <node concept="2OqwBi" id="7DRyZmEra92" role="3clFbG">
+                                                              <node concept="37vLTw" id="7DRyZmEra93" role="2Oq$k0">
+                                                                <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
                                                               </node>
-                                                              <node concept="3P9mCS" id="7DRyZmEra8Y" role="37wK5m">
-                                                                <ref role="37wK5l" node="4Q2Vz3i$q7i" resolve="conceptLabel" />
-                                                                <node concept="2GrUjf" id="7DRyZmErGyt" role="37wK5m">
-                                                                  <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                              <node concept="TSZUe" id="7DRyZmEra94" role="2OqNvi">
+                                                                <node concept="37vLTw" id="7DRyZmEra95" role="25WWJ7">
+                                                                  <ref role="3cqZAo" node="7DRyZmEra8N" resolve="resItem" />
                                                                 </node>
                                                               </node>
-                                                              <node concept="37vLTw" id="7DRyZmEra90" role="37wK5m">
-                                                                <ref role="3cqZAo" node="7DRyZmEAuJv" resolve="ns" />
-                                                              </node>
                                                             </node>
                                                           </node>
                                                         </node>
-                                                      </node>
-                                                      <node concept="3clFbF" id="7DRyZmEra91" role="3cqZAp">
-                                                        <node concept="2OqwBi" id="7DRyZmEra92" role="3clFbG">
-                                                          <node concept="37vLTw" id="7DRyZmEra93" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4Q2Vz3i_bj8" resolve="results" />
-                                                          </node>
-                                                          <node concept="TSZUe" id="7DRyZmEra94" role="2OqNvi">
-                                                            <node concept="37vLTw" id="7DRyZmEra95" role="25WWJ7">
-                                                              <ref role="3cqZAo" node="7DRyZmEra8N" resolve="resItem" />
+                                                        <node concept="3fqX7Q" id="7DRyZmEEifz" role="3clFbw">
+                                                          <node concept="2OqwBi" id="7DRyZmEEif$" role="3fr31v">
+                                                            <node concept="37vLTw" id="7DRyZmEEif_" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
+                                                            </node>
+                                                            <node concept="3JPx81" id="7DRyZmEEifA" role="2OqNvi">
+                                                              <node concept="2GrUjf" id="7DRyZmEEifB" role="25WWJ7">
+                                                                <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                              </node>
                                                             </node>
                                                           </node>
                                                         </node>
                                                       </node>
                                                     </node>
-                                                    <node concept="3fqX7Q" id="7DRyZmEEifz" role="3clFbw">
-                                                      <node concept="2OqwBi" id="7DRyZmEEif$" role="3fr31v">
-                                                        <node concept="37vLTw" id="7DRyZmEEif_" role="2Oq$k0">
+                                                    <node concept="3fqX7Q" id="7DRyZmEra96" role="3clFbw">
+                                                      <node concept="2OqwBi" id="7DRyZmEra97" role="3fr31v">
+                                                        <node concept="37vLTw" id="7DRyZmEra98" role="2Oq$k0">
                                                           <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
                                                         </node>
-                                                        <node concept="3JPx81" id="7DRyZmEEifA" role="2OqNvi">
-                                                          <node concept="2GrUjf" id="7DRyZmEEifB" role="25WWJ7">
+                                                        <node concept="3JPx81" id="7DRyZmEra99" role="2OqNvi">
+                                                          <node concept="2GrUjf" id="7DRyZmEra9a" role="25WWJ7">
                                                             <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                           </node>
                                                         </node>
                                                       </node>
                                                     </node>
                                                   </node>
+                                                  <node concept="3clFbH" id="7DRyZmErcIj" role="3cqZAp" />
                                                 </node>
-                                                <node concept="3fqX7Q" id="7DRyZmEra96" role="3clFbw">
-                                                  <node concept="2OqwBi" id="7DRyZmEra97" role="3fr31v">
-                                                    <node concept="37vLTw" id="7DRyZmEra98" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4Q2Vz3i$q50" resolve="found" />
-                                                    </node>
-                                                    <node concept="3JPx81" id="7DRyZmEra99" role="2OqNvi">
-                                                      <node concept="2GrUjf" id="7DRyZmEra9a" role="25WWJ7">
-                                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                      </node>
+                                                <node concept="2OqwBi" id="7DRyZmErh$t" role="3clFbw">
+                                                  <node concept="37vLTw" id="7DRyZmErI5i" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                  </node>
+                                                  <node concept="liA8E" id="7DRyZmErjdM" role="2OqNvi">
+                                                    <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                                                    <node concept="37vLTw" id="7DRyZmErm1w" role="37wK5m">
+                                                      <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="3clFbH" id="7DRyZmErcIj" role="3cqZAp" />
                                             </node>
-                                            <node concept="2OqwBi" id="7DRyZmErh$t" role="3clFbw">
-                                              <node concept="37vLTw" id="7DRyZmErI5i" role="2Oq$k0">
+                                            <node concept="3y3z36" id="7DRyZmExlhj" role="3clFbw">
+                                              <node concept="10Nm6u" id="7DRyZmExmUt" role="3uHU7w" />
+                                              <node concept="37vLTw" id="7DRyZmExjJk" role="3uHU7B">
                                                 <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
                                               </node>
-                                              <node concept="liA8E" id="7DRyZmErjdM" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                                                <node concept="37vLTw" id="7DRyZmErm1w" role="37wK5m">
-                                                  <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
-                                                </node>
-                                              </node>
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="3y3z36" id="7DRyZmExlhj" role="3clFbw">
-                                          <node concept="10Nm6u" id="7DRyZmExmUt" role="3uHU7w" />
-                                          <node concept="37vLTw" id="7DRyZmExjJk" role="3uHU7B">
-                                            <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
-                                          </node>
+                                        <node concept="37vLTw" id="7DRyZmEwo1Y" role="3clFbw">
+                                          <ref role="3cqZAo" node="7DRyZmDozcG" resolve="searchAll" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="37vLTw" id="7DRyZmEwo1Y" role="3clFbw">
-                                      <ref role="3cqZAo" node="7DRyZmDozcG" resolve="searchAll" />
+                                  </node>
+                                  <node concept="2OqwBi" id="7ipIhbo8YUo" role="ukAjM">
+                                    <node concept="37vLTw" id="7ipIhbo8YUp" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="project" />
+                                    </node>
+                                    <node concept="liA8E" id="7ipIhbo8YUq" role="2OqNvi">
+                                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                     </node>
                                   </node>
                                 </node>
+                                <node concept="3clFbH" id="7ipIhbo8XkU" role="3cqZAp" />
                               </node>
-                              <node concept="3clFbJ" id="4Q2Vz3i$q78" role="3cqZAp">
-                                <node concept="3clFbS" id="4Q2Vz3i$q79" role="3clFbx">
-                                  <node concept="3clFbF" id="4Q2Vz3i$q7a" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4Q2Vz3i$q7b" role="3clFbG">
-                                      <node concept="37vLTw" id="4Q2Vz3i$q7c" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4Q2Vz3i$q4u" resolve="progress" />
-                                      </node>
-                                      <node concept="liA8E" id="4Q2Vz3i$q7d" role="2OqNvi">
-                                        <ref role="37wK5l" to="mk8z:~ProgressMonitorBase.done()" resolve="done" />
-                                      </node>
-                                    </node>
-                                  </node>
+                            </node>
+                            <node concept="3clFbH" id="vqDSp9TQsU" role="3cqZAp" />
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="vqDSp9SdR1" role="3cqZAp" />
+                        <node concept="3clFbJ" id="4Q2Vz3i$q78" role="3cqZAp">
+                          <node concept="3clFbS" id="4Q2Vz3i$q79" role="3clFbx">
+                            <node concept="3clFbF" id="4Q2Vz3i$q7a" role="3cqZAp">
+                              <node concept="2OqwBi" id="4Q2Vz3i$q7b" role="3clFbG">
+                                <node concept="37vLTw" id="4Q2Vz3i$q7c" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4Q2Vz3i$q4u" resolve="progress" />
                                 </node>
-                                <node concept="3fqX7Q" id="4Q2Vz3i$q7e" role="3clFbw">
-                                  <node concept="2OqwBi" id="4Q2Vz3i$q7f" role="3fr31v">
-                                    <node concept="37vLTw" id="4Q2Vz3i$q7g" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4Q2Vz3i$q4p" resolve="pi" />
-                                    </node>
-                                    <node concept="liA8E" id="4Q2Vz3i$q7h" role="2OqNvi">
-                                      <ref role="37wK5l" to="xygl:~ProgressIndicator.isCanceled()" resolve="isCanceled" />
-                                    </node>
-                                  </node>
+                                <node concept="liA8E" id="4Q2Vz3i$q7d" role="2OqNvi">
+                                  <ref role="37wK5l" to="mk8z:~ProgressMonitorBase.done()" resolve="done" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="3k8awrIlWr_" role="ukAjM">
-                            <node concept="37vLTw" id="3k8awrIlU$u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4Q2Vz3i_rqf" resolve="p" />
+                          <node concept="3fqX7Q" id="4Q2Vz3i$q7e" role="3clFbw">
+                            <node concept="2OqwBi" id="4Q2Vz3i$q7f" role="3fr31v">
+                              <node concept="37vLTw" id="4Q2Vz3i$q7g" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4Q2Vz3i$q4p" resolve="pi" />
+                              </node>
+                              <node concept="liA8E" id="4Q2Vz3i$q7h" role="2OqNvi">
+                                <ref role="37wK5l" to="xygl:~ProgressIndicator.isCanceled()" resolve="isCanceled" />
+                              </node>
                             </node>
-                            <node concept="liA8E" id="3k8awrIlY4_" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="7ipIhbo0HGL" role="3cqZAp">
+                          <node concept="2OqwBi" id="7ipIhbo0JFU" role="3clFbG">
+                            <node concept="37vLTw" id="7ipIhbo0HGJ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7ipIhbo0$sq" resolve="callback" />
+                            </node>
+                            <node concept="liA8E" id="7ipIhbo1Mf9" role="2OqNvi">
+                              <ref role="37wK5l" node="7ipIhbnXdL4" resolve="resultsReceived" />
+                              <node concept="37vLTw" id="7ipIhbo1TyQ" role="37wK5m">
+                                <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                              </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbH" id="7ipIhbo3yAp" role="3cqZAp" />
                       </node>
                     </node>
                     <node concept="3clFb_" id="4Q2Vz3i$q7i" role="jymVt">
@@ -4805,9 +4860,11 @@
       </node>
       <node concept="3cqZAl" id="4Q2Vz3iAja2" role="3clF45" />
       <node concept="37vLTG" id="4Q2Vz3i$q7T" role="3clF46">
-        <property role="TrG5h" value="m" />
+        <property role="TrG5h" value="models" />
         <property role="3TUv4t" value="true" />
-        <node concept="H_c77" id="4Q2Vz3i$q7U" role="1tU5fm" />
+        <node concept="_YKpA" id="vqDSp9S33s" role="1tU5fm">
+          <node concept="H_c77" id="vqDSp9U7nz" role="_ZDj9" />
+        </node>
       </node>
       <node concept="37vLTG" id="4Q2Vz3i$q7V" role="3clF46">
         <property role="TrG5h" value="text" />
@@ -4819,6 +4876,13 @@
         <property role="3TUv4t" value="true" />
         <node concept="10P_77" id="7DRyZmDo$Pu" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="7ipIhbo0$sq" role="3clF46">
+        <property role="TrG5h" value="callback" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7ipIhbo0$sr" role="1tU5fm">
+          <ref role="3uigEE" node="7ipIhbnXbz3" resolve="SearchCallback" />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2HzhasN$atp">
@@ -4852,6 +4916,7 @@
       <node concept="3Tm6S6" id="2Gn1WTgXWpy" role="1B3o_S" />
       <node concept="H_c77" id="2Gn1WTgXWU9" role="1tU5fm" />
     </node>
+    <node concept="2tJIrI" id="6KjVnJp6roZ" role="jymVt" />
     <node concept="3clFbW" id="2HzhasN$atr" role="jymVt">
       <node concept="3cqZAl" id="2HzhasN$ats" role="3clF45" />
       <node concept="3Tm1VV" id="2HzhasN$att" role="1B3o_S" />
@@ -4945,6 +5010,7 @@
         <node concept="17QB3L" id="5jGyeU5Xzrv" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6KjVnJp6rj_" role="jymVt" />
     <node concept="3clFb_" id="2HzhasN$aut" role="jymVt">
       <property role="TrG5h" value="getShortName" />
       <node concept="17QB3L" id="2HzhasN$aux" role="3clF45" />
@@ -4957,6 +5023,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6KjVnJp6reb" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzre" role="jymVt">
       <property role="TrG5h" value="getNamespace" />
       <node concept="17QB3L" id="5jGyeU5Xzrf" role="3clF45" />
@@ -4969,6 +5036,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6KjVnJp6qZC" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzrk" role="jymVt">
       <property role="TrG5h" value="getConcept" />
       <node concept="17QB3L" id="5jGyeU5Xzrl" role="3clF45" />
@@ -4981,6 +5049,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6KjVnJp6qUe" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgXYsz" role="jymVt">
       <property role="TrG5h" value="getModel" />
       <node concept="H_c77" id="2Gn1WTgXYZc" role="3clF45" />
@@ -4993,6 +5062,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6KjVnJp6qOO" role="jymVt" />
     <node concept="3clFb_" id="2HzhasN$avF" role="jymVt">
       <property role="TrG5h" value="getNodePointer" />
       <node concept="3uibUv" id="2HzhasN$avL" role="3clF45">
@@ -22430,5 +22500,112 @@
       </node>
     </node>
   </node>
+  <node concept="tC5Ba" id="6KjVnJoTXb0">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="MbeddrSearchProjectGroup" />
+    <node concept="ftmFs" id="6KjVnJoTXb1" role="ftER_">
+      <node concept="tCFHf" id="6KjVnJoTXb2" role="ftvYc">
+        <ref role="tCJdB" node="6KjVnJoX4Fv" resolve="OpenSearchActionOnMProject" />
+      </node>
+    </node>
+    <node concept="tT9cl" id="6KjVnJoTXb3" role="2f5YQi">
+      <ref role="tU$_T" node="6KjVnJoXyer" resolve="mbeddrPlatformProjectGroup" />
+    </node>
+  </node>
+  <node concept="sE7Ow" id="6KjVnJoX4Fv">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="OpenSearchActionOnProject" />
+    <property role="2uzpH1" value="Search Project" />
+    <property role="1rBW0U" value="true" />
+    <node concept="1DS2jV" id="6KjVnJoX4Fy" role="1NuT2Z">
+      <property role="TrG5h" value="project" />
+      <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+      <node concept="1oajcY" id="6KjVnJoX4Fz" role="1oa70y" />
+    </node>
+    <node concept="tnohg" id="6KjVnJoX4F$" role="tncku">
+      <node concept="3clFbS" id="6KjVnJoX4F_" role="2VODD2">
+        <node concept="3cpWs8" id="6KjVnJoX4FA" role="3cqZAp">
+          <node concept="3cpWsn" id="6KjVnJoX4FB" role="3cpWs9">
+            <property role="TrG5h" value="searchViewer" />
+            <node concept="1xUVSX" id="6KjVnJoX4FC" role="1tU5fm">
+              <ref role="1xYkEM" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+            </node>
+            <node concept="2OqwBi" id="6KjVnJoX4FD" role="33vP2m">
+              <node concept="2OqwBi" id="6KjVnJoX4FE" role="2Oq$k0">
+                <node concept="2WthIp" id="6KjVnJoX4FF" role="2Oq$k0" />
+                <node concept="1DTwFV" id="6KjVnJoX4FG" role="2OqNvi">
+                  <ref role="2WH_rO" node="6KjVnJoX4Fy" resolve="project" />
+                </node>
+              </node>
+              <node concept="LR4U6" id="6KjVnJoX4FH" role="2OqNvi">
+                <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6KjVnJoX4FI" role="3cqZAp">
+          <node concept="2OqwBi" id="6KjVnJoX4FJ" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJoX4FK" role="2Oq$k0">
+              <ref role="3cqZAo" node="6KjVnJoX4FB" resolve="searchViewer" />
+            </node>
+            <node concept="liA8E" id="6KjVnJoX4FL" role="2OqNvi">
+              <ref role="37wK5l" to="71xd:~BaseTool.openTool(boolean)" resolve="openTool" />
+              <node concept="3clFbT" id="6KjVnJoX4FM" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6KjVnJoX4FN" role="3cqZAp">
+          <node concept="2OqwBi" id="6KjVnJoX4FO" role="3clFbG">
+            <node concept="37vLTw" id="6KjVnJoX4FP" role="2Oq$k0">
+              <ref role="3cqZAo" node="6KjVnJoX4FB" resolve="searchViewer" />
+            </node>
+            <node concept="2XshWL" id="6KjVnJoX4FQ" role="2OqNvi">
+              <ref role="2WH_rO" node="6KjVnJoXq9s" resolve="setProject" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1QGGSu" id="6KjVnJoX4FU" role="3Uehp1">
+      <node concept="10M0yZ" id="6KjVnJoX4FV" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
+  </node>
+  <node concept="tC5Ba" id="6KjVnJoXyer">
+    <property role="TrG5h" value="mbeddrPlatformProjectGroup" />
+    <node concept="ftmFs" id="6KjVnJoXyes" role="ftER_">
+      <node concept="2a7GMi" id="6KjVnJoXyet" role="ftvYc" />
+      <node concept="10WQ6h" id="6KjVnJoXyeu" role="ftvYc">
+        <property role="TrG5h" value="mbeddrPlatformSolutionExtensions" />
+      </node>
+    </node>
+    <node concept="tT9cl" id="6KjVnJoXyev" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:hyf4HGL" resolve="ProjectActions" />
+    </node>
+  </node>
+  <node concept="3HP615" id="7ipIhbnXbz3">
+    <property role="2bfB8j" value="true" />
+    <property role="TrG5h" value="SearchCallback" />
+    <property role="3GE5qa" value="search" />
+    <node concept="3clFb_" id="7ipIhbnXdL4" role="jymVt">
+      <property role="TrG5h" value="resultsReceived" />
+      <node concept="3clFbS" id="7ipIhbnXdL7" role="3clF47" />
+      <node concept="3Tm1VV" id="7ipIhbnXdL8" role="1B3o_S" />
+      <node concept="3cqZAl" id="7ipIhbo0TEm" role="3clF45" />
+      <node concept="37vLTG" id="7ipIhbo14iC" role="3clF46">
+        <property role="TrG5h" value="results" />
+        <node concept="_YKpA" id="7ipIhbo14iA" role="1tU5fm">
+          <node concept="3uibUv" id="7ipIhbo18$S" role="_ZDj9">
+            <ref role="3uigEE" node="2HzhasN$atp" resolve="SearchResult" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7ipIhbnX737" role="1B3o_S" />
+  </node>
 </model>
 

From d0de9f8da5847a8126d5f79aecbdad9b15df4d71 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 20:57:23 +0100
Subject: [PATCH 10/38] core.base: implement searching for the global scope

---
 .../core/base/pluginSolution/plugin.mps       | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 4a942aca2a8..e617a94d0e0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2109,6 +2109,26 @@
     <property role="TrG5h" value="MbeddrSearchViewer" />
     <property role="2XNbzY" value="Search" />
     <property role="3GE5qa" value="search" />
+    <node concept="2XrIbr" id="vqDSpa77ZY" role="2XNbBy">
+      <property role="TrG5h" value="setGlobal" />
+      <node concept="3cqZAl" id="vqDSpa77ZZ" role="3clF45" />
+      <node concept="3clFbS" id="vqDSpa7800" role="3clF47">
+        <node concept="3clFbF" id="vqDSpa7801" role="3cqZAp">
+          <node concept="2OqwBi" id="vqDSpa7802" role="3clFbG">
+            <node concept="2OqwBi" id="vqDSpa7803" role="2Oq$k0">
+              <node concept="2WthIp" id="vqDSpa7804" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="vqDSpa7805" role="2OqNvi">
+                <ref role="2WH_rO" node="2HzhasNzNDV" resolve="myComponent" />
+              </node>
+            </node>
+            <node concept="liA8E" id="vqDSpa7806" role="2OqNvi">
+              <ref role="37wK5l" node="vqDSpa7quP" resolve="setGlobalScope" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpa7807" role="1B3o_S" />
+    </node>
     <node concept="2XrIbr" id="6KjVnJoXq9s" role="2XNbBy">
       <property role="TrG5h" value="setProject" />
       <node concept="3cqZAl" id="6KjVnJoXr8T" role="3clF45" />
@@ -2918,6 +2938,38 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6KjVnJoW8WZ" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpa7quP" role="jymVt">
+      <property role="TrG5h" value="setGlobalScope" />
+      <node concept="3cqZAl" id="vqDSpa7quQ" role="3clF45" />
+      <node concept="3Tm1VV" id="vqDSpa7quR" role="1B3o_S" />
+      <node concept="3clFbS" id="vqDSpa7quS" role="3clF47">
+        <node concept="3clFbF" id="vqDSpa7quT" role="3cqZAp">
+          <node concept="37vLTI" id="vqDSpa7quU" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpa7quV" role="37vLTJ">
+              <ref role="3cqZAo" node="6KjVnJp5uC_" resolve="scope" />
+            </node>
+            <node concept="2ShNRf" id="vqDSpa7TlN" role="37vLTx">
+              <node concept="1pGfFk" id="vqDSpa84Wq" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="mte5:~GlobalScope.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="GlobalScope" />
+                <node concept="2OqwBi" id="vqDSpa8lcu" role="37wK5m">
+                  <node concept="Xjq3P" id="vqDSpa8ga7" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="vqDSpa8vMi" role="2OqNvi">
+                    <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpa7qv1" role="3cqZAp">
+          <node concept="1rXfSq" id="vqDSpa7qv2" role="3clFbG">
+            <ref role="37wK5l" node="2Gn1WTgOnVE" resolve="cleanUp" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="vqDSpa7nis" role="jymVt" />
     <node concept="3clFb_" id="6KjVnJoW8X3" role="jymVt">
       <property role="TrG5h" value="setProjectScope" />
       <node concept="3cqZAl" id="6KjVnJoW8X4" role="3clF45" />
@@ -5376,6 +5428,24 @@
         <node concept="10Oyi0" id="5jGyeU5Xzo7" role="1tU5fm" />
       </node>
       <node concept="3clFbS" id="5jGyeU5Xzo8" role="3clF47">
+        <node concept="3clFbJ" id="vqDSpacspH" role="3cqZAp">
+          <node concept="3clFbS" id="vqDSpacspJ" role="3clFbx">
+            <node concept="3cpWs6" id="vqDSpacGsX" role="3cqZAp">
+              <node concept="10Nm6u" id="vqDSpacHM0" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="2d3UOw" id="vqDSpacE10" role="3clFbw">
+            <node concept="37vLTw" id="vqDSpactxe" role="3uHU7B">
+              <ref role="3cqZAo" node="5jGyeU5Xzo4" resolve="row" />
+            </node>
+            <node concept="2OqwBi" id="vqDSpacBEJ" role="3uHU7w">
+              <node concept="37vLTw" id="vqDSpac$D0" role="2Oq$k0">
+                <ref role="3cqZAo" node="jpyKDg1OHg" resolve="result" />
+              </node>
+              <node concept="34oBXx" id="vqDSpacDAO" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="5jGyeU5Xzqv" role="3cqZAp">
           <node concept="3cpWsn" id="5jGyeU5Xzqw" role="3cpWs9">
             <property role="TrG5h" value="res" />
@@ -22607,5 +22677,80 @@
     </node>
     <node concept="3Tm1VV" id="7ipIhbnX737" role="1B3o_S" />
   </node>
+  <node concept="tC5Ba" id="vqDSpa73Xz">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="MbeddrSearchGlobalGroup" />
+    <node concept="ftmFs" id="vqDSpa73X$" role="ftER_">
+      <node concept="tCFHf" id="vqDSpa73X_" role="ftvYc">
+        <ref role="tCJdB" node="vqDSpa9D$n" resolve="OpenSearchActionGlobally" />
+      </node>
+    </node>
+    <node concept="tT9cl" id="vqDSpa73XA" role="2f5YQi">
+      <ref role="tU$_T" node="6KjVnJoXyer" resolve="mbeddrPlatformProjectGroup" />
+    </node>
+  </node>
+  <node concept="sE7Ow" id="vqDSpa9D$n">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="OpenSearchActionGlobally" />
+    <property role="2uzpH1" value="Search Globally" />
+    <property role="1rBW0U" value="true" />
+    <node concept="1DS2jV" id="vqDSpa9D$o" role="1NuT2Z">
+      <property role="TrG5h" value="project" />
+      <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+      <node concept="1oajcY" id="vqDSpa9D$p" role="1oa70y" />
+    </node>
+    <node concept="tnohg" id="vqDSpa9D$q" role="tncku">
+      <node concept="3clFbS" id="vqDSpa9D$r" role="2VODD2">
+        <node concept="3cpWs8" id="vqDSpa9D$s" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpa9D$t" role="3cpWs9">
+            <property role="TrG5h" value="searchViewer" />
+            <node concept="1xUVSX" id="vqDSpa9D$u" role="1tU5fm">
+              <ref role="1xYkEM" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+            </node>
+            <node concept="2OqwBi" id="vqDSpa9D$v" role="33vP2m">
+              <node concept="2OqwBi" id="vqDSpa9D$w" role="2Oq$k0">
+                <node concept="2WthIp" id="vqDSpa9D$x" role="2Oq$k0" />
+                <node concept="1DTwFV" id="vqDSpa9D$y" role="2OqNvi">
+                  <ref role="2WH_rO" node="vqDSpa9D$o" resolve="project" />
+                </node>
+              </node>
+              <node concept="LR4U6" id="vqDSpa9D$z" role="2OqNvi">
+                <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpa9D$$" role="3cqZAp">
+          <node concept="2OqwBi" id="vqDSpa9D$_" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpa9D$A" role="2Oq$k0">
+              <ref role="3cqZAo" node="vqDSpa9D$t" resolve="searchViewer" />
+            </node>
+            <node concept="liA8E" id="vqDSpa9D$B" role="2OqNvi">
+              <ref role="37wK5l" to="71xd:~BaseTool.openTool(boolean)" resolve="openTool" />
+              <node concept="3clFbT" id="vqDSpa9D$C" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpa9D$D" role="3cqZAp">
+          <node concept="2OqwBi" id="vqDSpa9D$E" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpa9D$F" role="2Oq$k0">
+              <ref role="3cqZAo" node="vqDSpa9D$t" resolve="searchViewer" />
+            </node>
+            <node concept="2XshWL" id="vqDSpa9D$G" role="2OqNvi">
+              <ref role="2WH_rO" node="vqDSpa77ZY" resolve="setGlobal" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1QGGSu" id="vqDSpa9D$H" role="3Uehp1">
+      <node concept="10M0yZ" id="vqDSpa9D$I" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 88fdc44214097453f261180b19b14757aa6bac54 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 21:32:49 +0100
Subject: [PATCH 11/38] core.base: implement an approximate search

---
 .../core/base/pluginSolution/plugin.mps       | 829 +++++++++++++++++-
 1 file changed, 790 insertions(+), 39 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index e617a94d0e0..9f3842cd046 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -266,6 +266,7 @@
       </concept>
       <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
       <concept id="1153422105332" name="jetbrains.mps.baseLanguage.structure.RemExpression" flags="nn" index="2dk9JS" />
+      <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
@@ -2456,6 +2457,12 @@
       <node concept="10P_77" id="1GW3SvfTsEI" role="1tU5fm" />
       <node concept="3clFbT" id="1GW3SvfTLCa" role="33vP2m" />
     </node>
+    <node concept="312cEg" id="vqDSpagAtK" role="jymVt">
+      <property role="TrG5h" value="approximateSearch" />
+      <node concept="3Tm6S6" id="vqDSpagnYl" role="1B3o_S" />
+      <node concept="10P_77" id="vqDSpag$oQ" role="1tU5fm" />
+      <node concept="3clFbT" id="vqDSpagKFa" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="1GW3SvfSRyG" role="jymVt" />
     <node concept="3clFbW" id="2HzhasNzNH5" role="jymVt">
       <node concept="3Tm1VV" id="2HzhasNzNH6" role="1B3o_S" />
@@ -2617,6 +2624,9 @@
                                 <node concept="1rXfSq" id="1GW3SvfWykh" role="37wK5m">
                                   <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
                                 </node>
+                                <node concept="1rXfSq" id="vqDSpamscX" role="37wK5m">
+                                  <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -2841,6 +2851,21 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="vqDSpaitsC" role="3cqZAp">
+          <node concept="2OqwBi" id="vqDSpaitsD" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpaitsE" role="2Oq$k0">
+              <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
+            </node>
+            <node concept="liA8E" id="vqDSpaitsF" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+              <node concept="2ShNRf" id="vqDSpaitsG" role="37wK5m">
+                <node concept="1pGfFk" id="vqDSpaitsH" role="2ShVmc">
+                  <ref role="37wK5l" node="vqDSpafUaY" resolve="ApproximateSearchToggleAction" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6ysF3v1j_gs" role="3cqZAp">
           <node concept="2OqwBi" id="6ysF3v1j_gt" role="3clFbG">
             <node concept="37vLTw" id="791RMwCWCHr" role="2Oq$k0">
@@ -3134,6 +3159,9 @@
               <node concept="37vLTw" id="7DRyZmDonn0" role="37wK5m">
                 <ref role="3cqZAo" node="7DRyZmDokoL" resolve="searchAll" />
               </node>
+              <node concept="37vLTw" id="vqDSpalZTU" role="37wK5m">
+                <ref role="3cqZAo" node="vqDSpalrZd" resolve="approximateSearch" />
+              </node>
               <node concept="2ShNRf" id="7ipIhbo7evk" role="37wK5m">
                 <node concept="YeOm9" id="7ipIhbo7maw" role="2ShVmc">
                   <node concept="1Y3b0j" id="7ipIhbo7maz" role="YeSDq">
@@ -3197,6 +3225,10 @@
         <property role="TrG5h" value="searchAll" />
         <node concept="10P_77" id="7DRyZmDokoK" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="vqDSpalrZd" role="3clF46">
+        <property role="TrG5h" value="approximateSearch" />
+        <node concept="10P_77" id="vqDSpalz7g" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1GW3SvfBplv" role="jymVt" />
     <node concept="3clFb_" id="6wvhQs7njzg" role="jymVt">
@@ -3500,6 +3532,41 @@
         <node concept="10P_77" id="1GW3SvfV_bF" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="vqDSpagVBc" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpagXys" role="jymVt">
+      <property role="TrG5h" value="isApproximateSearch" />
+      <node concept="3clFbS" id="vqDSpagXyt" role="3clF47">
+        <node concept="3clFbF" id="vqDSpagXyu" role="3cqZAp">
+          <node concept="37vLTw" id="vqDSpah$gc" role="3clFbG">
+            <ref role="3cqZAo" node="vqDSpagAtK" resolve="approximateSearch" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpagXyw" role="1B3o_S" />
+      <node concept="10P_77" id="vqDSpagXyx" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="vqDSpagXyy" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpagXyz" role="jymVt">
+      <property role="TrG5h" value="toggleApproximateSearch" />
+      <node concept="3clFbS" id="vqDSpagXy$" role="3clF47">
+        <node concept="3clFbF" id="vqDSpagXy_" role="3cqZAp">
+          <node concept="37vLTI" id="vqDSpagXyA" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpagXyB" role="37vLTx">
+              <ref role="3cqZAo" node="vqDSpagXyF" resolve="flag" />
+            </node>
+            <node concept="37vLTw" id="vqDSpagXyC" role="37vLTJ">
+              <ref role="3cqZAo" node="vqDSpagAtK" resolve="approximateSearch" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpagXyD" role="1B3o_S" />
+      <node concept="3cqZAl" id="vqDSpagXyE" role="3clF45" />
+      <node concept="37vLTG" id="vqDSpagXyF" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="vqDSpagXyG" role="1tU5fm" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="2HzhasNzNJV">
     <property role="3GE5qa" value="search" />
@@ -3593,6 +3660,15 @@
     <property role="TrG5h" value="SearchEngine" />
     <node concept="3Tm1VV" id="2HzhasN$akQ" role="1B3o_S" />
     <node concept="2tJIrI" id="4Q2Vz3i$yYf" role="jymVt" />
+    <node concept="Wx3nA" id="vqDSpamxv4" role="jymVt">
+      <property role="TrG5h" value="ALLOWED_DISTANCE" />
+      <node concept="10Oyi0" id="vqDSpamxv7" role="1tU5fm" />
+      <node concept="3cmrfG" id="vqDSpamxv8" role="33vP2m">
+        <property role="3cmrfH" value="3" />
+      </node>
+      <node concept="3Tm1VV" id="vqDSpamxv6" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="vqDSpamANO" role="jymVt" />
     <node concept="312cEg" id="4Q2Vz3i_rqf" role="jymVt">
       <property role="TrG5h" value="project" />
       <node concept="3Tm6S6" id="4Q2Vz3i_rqg" role="1B3o_S" />
@@ -3608,7 +3684,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7ipIhbnWQxE" role="jymVt" />
-    <node concept="2tJIrI" id="7ipIhbnWU8L" role="jymVt" />
     <node concept="3clFbW" id="6KjVnJoYZE3" role="jymVt">
       <node concept="3cqZAl" id="6KjVnJoYZE4" role="3clF45" />
       <node concept="3clFbS" id="6KjVnJoYZE6" role="3clF47">
@@ -3715,6 +3790,9 @@
             <node concept="37vLTw" id="7DRyZmDov5Q" role="37wK5m">
               <ref role="3cqZAo" node="7DRyZmDopcL" resolve="searchAll" />
             </node>
+            <node concept="37vLTw" id="vqDSpalbCd" role="37wK5m">
+              <ref role="3cqZAo" node="vqDSpal2QP" resolve="approximateSearch" />
+            </node>
             <node concept="37vLTw" id="vqDSp9RYfZ" role="37wK5m">
               <ref role="3cqZAo" node="7ipIhbnXdOW" resolve="callback" />
             </node>
@@ -3731,6 +3809,10 @@
         <property role="TrG5h" value="searchAll" />
         <node concept="10P_77" id="7DRyZmDoqKp" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="vqDSpal2QP" role="3clF46">
+        <property role="TrG5h" value="approximateSearch" />
+        <node concept="10P_77" id="vqDSpal5w7" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7ipIhbnXdOW" role="3clF46">
         <property role="TrG5h" value="callback" />
         <node concept="3uibUv" id="7ipIhbnXfIW" role="1tU5fm">
@@ -4242,6 +4324,89 @@
                                               </node>
                                             </node>
                                           </node>
+                                          <node concept="3cpWs8" id="vqDSpakMW6" role="3cqZAp">
+                                            <node concept="3cpWsn" id="vqDSpakMW9" role="3cpWs9">
+                                              <property role="TrG5h" value="matches" />
+                                              <node concept="10P_77" id="vqDSpakMW4" role="1tU5fm" />
+                                              <node concept="3clFbT" id="vqDSpaoqHO" role="33vP2m" />
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbJ" id="vqDSpaov7O" role="3cqZAp">
+                                            <node concept="3clFbS" id="vqDSpaov7Q" role="3clFbx">
+                                              <node concept="3clFbJ" id="vqDSpal0By" role="3cqZAp">
+                                                <node concept="3clFbS" id="vqDSpal0B$" role="3clFbx">
+                                                  <node concept="3clFbF" id="vqDSpamNpL" role="3cqZAp">
+                                                    <node concept="37vLTI" id="vqDSpapoB$" role="3clFbG">
+                                                      <node concept="37vLTw" id="vqDSpapoBH" role="37vLTJ">
+                                                        <ref role="3cqZAo" node="vqDSpakMW9" resolve="matches" />
+                                                      </node>
+                                                      <node concept="2dkUwp" id="vqDSpapoBA" role="37vLTx">
+                                                        <node concept="37vLTw" id="vqDSpapoBB" role="3uHU7w">
+                                                          <ref role="3cqZAo" node="vqDSpamxv4" resolve="ALLOWED_DISTANCE" />
+                                                        </node>
+                                                        <node concept="2YIFZM" id="vqDSpapoBC" role="3uHU7B">
+                                                          <ref role="37wK5l" node="vqDSpaiUHg" resolve="compute" />
+                                                          <ref role="1Pybhc" node="vqDSpaiUeD" resolve="LevenshteinDistance" />
+                                                          <node concept="2OqwBi" id="vqDSpapoBD" role="37wK5m">
+                                                            <node concept="37vLTw" id="vqDSpapoBE" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                            </node>
+                                                            <node concept="3TrcHB" id="vqDSpapoBF" role="2OqNvi">
+                                                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                            </node>
+                                                          </node>
+                                                          <node concept="37vLTw" id="vqDSpapoBG" role="37wK5m">
+                                                            <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="37vLTw" id="vqDSpamGgQ" role="3clFbw">
+                                                  <ref role="3cqZAo" node="vqDSpal5Zc" resolve="approximateSearch" />
+                                                </node>
+                                                <node concept="9aQIb" id="vqDSpaoC7B" role="9aQIa">
+                                                  <node concept="3clFbS" id="vqDSpaoC7C" role="9aQI4">
+                                                    <node concept="3clFbF" id="vqDSpanKS9" role="3cqZAp">
+                                                      <node concept="37vLTI" id="vqDSpapr4y" role="3clFbG">
+                                                        <node concept="37vLTw" id="vqDSpapr4$" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="vqDSpakMW9" resolve="matches" />
+                                                        </node>
+                                                        <node concept="2OqwBi" id="vqDSpapr4_" role="37vLTx">
+                                                          <node concept="2OqwBi" id="vqDSpapr4A" role="2Oq$k0">
+                                                            <node concept="37vLTw" id="vqDSpapr4B" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                            </node>
+                                                            <node concept="3TrcHB" id="vqDSpapr4C" role="2OqNvi">
+                                                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                            </node>
+                                                          </node>
+                                                          <node concept="liA8E" id="vqDSpapr4D" role="2OqNvi">
+                                                            <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                                                            <node concept="37vLTw" id="vqDSpapr4E" role="37wK5m">
+                                                              <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="3y3z36" id="vqDSpakRVO" role="3clFbw">
+                                              <node concept="2OqwBi" id="vqDSpakRVP" role="3uHU7B">
+                                                <node concept="37vLTw" id="vqDSpakRVQ" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                </node>
+                                                <node concept="3TrcHB" id="vqDSpakRVR" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                              <node concept="10Nm6u" id="vqDSpakRVS" role="3uHU7w" />
+                                            </node>
+                                          </node>
                                           <node concept="3clFbJ" id="7DRyZmECiBx" role="3cqZAp">
                                             <node concept="3clFbS" id="7DRyZmECiBy" role="3clFbx">
                                               <node concept="3clFbJ" id="7DRyZmECiBz" role="3cqZAp">
@@ -4458,34 +4623,8 @@
                                               </node>
                                               <node concept="3clFbH" id="7DRyZmECiCJ" role="3cqZAp" />
                                             </node>
-                                            <node concept="1Wc70l" id="7DRyZmECiCK" role="3clFbw">
-                                              <node concept="3y3z36" id="7DRyZmECiCL" role="3uHU7B">
-                                                <node concept="2OqwBi" id="7DRyZmECiCM" role="3uHU7B">
-                                                  <node concept="37vLTw" id="7DRyZmECiCN" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                                  </node>
-                                                  <node concept="3TrcHB" id="7DRyZmECiCO" role="2OqNvi">
-                                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                  </node>
-                                                </node>
-                                                <node concept="10Nm6u" id="7DRyZmECiCP" role="3uHU7w" />
-                                              </node>
-                                              <node concept="2OqwBi" id="7DRyZmECiCQ" role="3uHU7w">
-                                                <node concept="2OqwBi" id="7DRyZmECiCR" role="2Oq$k0">
-                                                  <node concept="37vLTw" id="7DRyZmECiCS" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                                  </node>
-                                                  <node concept="3TrcHB" id="7DRyZmECiCT" role="2OqNvi">
-                                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                  </node>
-                                                </node>
-                                                <node concept="liA8E" id="7DRyZmECiCU" role="2OqNvi">
-                                                  <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                                                  <node concept="37vLTw" id="7DRyZmECiCV" role="37wK5m">
-                                                    <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
-                                                  </node>
-                                                </node>
-                                              </node>
+                                            <node concept="37vLTw" id="vqDSpanYvU" role="3clFbw">
+                                              <ref role="3cqZAo" node="vqDSpakMW9" resolve="matches" />
                                             </node>
                                           </node>
                                         </node>
@@ -4568,6 +4707,63 @@
                                           </node>
                                           <node concept="3clFbJ" id="7DRyZmExiht" role="3cqZAp">
                                             <node concept="3clFbS" id="7DRyZmExihv" role="3clFbx">
+                                              <node concept="3cpWs8" id="vqDSpaoVc7" role="3cqZAp">
+                                                <node concept="3cpWsn" id="vqDSpaoVca" role="3cpWs9">
+                                                  <property role="TrG5h" value="matches" />
+                                                  <node concept="10P_77" id="vqDSpaoVc5" role="1tU5fm" />
+                                                </node>
+                                              </node>
+                                              <node concept="3clFbJ" id="vqDSpap9bq" role="3cqZAp">
+                                                <node concept="3clFbS" id="vqDSpap9bs" role="3clFbx">
+                                                  <node concept="3clFbF" id="vqDSpapjme" role="3cqZAp">
+                                                    <node concept="37vLTI" id="vqDSpapn_Y" role="3clFbG">
+                                                      <node concept="2dkUwp" id="vqDSpapEyY" role="37vLTx">
+                                                        <node concept="37vLTw" id="vqDSpapGOT" role="3uHU7w">
+                                                          <ref role="3cqZAo" node="vqDSpamxv4" resolve="ALLOWED_DISTANCE" />
+                                                        </node>
+                                                        <node concept="2YIFZM" id="vqDSpapuVE" role="3uHU7B">
+                                                          <ref role="37wK5l" node="vqDSpaiUHg" resolve="compute" />
+                                                          <ref role="1Pybhc" node="vqDSpaiUeD" resolve="LevenshteinDistance" />
+                                                          <node concept="37vLTw" id="vqDSpapziu" role="37wK5m">
+                                                            <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                          </node>
+                                                          <node concept="37vLTw" id="vqDSpapA7d" role="37wK5m">
+                                                            <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="37vLTw" id="vqDSpapjmc" role="37vLTJ">
+                                                        <ref role="3cqZAo" node="vqDSpaoVca" resolve="matches" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="37vLTw" id="vqDSpapcee" role="3clFbw">
+                                                  <ref role="3cqZAo" node="vqDSpal5Zc" resolve="approximateSearch" />
+                                                </node>
+                                                <node concept="9aQIb" id="vqDSpapJ3L" role="9aQIa">
+                                                  <node concept="3clFbS" id="vqDSpapJ3M" role="9aQI4">
+                                                    <node concept="3clFbF" id="vqDSpapLE7" role="3cqZAp">
+                                                      <node concept="37vLTI" id="vqDSpapRk0" role="3clFbG">
+                                                        <node concept="37vLTw" id="vqDSpapLE6" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="vqDSpaoVca" resolve="matches" />
+                                                        </node>
+                                                        <node concept="2OqwBi" id="vqDSpapT1C" role="37vLTx">
+                                                          <node concept="37vLTw" id="vqDSpapT1D" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                          </node>
+                                                          <node concept="liA8E" id="vqDSpapT1E" role="2OqNvi">
+                                                            <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                                                            <node concept="37vLTw" id="vqDSpapT1F" role="37wK5m">
+                                                              <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
                                               <node concept="3clFbJ" id="7DRyZmErcIi" role="3cqZAp">
                                                 <node concept="3clFbS" id="7DRyZmErcIk" role="3clFbx">
                                                   <node concept="3clFbJ" id="7DRyZmEra8u" role="3cqZAp">
@@ -4750,16 +4946,8 @@
                                                   </node>
                                                   <node concept="3clFbH" id="7DRyZmErcIj" role="3cqZAp" />
                                                 </node>
-                                                <node concept="2OqwBi" id="7DRyZmErh$t" role="3clFbw">
-                                                  <node concept="37vLTw" id="7DRyZmErI5i" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
-                                                  </node>
-                                                  <node concept="liA8E" id="7DRyZmErjdM" role="2OqNvi">
-                                                    <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                                                    <node concept="37vLTw" id="7DRyZmErm1w" role="37wK5m">
-                                                      <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
-                                                    </node>
-                                                  </node>
+                                                <node concept="37vLTw" id="vqDSpapYx6" role="3clFbw">
+                                                  <ref role="3cqZAo" node="vqDSpaoVca" resolve="matches" />
                                                 </node>
                                               </node>
                                             </node>
@@ -4928,6 +5116,11 @@
         <property role="3TUv4t" value="true" />
         <node concept="10P_77" id="7DRyZmDo$Pu" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="vqDSpal5Zc" role="3clF46">
+        <property role="TrG5h" value="approximateSearch" />
+        <property role="3TUv4t" value="true" />
+        <node concept="10P_77" id="vqDSpal5Zd" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7ipIhbo0$sq" role="3clF46">
         <property role="TrG5h" value="callback" />
         <property role="3TUv4t" value="true" />
@@ -22400,6 +22593,14 @@
                   <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
                 </node>
               </node>
+              <node concept="2OqwBi" id="vqDSpamaBO" role="37wK5m">
+                <node concept="37vLTw" id="vqDSpam8mk" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="vqDSpamdjL" role="2OqNvi">
+                  <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -22752,5 +22953,555 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="vqDSpafUaV">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="ApproximateSearchToggleAction" />
+    <node concept="2tJIrI" id="vqDSpafUaW" role="jymVt" />
+    <node concept="2tJIrI" id="vqDSpafUaX" role="jymVt" />
+    <node concept="3clFbW" id="vqDSpafUaY" role="jymVt">
+      <node concept="3cqZAl" id="vqDSpafUaZ" role="3clF45" />
+      <node concept="3clFbS" id="vqDSpafUb0" role="3clF47">
+        <node concept="XkiVB" id="vqDSpafUb1" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="ToggleAction" />
+          <node concept="Xl_RD" id="vqDSpafUb2" role="37wK5m">
+            <property role="Xl_RC" value="Approximate Search" />
+          </node>
+          <node concept="3cpWs3" id="vqDSparkz4" role="37wK5m">
+            <node concept="10M0yZ" id="vqDSparmnU" role="3uHU7w">
+              <ref role="3cqZAo" node="vqDSpamxv4" resolve="ALLOWED_DISTANCE" />
+              <ref role="1PxDUh" node="2HzhasN$akP" resolve="SearchEngine" />
+            </node>
+            <node concept="Xl_RD" id="vqDSpafUb3" role="3uHU7B">
+              <property role="Xl_RC" value="Search with an allowed error distance of " />
+            </node>
+          </node>
+          <node concept="10M0yZ" id="vqDSparo60" role="37wK5m">
+            <ref role="3cqZAo" to="z2i8:~AllIcons$Nodes.Undeploy" resolve="Undeploy" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Nodes" resolve="Nodes" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpafUb5" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="vqDSpafUb6" role="jymVt" />
+    <node concept="3Tm1VV" id="vqDSpafUb7" role="1B3o_S" />
+    <node concept="3uibUv" id="vqDSpafUb8" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+    </node>
+    <node concept="3clFb_" id="vqDSpafUb9" role="jymVt">
+      <property role="TrG5h" value="isSelected" />
+      <node concept="3Tm1VV" id="vqDSpafUba" role="1B3o_S" />
+      <node concept="10P_77" id="vqDSpafUbb" role="3clF45" />
+      <node concept="37vLTG" id="vqDSpafUbc" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="vqDSpafUbd" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="vqDSpafUbe" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="vqDSpafUbf" role="3clF47">
+        <node concept="3cpWs8" id="vqDSpafUbg" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpafUbh" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="vqDSpafUbi" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="vqDSpafUbj" role="33vP2m">
+              <node concept="3uibUv" id="vqDSpafUbk" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="vqDSpafUbl" role="10QFUP">
+                <node concept="2EnYce" id="vqDSpafUbm" role="2Oq$k0">
+                  <node concept="2OqwBi" id="vqDSpafUbn" role="2Oq$k0">
+                    <node concept="37vLTw" id="vqDSpafUbo" role="2Oq$k0">
+                      <ref role="3cqZAo" node="vqDSpafUbc" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="vqDSpafUbp" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="vqDSpafUbq" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="vqDSpafUbr" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpafUbs" role="3cqZAp">
+          <node concept="2EnYce" id="vqDSpafUbt" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpafUbu" role="2Oq$k0">
+              <ref role="3cqZAo" node="vqDSpafUbh" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="vqDSpafUbv" role="2OqNvi">
+              <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="vqDSpafUbw" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="vqDSpafUbx" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpafUby" role="jymVt">
+      <property role="TrG5h" value="setSelected" />
+      <node concept="3Tm1VV" id="vqDSpafUbz" role="1B3o_S" />
+      <node concept="3cqZAl" id="vqDSpafUb$" role="3clF45" />
+      <node concept="37vLTG" id="vqDSpafUb_" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="vqDSpafUbA" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="vqDSpafUbB" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="vqDSpafUbC" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="vqDSpafUbD" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="vqDSpafUbE" role="3clF47">
+        <node concept="3cpWs8" id="vqDSpafUbF" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpafUbG" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="vqDSpafUbH" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="vqDSpafUbI" role="33vP2m">
+              <node concept="3uibUv" id="vqDSpafUbJ" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="vqDSpafUbK" role="10QFUP">
+                <node concept="2EnYce" id="vqDSpafUbL" role="2Oq$k0">
+                  <node concept="2EnYce" id="vqDSpafUbM" role="2Oq$k0">
+                    <node concept="37vLTw" id="vqDSpafUbN" role="2Oq$k0">
+                      <ref role="3cqZAo" node="vqDSpafUb_" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="vqDSpafUbO" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="vqDSpafUbP" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="vqDSpafUbQ" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpafUbR" role="3cqZAp">
+          <node concept="2EnYce" id="vqDSpafUbS" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpafUbT" role="2Oq$k0">
+              <ref role="3cqZAo" node="vqDSpafUbG" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="vqDSpafUbU" role="2OqNvi">
+              <ref role="37wK5l" node="vqDSpagXyz" resolve="toggleApproximateSearch" />
+              <node concept="37vLTw" id="vqDSpafUbV" role="37wK5m">
+                <ref role="3cqZAo" node="vqDSpafUbC" resolve="flag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="vqDSpafUbW" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="vqDSpaiUeD">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="LevenshteinDistance" />
+    <node concept="2YIFZL" id="vqDSpaiUHg" role="jymVt">
+      <property role="TrG5h" value="compute" />
+      <node concept="37vLTG" id="vqDSpaiUHh" role="3clF46">
+        <property role="TrG5h" value="s1" />
+        <node concept="17QB3L" id="vqDSpakeCT" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="vqDSpaiUHj" role="3clF46">
+        <property role="TrG5h" value="s2" />
+        <node concept="17QB3L" id="vqDSpakhHL" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="vqDSpaiUHl" role="3clF47">
+        <node concept="3cpWs8" id="vqDSpaiUHn" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpaiUHm" role="3cpWs9">
+            <property role="TrG5h" value="len1" />
+            <node concept="10Oyi0" id="vqDSpaiUHo" role="1tU5fm" />
+            <node concept="2OqwBi" id="vqDSpaj_Je" role="33vP2m">
+              <node concept="37vLTw" id="vqDSpaiVvW" role="2Oq$k0">
+                <ref role="3cqZAo" node="vqDSpaiUHh" resolve="s1" />
+              </node>
+              <node concept="liA8E" id="vqDSpaj_Jf" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="vqDSpaiUHr" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpaiUHq" role="3cpWs9">
+            <property role="TrG5h" value="len2" />
+            <node concept="10Oyi0" id="vqDSpaiUHs" role="1tU5fm" />
+            <node concept="2OqwBi" id="vqDSpajzq4" role="33vP2m">
+              <node concept="37vLTw" id="vqDSpaiVxN" role="2Oq$k0">
+                <ref role="3cqZAo" node="vqDSpaiUHj" resolve="s2" />
+              </node>
+              <node concept="liA8E" id="vqDSpajzq5" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="vqDSpakukn" role="3cqZAp" />
+        <node concept="3cpWs8" id="vqDSpaiUHv" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpaiUHu" role="3cpWs9">
+            <property role="TrG5h" value="dp" />
+            <node concept="10Q1$e" id="vqDSpaiUHy" role="1tU5fm">
+              <node concept="10Q1$e" id="vqDSpaiUHx" role="10Q1$1">
+                <node concept="10Oyi0" id="vqDSpaiUHw" role="10Q1$1" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="vqDSpaiUHH" role="33vP2m">
+              <node concept="3$_iS1" id="vqDSpaiUHE" role="2ShVmc">
+                <node concept="3$GHV9" id="vqDSpaiUHF" role="3$GQph">
+                  <node concept="3cpWs3" id="vqDSpaiUH$" role="3$I4v7">
+                    <node concept="37vLTw" id="vqDSpaiUH_" role="3uHU7B">
+                      <ref role="3cqZAo" node="vqDSpaiUHm" resolve="len1" />
+                    </node>
+                    <node concept="3cmrfG" id="vqDSpaiUHA" role="3uHU7w">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3$GHV9" id="vqDSpaiUHG" role="3$GQph">
+                  <node concept="3cpWs3" id="vqDSpaiUHB" role="3$I4v7">
+                    <node concept="37vLTw" id="vqDSpaiUHC" role="3uHU7B">
+                      <ref role="3cqZAo" node="vqDSpaiUHq" resolve="len2" />
+                    </node>
+                    <node concept="3cmrfG" id="vqDSpaiUHD" role="3uHU7w">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="10Oyi0" id="vqDSpaiUHz" role="3$_nBY" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="vqDSpak_jI" role="3cqZAp" />
+        <node concept="1Dw8fO" id="vqDSpaiUHI" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpaiUHJ" role="1Duv9x">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="vqDSpaiUHL" role="1tU5fm" />
+            <node concept="3cmrfG" id="vqDSpaiUHM" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="vqDSpaiUHN" role="1Dwp0S">
+            <node concept="37vLTw" id="vqDSpaiUHO" role="3uHU7B">
+              <ref role="3cqZAo" node="vqDSpaiUHJ" resolve="i" />
+            </node>
+            <node concept="37vLTw" id="vqDSpaiUHP" role="3uHU7w">
+              <ref role="3cqZAo" node="vqDSpaiUHm" resolve="len1" />
+            </node>
+          </node>
+          <node concept="3uNrnE" id="vqDSpaiUHR" role="1Dwrff">
+            <node concept="37vLTw" id="vqDSpaiUHS" role="2$L3a6">
+              <ref role="3cqZAo" node="vqDSpaiUHJ" resolve="i" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="vqDSpaiUHU" role="2LFqv$">
+            <node concept="3clFbF" id="vqDSpaiUHV" role="3cqZAp">
+              <node concept="37vLTI" id="vqDSpaiUHW" role="3clFbG">
+                <node concept="AH0OO" id="vqDSpaiUHX" role="37vLTJ">
+                  <node concept="AH0OO" id="vqDSpaiUHY" role="AHHXb">
+                    <node concept="37vLTw" id="vqDSpaiUHZ" role="AHHXb">
+                      <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+                    </node>
+                    <node concept="37vLTw" id="vqDSpaiUI0" role="AHEQo">
+                      <ref role="3cqZAo" node="vqDSpaiUHJ" resolve="i" />
+                    </node>
+                  </node>
+                  <node concept="3cmrfG" id="vqDSpaiUI1" role="AHEQo">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="vqDSpaiUI2" role="37vLTx">
+                  <ref role="3cqZAo" node="vqDSpaiUHJ" resolve="i" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="vqDSpaiUI3" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpaiUI4" role="1Duv9x">
+            <property role="TrG5h" value="j" />
+            <node concept="10Oyi0" id="vqDSpaiUI6" role="1tU5fm" />
+            <node concept="3cmrfG" id="vqDSpaiUI7" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="vqDSpaiUI8" role="1Dwp0S">
+            <node concept="37vLTw" id="vqDSpaiUI9" role="3uHU7B">
+              <ref role="3cqZAo" node="vqDSpaiUI4" resolve="j" />
+            </node>
+            <node concept="37vLTw" id="vqDSpaiUIa" role="3uHU7w">
+              <ref role="3cqZAo" node="vqDSpaiUHq" resolve="len2" />
+            </node>
+          </node>
+          <node concept="3uNrnE" id="vqDSpaiUIc" role="1Dwrff">
+            <node concept="37vLTw" id="vqDSpaiUId" role="2$L3a6">
+              <ref role="3cqZAo" node="vqDSpaiUI4" resolve="j" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="vqDSpaiUIf" role="2LFqv$">
+            <node concept="3clFbF" id="vqDSpaiUIg" role="3cqZAp">
+              <node concept="37vLTI" id="vqDSpaiUIh" role="3clFbG">
+                <node concept="AH0OO" id="vqDSpaiUIi" role="37vLTJ">
+                  <node concept="AH0OO" id="vqDSpaiUIj" role="AHHXb">
+                    <node concept="37vLTw" id="vqDSpaiUIk" role="AHHXb">
+                      <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+                    </node>
+                    <node concept="3cmrfG" id="vqDSpaiUIl" role="AHEQo">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="vqDSpaiUIm" role="AHEQo">
+                    <ref role="3cqZAo" node="vqDSpaiUI4" resolve="j" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="vqDSpaiUIn" role="37vLTx">
+                  <ref role="3cqZAo" node="vqDSpaiUI4" resolve="j" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="vqDSpakCes" role="3cqZAp" />
+        <node concept="1Dw8fO" id="vqDSpaiUIo" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpaiUIp" role="1Duv9x">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="vqDSpaiUIr" role="1tU5fm" />
+            <node concept="3cmrfG" id="vqDSpaiUIs" role="33vP2m">
+              <property role="3cmrfH" value="1" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="vqDSpaiUIt" role="1Dwp0S">
+            <node concept="37vLTw" id="vqDSpaiUIu" role="3uHU7B">
+              <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+            </node>
+            <node concept="37vLTw" id="vqDSpaiUIv" role="3uHU7w">
+              <ref role="3cqZAo" node="vqDSpaiUHm" resolve="len1" />
+            </node>
+          </node>
+          <node concept="3uNrnE" id="vqDSpaiUIx" role="1Dwrff">
+            <node concept="37vLTw" id="vqDSpaiUIy" role="2$L3a6">
+              <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="vqDSpaiUI$" role="2LFqv$">
+            <node concept="1Dw8fO" id="vqDSpaiUI_" role="3cqZAp">
+              <node concept="3cpWsn" id="vqDSpaiUIA" role="1Duv9x">
+                <property role="TrG5h" value="j" />
+                <node concept="10Oyi0" id="vqDSpaiUIC" role="1tU5fm" />
+                <node concept="3cmrfG" id="vqDSpaiUID" role="33vP2m">
+                  <property role="3cmrfH" value="1" />
+                </node>
+              </node>
+              <node concept="2dkUwp" id="vqDSpaiUIE" role="1Dwp0S">
+                <node concept="37vLTw" id="vqDSpaiUIF" role="3uHU7B">
+                  <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                </node>
+                <node concept="37vLTw" id="vqDSpaiUIG" role="3uHU7w">
+                  <ref role="3cqZAo" node="vqDSpaiUHq" resolve="len2" />
+                </node>
+              </node>
+              <node concept="3uNrnE" id="vqDSpaiUII" role="1Dwrff">
+                <node concept="37vLTw" id="vqDSpaiUIJ" role="2$L3a6">
+                  <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="vqDSpaiUIL" role="2LFqv$">
+                <node concept="3cpWs8" id="vqDSpaiUIN" role="3cqZAp">
+                  <node concept="3cpWsn" id="vqDSpaiUIM" role="3cpWs9">
+                    <property role="TrG5h" value="cost" />
+                    <node concept="10Oyi0" id="vqDSpaiUIO" role="1tU5fm" />
+                    <node concept="3K4zz7" id="vqDSpaiUJ1" role="33vP2m">
+                      <node concept="1eOMI4" id="vqDSpaiUIY" role="3K4Cdx">
+                        <node concept="3clFbC" id="vqDSpaiUIP" role="1eOMHV">
+                          <node concept="2OqwBi" id="vqDSpajwIv" role="3uHU7B">
+                            <node concept="37vLTw" id="vqDSpaiVvP" role="2Oq$k0">
+                              <ref role="3cqZAo" node="vqDSpaiUHh" resolve="s1" />
+                            </node>
+                            <node concept="liA8E" id="vqDSpajwIw" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
+                              <node concept="3cpWsd" id="vqDSpajwIx" role="37wK5m">
+                                <node concept="37vLTw" id="vqDSpajwIy" role="3uHU7B">
+                                  <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+                                </node>
+                                <node concept="3cmrfG" id="vqDSpajwIz" role="3uHU7w">
+                                  <property role="3cmrfH" value="1" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="vqDSpajC5q" role="3uHU7w">
+                            <node concept="37vLTw" id="vqDSpaiVxG" role="2Oq$k0">
+                              <ref role="3cqZAo" node="vqDSpaiUHj" resolve="s2" />
+                            </node>
+                            <node concept="liA8E" id="vqDSpajC5r" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
+                              <node concept="3cpWsd" id="vqDSpajC5s" role="37wK5m">
+                                <node concept="37vLTw" id="vqDSpajC5t" role="3uHU7B">
+                                  <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                                </node>
+                                <node concept="3cmrfG" id="vqDSpajC5u" role="3uHU7w">
+                                  <property role="3cmrfH" value="1" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cmrfG" id="vqDSpaiUIZ" role="3K4E3e">
+                        <property role="3cmrfH" value="0" />
+                      </node>
+                      <node concept="3cmrfG" id="vqDSpaiUJ0" role="3K4GZi">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="vqDSpaiUJ2" role="3cqZAp">
+                  <node concept="37vLTI" id="vqDSpaiUJ3" role="3clFbG">
+                    <node concept="AH0OO" id="vqDSpaiUJ4" role="37vLTJ">
+                      <node concept="AH0OO" id="vqDSpaiUJ5" role="AHHXb">
+                        <node concept="37vLTw" id="vqDSpaiUJ6" role="AHHXb">
+                          <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+                        </node>
+                        <node concept="37vLTw" id="vqDSpaiUJ7" role="AHEQo">
+                          <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="vqDSpaiUJ8" role="AHEQo">
+                        <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="vqDSpaiVw0" role="37vLTx">
+                      <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                      <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
+                      <node concept="2YIFZM" id="vqDSpaiVOB" role="37wK5m">
+                        <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
+                        <node concept="3cpWs3" id="vqDSpaiVOC" role="37wK5m">
+                          <node concept="AH0OO" id="vqDSpaiVOD" role="3uHU7B">
+                            <node concept="AH0OO" id="vqDSpaiVOE" role="AHHXb">
+                              <node concept="37vLTw" id="vqDSpaiVOF" role="AHHXb">
+                                <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+                              </node>
+                              <node concept="3cpWsd" id="vqDSpaiVOG" role="AHEQo">
+                                <node concept="37vLTw" id="vqDSpaiVOH" role="3uHU7B">
+                                  <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+                                </node>
+                                <node concept="3cmrfG" id="vqDSpaiVOI" role="3uHU7w">
+                                  <property role="3cmrfH" value="1" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="vqDSpaiVOJ" role="AHEQo">
+                              <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                            </node>
+                          </node>
+                          <node concept="3cmrfG" id="vqDSpaiVOK" role="3uHU7w">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs3" id="vqDSpaiVOL" role="37wK5m">
+                          <node concept="AH0OO" id="vqDSpaiVOM" role="3uHU7B">
+                            <node concept="AH0OO" id="vqDSpaiVON" role="AHHXb">
+                              <node concept="37vLTw" id="vqDSpaiVOO" role="AHHXb">
+                                <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+                              </node>
+                              <node concept="37vLTw" id="vqDSpaiVOP" role="AHEQo">
+                                <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+                              </node>
+                            </node>
+                            <node concept="3cpWsd" id="vqDSpaiVOQ" role="AHEQo">
+                              <node concept="37vLTw" id="vqDSpaiVOR" role="3uHU7B">
+                                <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                              </node>
+                              <node concept="3cmrfG" id="vqDSpaiVOS" role="3uHU7w">
+                                <property role="3cmrfH" value="1" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cmrfG" id="vqDSpaiVOT" role="3uHU7w">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs3" id="vqDSpaiVwk" role="37wK5m">
+                        <node concept="AH0OO" id="vqDSpaiVwl" role="3uHU7B">
+                          <node concept="AH0OO" id="vqDSpaiVwm" role="AHHXb">
+                            <node concept="37vLTw" id="vqDSpaiVwn" role="AHHXb">
+                              <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+                            </node>
+                            <node concept="3cpWsd" id="vqDSpaiVwo" role="AHEQo">
+                              <node concept="37vLTw" id="vqDSpaiVwp" role="3uHU7B">
+                                <ref role="3cqZAo" node="vqDSpaiUIp" resolve="i" />
+                              </node>
+                              <node concept="3cmrfG" id="vqDSpaiVwq" role="3uHU7w">
+                                <property role="3cmrfH" value="1" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWsd" id="vqDSpaiVwr" role="AHEQo">
+                            <node concept="37vLTw" id="vqDSpaiVws" role="3uHU7B">
+                              <ref role="3cqZAo" node="vqDSpaiUIA" resolve="j" />
+                            </node>
+                            <node concept="3cmrfG" id="vqDSpaiVwt" role="3uHU7w">
+                              <property role="3cmrfH" value="1" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="vqDSpaiVwu" role="3uHU7w">
+                          <ref role="3cqZAo" node="vqDSpaiUIM" resolve="cost" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="vqDSpaiUJC" role="3cqZAp">
+          <node concept="AH0OO" id="vqDSpaiUJD" role="3cqZAk">
+            <node concept="AH0OO" id="vqDSpaiUJE" role="AHHXb">
+              <node concept="37vLTw" id="vqDSpaiUJF" role="AHHXb">
+                <ref role="3cqZAo" node="vqDSpaiUHu" resolve="dp" />
+              </node>
+              <node concept="37vLTw" id="vqDSpaiUJG" role="AHEQo">
+                <ref role="3cqZAo" node="vqDSpaiUHm" resolve="len1" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="vqDSpaiUJH" role="AHEQo">
+              <ref role="3cqZAo" node="vqDSpaiUHq" resolve="len2" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpaiUJI" role="1B3o_S" />
+      <node concept="10Oyi0" id="vqDSpaiUJJ" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="vqDSpaiUeE" role="1B3o_S" />
+  </node>
 </model>
 

From a7dd7fca6fbf8698d543e1e8055c4dd1875938a2 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 21:43:37 +0100
Subject: [PATCH 12/38] core.base: implement match case for the search tool
 (default: false)

---
 .../core/base/pluginSolution/plugin.mps       | 386 ++++++++++++++++--
 1 file changed, 358 insertions(+), 28 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 9f3842cd046..339ae764734 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2463,6 +2463,12 @@
       <node concept="10P_77" id="vqDSpag$oQ" role="1tU5fm" />
       <node concept="3clFbT" id="vqDSpagKFa" role="33vP2m" />
     </node>
+    <node concept="312cEg" id="vqDSpat$qb" role="jymVt">
+      <property role="TrG5h" value="matchCase" />
+      <node concept="3Tm6S6" id="vqDSpatpQc" role="1B3o_S" />
+      <node concept="10P_77" id="vqDSpatsO0" role="1tU5fm" />
+      <node concept="3clFbT" id="vqDSpatM36" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="1GW3SvfSRyG" role="jymVt" />
     <node concept="3clFbW" id="2HzhasNzNH5" role="jymVt">
       <node concept="3Tm1VV" id="2HzhasNzNH6" role="1B3o_S" />
@@ -2627,6 +2633,9 @@
                                 <node concept="1rXfSq" id="vqDSpamscX" role="37wK5m">
                                   <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
                                 </node>
+                                <node concept="1rXfSq" id="vqDSpawNFT" role="37wK5m">
+                                  <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -2866,6 +2875,21 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="vqDSpav5OV" role="3cqZAp">
+          <node concept="2OqwBi" id="vqDSpav5OW" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpav5OX" role="2Oq$k0">
+              <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
+            </node>
+            <node concept="liA8E" id="vqDSpav5OY" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+              <node concept="2ShNRf" id="vqDSpav5OZ" role="37wK5m">
+                <node concept="1pGfFk" id="vqDSpav5P0" role="2ShVmc">
+                  <ref role="37wK5l" node="vqDSpasZXd" resolve="SearchMatchCaseToggleAction" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6ysF3v1j_gs" role="3cqZAp">
           <node concept="2OqwBi" id="6ysF3v1j_gt" role="3clFbG">
             <node concept="37vLTw" id="791RMwCWCHr" role="2Oq$k0">
@@ -3162,6 +3186,9 @@
               <node concept="37vLTw" id="vqDSpalZTU" role="37wK5m">
                 <ref role="3cqZAo" node="vqDSpalrZd" resolve="approximateSearch" />
               </node>
+              <node concept="37vLTw" id="vqDSpawlG2" role="37wK5m">
+                <ref role="3cqZAo" node="vqDSpavYDD" resolve="matchCase" />
+              </node>
               <node concept="2ShNRf" id="7ipIhbo7evk" role="37wK5m">
                 <node concept="YeOm9" id="7ipIhbo7maw" role="2ShVmc">
                   <node concept="1Y3b0j" id="7ipIhbo7maz" role="YeSDq">
@@ -3229,6 +3256,10 @@
         <property role="TrG5h" value="approximateSearch" />
         <node concept="10P_77" id="vqDSpalz7g" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="vqDSpavYDD" role="3clF46">
+        <property role="TrG5h" value="matchCase" />
+        <node concept="10P_77" id="vqDSpaw3gD" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1GW3SvfBplv" role="jymVt" />
     <node concept="3clFb_" id="6wvhQs7njzg" role="jymVt">
@@ -3567,6 +3598,41 @@
         <node concept="10P_77" id="vqDSpagXyG" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="vqDSpatSQj" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpatSQl" role="jymVt">
+      <property role="TrG5h" value="isMatchCase" />
+      <node concept="3clFbS" id="vqDSpatSQm" role="3clF47">
+        <node concept="3clFbF" id="vqDSpatSQn" role="3cqZAp">
+          <node concept="37vLTw" id="vqDSpatSQo" role="3clFbG">
+            <ref role="3cqZAo" node="vqDSpat$qb" resolve="matchCase" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpatSQp" role="1B3o_S" />
+      <node concept="10P_77" id="vqDSpatSQq" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="vqDSpatSQr" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpatSQs" role="jymVt">
+      <property role="TrG5h" value="toggleMatchCase" />
+      <node concept="3clFbS" id="vqDSpatSQt" role="3clF47">
+        <node concept="3clFbF" id="vqDSpatSQu" role="3cqZAp">
+          <node concept="37vLTI" id="vqDSpatSQv" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpatSQw" role="37vLTx">
+              <ref role="3cqZAo" node="vqDSpatSQ$" resolve="flag" />
+            </node>
+            <node concept="37vLTw" id="vqDSpatSQx" role="37vLTJ">
+              <ref role="3cqZAo" node="vqDSpat$qb" resolve="matchCase" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpatSQy" role="1B3o_S" />
+      <node concept="3cqZAl" id="vqDSpatSQz" role="3clF45" />
+      <node concept="37vLTG" id="vqDSpatSQ$" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="vqDSpatSQ_" role="1tU5fm" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="2HzhasNzNJV">
     <property role="3GE5qa" value="search" />
@@ -3793,6 +3859,9 @@
             <node concept="37vLTw" id="vqDSpalbCd" role="37wK5m">
               <ref role="3cqZAo" node="vqDSpal2QP" resolve="approximateSearch" />
             </node>
+            <node concept="37vLTw" id="vqDSpavI2o" role="37wK5m">
+              <ref role="3cqZAo" node="vqDSpavEHM" resolve="matchCase" />
+            </node>
             <node concept="37vLTw" id="vqDSp9RYfZ" role="37wK5m">
               <ref role="3cqZAo" node="7ipIhbnXdOW" resolve="callback" />
             </node>
@@ -3813,6 +3882,10 @@
         <property role="TrG5h" value="approximateSearch" />
         <node concept="10P_77" id="vqDSpal5w7" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="vqDSpavEHM" role="3clF46">
+        <property role="TrG5h" value="matchCase" />
+        <node concept="10P_77" id="vqDSpavGzK" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7ipIhbnXdOW" role="3clF46">
         <property role="TrG5h" value="callback" />
         <node concept="3uibUv" id="7ipIhbnXfIW" role="1tU5fm">
@@ -3825,6 +3898,30 @@
       <property role="TrG5h" value="searchModels" />
       <node concept="3Tm6S6" id="4Q2Vz3iAO9M" role="1B3o_S" />
       <node concept="3clFbS" id="4Q2Vz3i$q41" role="3clF47">
+        <node concept="3cpWs8" id="vqDSpavrgF" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpavrgI" role="3cpWs9">
+            <property role="TrG5h" value="textToSearch" />
+            <property role="3TUv4t" value="true" />
+            <node concept="17QB3L" id="vqDSpavrgD" role="1tU5fm" />
+            <node concept="3K4zz7" id="vqDSpawYiy" role="33vP2m">
+              <node concept="37vLTw" id="vqDSpawZtA" role="3K4E3e">
+                <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+              </node>
+              <node concept="2OqwBi" id="vqDSpax4xL" role="3K4GZi">
+                <node concept="37vLTw" id="vqDSpax1Qz" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                </node>
+                <node concept="liA8E" id="vqDSpax7Mr" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.toLowerCase()" resolve="toLowerCase" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="vqDSpawUFw" role="3K4Cdx">
+                <ref role="3cqZAo" node="vqDSpav_e_" resolve="matchCase" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="vqDSpaxb57" role="3cqZAp" />
         <node concept="3clFbF" id="4Q2Vz3i$q4a" role="3cqZAp">
           <node concept="2OqwBi" id="4Q2Vz3i$q4b" role="3clFbG">
             <node concept="2YIFZM" id="4Q2Vz3i$q4c" role="2Oq$k0">
@@ -4289,7 +4386,7 @@
                                               <node concept="2qgKlT" id="7DRyZmEC7tF" role="2OqNvi">
                                                 <ref role="37wK5l" to="hwgx:jpyKDg1onB" resolve="containsText" />
                                                 <node concept="37vLTw" id="7DRyZmEC7tG" role="37wK5m">
-                                                  <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                  <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
                                                 </node>
                                               </node>
                                             </node>
@@ -4331,6 +4428,52 @@
                                               <node concept="3clFbT" id="vqDSpaoqHO" role="33vP2m" />
                                             </node>
                                           </node>
+                                          <node concept="3cpWs8" id="vqDSpaxuw2" role="3cqZAp">
+                                            <node concept="3cpWsn" id="vqDSpaxuw5" role="3cpWs9">
+                                              <property role="TrG5h" value="name" />
+                                              <node concept="17QB3L" id="vqDSpaxuw0" role="1tU5fm" />
+                                              <node concept="2OqwBi" id="vqDSpaxWf5" role="33vP2m">
+                                                <node concept="37vLTw" id="vqDSpaxUz0" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
+                                                </node>
+                                                <node concept="3TrcHB" id="vqDSpaxYJG" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbJ" id="vqDSpaz3qP" role="3cqZAp">
+                                            <node concept="3clFbS" id="vqDSpaz3qR" role="3clFbx">
+                                              <node concept="3clFbF" id="vqDSpazczd" role="3cqZAp">
+                                                <node concept="37vLTI" id="vqDSpazi3M" role="3clFbG">
+                                                  <node concept="2OqwBi" id="vqDSpazqpt" role="37vLTx">
+                                                    <node concept="37vLTw" id="vqDSpazm29" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
+                                                    </node>
+                                                    <node concept="liA8E" id="vqDSpazu30" role="2OqNvi">
+                                                      <ref role="37wK5l" to="wyt6:~String.toLowerCase()" resolve="toLowerCase" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="37vLTw" id="vqDSpazczb" role="37vLTJ">
+                                                    <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="1Wc70l" id="vqDSpazwKR" role="3clFbw">
+                                              <node concept="3y3z36" id="vqDSpazBRN" role="3uHU7w">
+                                                <node concept="10Nm6u" id="vqDSpazG0X" role="3uHU7w" />
+                                                <node concept="37vLTw" id="vqDSpazysa" role="3uHU7B">
+                                                  <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
+                                                </node>
+                                              </node>
+                                              <node concept="3fqX7Q" id="vqDSpaz58q" role="3uHU7B">
+                                                <node concept="37vLTw" id="vqDSpaz7Zn" role="3fr31v">
+                                                  <ref role="3cqZAo" node="vqDSpav_e_" resolve="matchCase" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
                                           <node concept="3clFbJ" id="vqDSpaov7O" role="3cqZAp">
                                             <node concept="3clFbS" id="vqDSpaov7Q" role="3clFbx">
                                               <node concept="3clFbJ" id="vqDSpal0By" role="3cqZAp">
@@ -4347,16 +4490,11 @@
                                                         <node concept="2YIFZM" id="vqDSpapoBC" role="3uHU7B">
                                                           <ref role="37wK5l" node="vqDSpaiUHg" resolve="compute" />
                                                           <ref role="1Pybhc" node="vqDSpaiUeD" resolve="LevenshteinDistance" />
-                                                          <node concept="2OqwBi" id="vqDSpapoBD" role="37wK5m">
-                                                            <node concept="37vLTw" id="vqDSpapoBE" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                                            </node>
-                                                            <node concept="3TrcHB" id="vqDSpapoBF" role="2OqNvi">
-                                                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                            </node>
+                                                          <node concept="37vLTw" id="vqDSpayqAj" role="37wK5m">
+                                                            <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
                                                           </node>
                                                           <node concept="37vLTw" id="vqDSpapoBG" role="37wK5m">
-                                                            <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                            <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
                                                           </node>
                                                         </node>
                                                       </node>
@@ -4374,18 +4512,13 @@
                                                           <ref role="3cqZAo" node="vqDSpakMW9" resolve="matches" />
                                                         </node>
                                                         <node concept="2OqwBi" id="vqDSpapr4_" role="37vLTx">
-                                                          <node concept="2OqwBi" id="vqDSpapr4A" role="2Oq$k0">
-                                                            <node concept="37vLTw" id="vqDSpapr4B" role="2Oq$k0">
-                                                              <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                                            </node>
-                                                            <node concept="3TrcHB" id="vqDSpapr4C" role="2OqNvi">
-                                                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                            </node>
+                                                          <node concept="37vLTw" id="vqDSpaytap" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
                                                           </node>
                                                           <node concept="liA8E" id="vqDSpapr4D" role="2OqNvi">
                                                             <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
                                                             <node concept="37vLTw" id="vqDSpapr4E" role="37wK5m">
-                                                              <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                              <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
                                                             </node>
                                                           </node>
                                                         </node>
@@ -4396,15 +4529,10 @@
                                               </node>
                                             </node>
                                             <node concept="3y3z36" id="vqDSpakRVO" role="3clFbw">
-                                              <node concept="2OqwBi" id="vqDSpakRVP" role="3uHU7B">
-                                                <node concept="37vLTw" id="vqDSpakRVQ" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
-                                                </node>
-                                                <node concept="3TrcHB" id="vqDSpakRVR" role="2OqNvi">
-                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                </node>
-                                              </node>
                                               <node concept="10Nm6u" id="vqDSpakRVS" role="3uHU7w" />
+                                              <node concept="37vLTw" id="vqDSpaylES" role="3uHU7B">
+                                                <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
+                                              </node>
                                             </node>
                                           </node>
                                           <node concept="3clFbJ" id="7DRyZmECiBx" role="3cqZAp">
@@ -4703,6 +4831,38 @@
                                                   </node>
                                                 </node>
                                               </node>
+                                              <node concept="3clFbJ" id="vqDSpayysN" role="3cqZAp">
+                                                <node concept="3clFbS" id="vqDSpayysP" role="3clFbx">
+                                                  <node concept="3clFbF" id="vqDSpayFyW" role="3cqZAp">
+                                                    <node concept="37vLTI" id="vqDSpayLor" role="3clFbG">
+                                                      <node concept="2OqwBi" id="vqDSpaySjW" role="37vLTx">
+                                                        <node concept="37vLTw" id="vqDSpayPqn" role="2Oq$k0">
+                                                          <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                        </node>
+                                                        <node concept="liA8E" id="vqDSpayUKe" role="2OqNvi">
+                                                          <ref role="37wK5l" to="wyt6:~String.toLowerCase()" resolve="toLowerCase" />
+                                                        </node>
+                                                      </node>
+                                                      <node concept="37vLTw" id="vqDSpayFyU" role="37vLTJ">
+                                                        <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="1Wc70l" id="vqDSpazJZL" role="3clFbw">
+                                                  <node concept="3y3z36" id="vqDSpazQGU" role="3uHU7w">
+                                                    <node concept="10Nm6u" id="vqDSpazV9B" role="3uHU7w" />
+                                                    <node concept="37vLTw" id="vqDSpazMTJ" role="3uHU7B">
+                                                      <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3fqX7Q" id="vqDSpayBQ6" role="3uHU7B">
+                                                    <node concept="37vLTw" id="vqDSpayBQ8" role="3fr31v">
+                                                      <ref role="3cqZAo" node="vqDSpav_e_" resolve="matchCase" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
                                             </node>
                                           </node>
                                           <node concept="3clFbJ" id="7DRyZmExiht" role="3cqZAp">
@@ -4728,7 +4888,7 @@
                                                             <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
                                                           </node>
                                                           <node concept="37vLTw" id="vqDSpapA7d" role="37wK5m">
-                                                            <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                            <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
                                                           </node>
                                                         </node>
                                                       </node>
@@ -4755,7 +4915,7 @@
                                                           <node concept="liA8E" id="vqDSpapT1E" role="2OqNvi">
                                                             <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
                                                             <node concept="37vLTw" id="vqDSpapT1F" role="37wK5m">
-                                                              <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                                              <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
                                                             </node>
                                                           </node>
                                                         </node>
@@ -5108,7 +5268,6 @@
       </node>
       <node concept="37vLTG" id="4Q2Vz3i$q7V" role="3clF46">
         <property role="TrG5h" value="text" />
-        <property role="3TUv4t" value="true" />
         <node concept="17QB3L" id="4Q2Vz3i$q7W" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="7DRyZmDozcG" role="3clF46">
@@ -5121,6 +5280,11 @@
         <property role="3TUv4t" value="true" />
         <node concept="10P_77" id="vqDSpal5Zd" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="vqDSpav_e_" role="3clF46">
+        <property role="TrG5h" value="matchCase" />
+        <property role="3TUv4t" value="true" />
+        <node concept="10P_77" id="vqDSpavB4z" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7ipIhbo0$sq" role="3clF46">
         <property role="TrG5h" value="callback" />
         <property role="3TUv4t" value="true" />
@@ -22601,6 +22765,14 @@
                   <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
                 </node>
               </node>
+              <node concept="2OqwBi" id="vqDSpawxJY" role="37wK5m">
+                <node concept="37vLTw" id="vqDSpawvuc" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="vqDSpaw$zs" role="2OqNvi">
+                  <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -23503,5 +23675,163 @@
     </node>
     <node concept="3Tm1VV" id="vqDSpaiUeE" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="vqDSpasZXa">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchMatchCaseToggleAction" />
+    <node concept="2tJIrI" id="vqDSpasZXb" role="jymVt" />
+    <node concept="2tJIrI" id="vqDSpasZXc" role="jymVt" />
+    <node concept="3clFbW" id="vqDSpasZXd" role="jymVt">
+      <node concept="3cqZAl" id="vqDSpasZXe" role="3clF45" />
+      <node concept="3clFbS" id="vqDSpasZXf" role="3clF47">
+        <node concept="XkiVB" id="vqDSpasZXg" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="ToggleAction" />
+          <node concept="Xl_RD" id="vqDSpasZXh" role="37wK5m">
+            <property role="Xl_RC" value="Match Case" />
+          </node>
+          <node concept="Xl_RD" id="vqDSpasZXk" role="37wK5m">
+            <property role="Xl_RC" value="Match the case when searching" />
+          </node>
+          <node concept="10M0yZ" id="vqDSpauXFb" role="37wK5m">
+            <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.MatchCase" resolve="MatchCase" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="vqDSpasZXm" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="vqDSpasZXn" role="jymVt" />
+    <node concept="3Tm1VV" id="vqDSpasZXo" role="1B3o_S" />
+    <node concept="3uibUv" id="vqDSpasZXp" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+    </node>
+    <node concept="3clFb_" id="vqDSpasZXq" role="jymVt">
+      <property role="TrG5h" value="isSelected" />
+      <node concept="3Tm1VV" id="vqDSpasZXr" role="1B3o_S" />
+      <node concept="10P_77" id="vqDSpasZXs" role="3clF45" />
+      <node concept="37vLTG" id="vqDSpasZXt" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="vqDSpasZXu" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="vqDSpasZXv" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="vqDSpasZXw" role="3clF47">
+        <node concept="3cpWs8" id="vqDSpasZXx" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpasZXy" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="vqDSpasZXz" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="vqDSpasZX$" role="33vP2m">
+              <node concept="3uibUv" id="vqDSpasZX_" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="vqDSpasZXA" role="10QFUP">
+                <node concept="2EnYce" id="vqDSpasZXB" role="2Oq$k0">
+                  <node concept="2OqwBi" id="vqDSpasZXC" role="2Oq$k0">
+                    <node concept="37vLTw" id="vqDSpasZXD" role="2Oq$k0">
+                      <ref role="3cqZAo" node="vqDSpasZXt" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="vqDSpasZXE" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="vqDSpasZXF" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="vqDSpasZXG" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpasZXH" role="3cqZAp">
+          <node concept="2EnYce" id="vqDSpasZXI" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpasZXJ" role="2Oq$k0">
+              <ref role="3cqZAo" node="vqDSpasZXy" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="vqDSpasZXK" role="2OqNvi">
+              <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="vqDSpasZXL" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="vqDSpasZXM" role="jymVt" />
+    <node concept="3clFb_" id="vqDSpasZXN" role="jymVt">
+      <property role="TrG5h" value="setSelected" />
+      <node concept="3Tm1VV" id="vqDSpasZXO" role="1B3o_S" />
+      <node concept="3cqZAl" id="vqDSpasZXP" role="3clF45" />
+      <node concept="37vLTG" id="vqDSpasZXQ" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="vqDSpasZXR" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="vqDSpasZXS" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="vqDSpasZXT" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="vqDSpasZXU" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="vqDSpasZXV" role="3clF47">
+        <node concept="3cpWs8" id="vqDSpasZXW" role="3cqZAp">
+          <node concept="3cpWsn" id="vqDSpasZXX" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="vqDSpasZXY" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="vqDSpasZXZ" role="33vP2m">
+              <node concept="3uibUv" id="vqDSpasZY0" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="vqDSpasZY1" role="10QFUP">
+                <node concept="2EnYce" id="vqDSpasZY2" role="2Oq$k0">
+                  <node concept="2EnYce" id="vqDSpasZY3" role="2Oq$k0">
+                    <node concept="37vLTw" id="vqDSpasZY4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="vqDSpasZXQ" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="vqDSpasZY5" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="vqDSpasZY6" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="vqDSpasZY7" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="vqDSpasZY8" role="3cqZAp">
+          <node concept="2EnYce" id="vqDSpasZY9" role="3clFbG">
+            <node concept="37vLTw" id="vqDSpasZYa" role="2Oq$k0">
+              <ref role="3cqZAo" node="vqDSpasZXX" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="vqDSpasZYb" role="2OqNvi">
+              <ref role="37wK5l" node="vqDSpatSQs" resolve="toggleMatchCase" />
+              <node concept="37vLTw" id="vqDSpasZYc" role="37wK5m">
+                <ref role="3cqZAo" node="vqDSpasZXT" resolve="flag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="vqDSpasZYd" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+  </node>
 </model>
 

From eb686fa522ed6a550c19d39b921a022199b436ed Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 22:46:04 +0100
Subject: [PATCH 13/38] core.base: propertly update the search tool model

---
 .../core/base/pluginSolution/plugin.mps       | 125 +++++++++++++-----
 1 file changed, 94 insertions(+), 31 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 339ae764734..61b17396742 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3069,6 +3069,42 @@
           </node>
         </node>
         <node concept="3clFbH" id="4EP4zG72nTb" role="3cqZAp" />
+        <node concept="3cpWs8" id="3wUOPyJMKpH" role="3cqZAp">
+          <node concept="3cpWsn" id="3wUOPyJMKpI" role="3cpWs9">
+            <property role="TrG5h" value="model" />
+            <node concept="3uibUv" id="3wUOPyJMzkK" role="1tU5fm">
+              <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+            </node>
+            <node concept="2ShNRf" id="3wUOPyJMKpJ" role="33vP2m">
+              <node concept="1pGfFk" id="3wUOPyJMKpK" role="2ShVmc">
+                <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
+                <node concept="2OqwBi" id="3wUOPyJMKpL" role="37wK5m">
+                  <node concept="2OqwBi" id="3wUOPyJMKpM" role="2Oq$k0">
+                    <node concept="Xjq3P" id="3wUOPyJMKpN" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="3wUOPyJMKpO" role="2OqNvi">
+                      <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3wUOPyJMKpP" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="3wUOPyJMKpQ" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3wUOPyJMV3P" role="3cqZAp">
+          <node concept="2OqwBi" id="3wUOPyJMV3Q" role="3clFbG">
+            <node concept="liA8E" id="3wUOPyJMV3R" role="2OqNvi">
+              <ref role="37wK5l" to="c8ee:~AbstractTableModel.fireTableDataChanged()" resolve="fireTableDataChanged" />
+            </node>
+            <node concept="37vLTw" id="3wUOPyJMV3S" role="2Oq$k0">
+              <ref role="3cqZAo" node="3wUOPyJMKpI" resolve="model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3wUOPyJMU_d" role="3cqZAp" />
         <node concept="3clFbF" id="2Gn1WTgOnVb" role="3cqZAp">
           <node concept="2OqwBi" id="2Gn1WTgOnVc" role="3clFbG">
             <node concept="2OqwBi" id="2Gn1WTgOnVd" role="2Oq$k0">
@@ -3079,22 +3115,8 @@
             </node>
             <node concept="liA8E" id="2Gn1WTgOnVg" role="2OqNvi">
               <ref role="37wK5l" to="3pb2:~JBTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
-              <node concept="2ShNRf" id="2Gn1WTgOnVh" role="37wK5m">
-                <node concept="1pGfFk" id="2Gn1WTgOnVi" role="2ShVmc">
-                  <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
-                  <node concept="2OqwBi" id="1GW3SvfBbMr" role="37wK5m">
-                    <node concept="2OqwBi" id="1GW3SvfAZNn" role="2Oq$k0">
-                      <node concept="Xjq3P" id="1GW3SvfARdM" role="2Oq$k0" />
-                      <node concept="2OwXpG" id="1GW3SvfB3Ef" role="2OqNvi">
-                        <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="1GW3SvfBg$C" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                    </node>
-                  </node>
-                  <node concept="10Nm6u" id="2Gn1WTgOnVj" role="37wK5m" />
-                </node>
+              <node concept="37vLTw" id="3wUOPyJMKpR" role="37wK5m">
+                <ref role="3cqZAo" node="3wUOPyJMKpI" resolve="model" />
               </node>
             </node>
           </node>
@@ -3108,7 +3130,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2Gn1WTgOnVq" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.invalidate()" resolve="invalidate" />
+              <ref role="37wK5l" to="dxuu:~JComponent.revalidate()" resolve="revalidate" />
             </node>
           </node>
         </node>
@@ -3121,7 +3143,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2Gn1WTgOnVw" role="2OqNvi">
-              <ref role="37wK5l" to="3pb2:~JBTable.updateUI()" resolve="updateUI" />
+              <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
             </node>
           </node>
         </node>
@@ -3210,32 +3232,73 @@
                         </node>
                       </node>
                       <node concept="3clFbS" id="7ipIhbo7mb4" role="3clF47">
-                        <node concept="3clFbF" id="6wvhQs7njzN" role="3cqZAp">
-                          <node concept="3P9mCS" id="6wvhQs7njzO" role="3clFbG">
-                            <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
-                            <node concept="2ShNRf" id="jpyKDg2tIH" role="37wK5m">
-                              <node concept="1pGfFk" id="jpyKDg2tII" role="2ShVmc">
+                        <node concept="3cpWs8" id="3wUOPyJLoRt" role="3cqZAp">
+                          <node concept="3cpWsn" id="3wUOPyJLoRu" role="3cpWs9">
+                            <property role="TrG5h" value="model" />
+                            <node concept="3uibUv" id="3wUOPyJL49G" role="1tU5fm">
+                              <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+                            </node>
+                            <node concept="2ShNRf" id="3wUOPyJLoRv" role="33vP2m">
+                              <node concept="1pGfFk" id="3wUOPyJLoRw" role="2ShVmc">
                                 <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
-                                <node concept="2OqwBi" id="1GW3SvfBjDL" role="37wK5m">
-                                  <node concept="2OqwBi" id="1GW3SvfBjDM" role="2Oq$k0">
-                                    <node concept="Xjq3P" id="1GW3SvfBjDN" role="2Oq$k0">
+                                <node concept="2OqwBi" id="3wUOPyJLoRx" role="37wK5m">
+                                  <node concept="2OqwBi" id="3wUOPyJLoRy" role="2Oq$k0">
+                                    <node concept="Xjq3P" id="3wUOPyJLoRz" role="2Oq$k0">
                                       <ref role="1HBi2w" node="2HzhasNzNEW" resolve="SearchViewer" />
                                     </node>
-                                    <node concept="2OwXpG" id="1GW3SvfBjDO" role="2OqNvi">
+                                    <node concept="2OwXpG" id="3wUOPyJLoR$" role="2OqNvi">
                                       <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="1GW3SvfBjDP" role="2OqNvi">
+                                  <node concept="liA8E" id="3wUOPyJLoR_" role="2OqNvi">
                                     <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                   </node>
                                 </node>
-                                <node concept="37vLTw" id="5Hxjapwgwuz" role="37wK5m">
+                                <node concept="37vLTw" id="3wUOPyJLoRA" role="37wK5m">
                                   <ref role="3cqZAo" node="7ipIhbo7mb1" resolve="results" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbF" id="6wvhQs7njzN" role="3cqZAp">
+                          <node concept="3P9mCS" id="6wvhQs7njzO" role="3clFbG">
+                            <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
+                            <node concept="37vLTw" id="3wUOPyJLoRB" role="37wK5m">
+                              <ref role="3cqZAo" node="3wUOPyJLoRu" resolve="model" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="3wUOPyJLBHw" role="3cqZAp">
+                          <node concept="2OqwBi" id="3wUOPyJLPKX" role="3clFbG">
+                            <node concept="liA8E" id="3wUOPyJLWRP" role="2OqNvi">
+                              <ref role="37wK5l" to="c8ee:~AbstractTableModel.fireTableDataChanged()" resolve="fireTableDataChanged" />
+                            </node>
+                            <node concept="37vLTw" id="3wUOPyJMySg" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3wUOPyJLoRu" resolve="model" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="3wUOPyJJlks" role="3cqZAp">
+                          <node concept="2OqwBi" id="3wUOPyJJlkt" role="3clFbG">
+                            <node concept="liA8E" id="3wUOPyJJlkx" role="2OqNvi">
+                              <ref role="37wK5l" to="dxuu:~JComponent.revalidate()" resolve="revalidate" />
+                            </node>
+                            <node concept="37vLTw" id="3wUOPyJJMG2" role="2Oq$k0">
+                              <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="3wUOPyJJloK" role="3cqZAp">
+                          <node concept="2OqwBi" id="3wUOPyJJloL" role="3clFbG">
+                            <node concept="liA8E" id="3wUOPyJJloP" role="2OqNvi">
+                              <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
+                            </node>
+                            <node concept="37vLTw" id="3wUOPyJK2e_" role="2Oq$k0">
+                              <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                       <node concept="2AHcQZ" id="7ipIhbo7mb6" role="2AJF6D">
                         <ref role="2AI5Lk" to="wyt6:~Override" />
@@ -6109,8 +6172,8 @@
         <node concept="10Oyi0" id="5jGyeU5X$Pk" role="1tU5fm" />
       </node>
     </node>
-    <node concept="3uibUv" id="5jGyeU5Xznt" role="EKbjA">
-      <ref role="3uigEE" to="c8ee:~TableModel" resolve="TableModel" />
+    <node concept="3uibUv" id="3wUOPyJMceC" role="1zkMxy">
+      <ref role="3uigEE" to="c8ee:~AbstractTableModel" resolve="AbstractTableModel" />
     </node>
   </node>
   <node concept="Zd50a" id="60jO6Ca_l5b">

From 763b074c1d7b53bff5fcec5dd7de2df8dc4e1981 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 23:21:32 +0100
Subject: [PATCH 14/38] core.base: update the search window title on the EDT
 thread

---
 .../core/base/pluginSolution/plugin.mps       | 164 ++++++++++++++----
 1 file changed, 128 insertions(+), 36 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 61b17396742..9b26f109b08 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2127,6 +2127,37 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2AcrvuoLhOy" role="3cqZAp">
+          <node concept="2OqwBi" id="2AcrvuoLhOz" role="3clFbG">
+            <node concept="2YIFZM" id="2AcrvuoLhO$" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
+            </node>
+            <node concept="liA8E" id="2AcrvuoLhO_" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="2AcrvuoLhOA" role="37wK5m">
+                <node concept="3clFbS" id="2AcrvuoLhOB" role="1bW5cS">
+                  <node concept="3clFbF" id="2AcrvuoLhOC" role="3cqZAp">
+                    <node concept="2OqwBi" id="2AcrvuoLhOD" role="3clFbG">
+                      <node concept="liA8E" id="2AcrvuoLhOF" role="2OqNvi">
+                        <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
+                        <node concept="Xl_RD" id="2AcrvuoLhOG" role="37wK5m">
+                          <property role="Xl_RC" value="global" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="2AcrvuoLiN9" role="2Oq$k0">
+                        <node concept="2WthIp" id="2AcrvuoLiNa" role="2Oq$k0" />
+                        <node concept="liA8E" id="2AcrvuoLiNb" role="2OqNvi">
+                          <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="vqDSpa7807" role="1B3o_S" />
     </node>
@@ -2147,6 +2178,37 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2AcrvuoKfX3" role="3cqZAp">
+          <node concept="2OqwBi" id="2AcrvuoKgMr" role="3clFbG">
+            <node concept="2YIFZM" id="2AcrvuoKg8d" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
+            </node>
+            <node concept="liA8E" id="2AcrvuoKhsB" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="2AcrvuoKhzw" role="37wK5m">
+                <node concept="3clFbS" id="2AcrvuoKhzz" role="1bW5cS">
+                  <node concept="3clFbF" id="2AcrvuoGWD1" role="3cqZAp">
+                    <node concept="2OqwBi" id="2AcrvuoGX5y" role="3clFbG">
+                      <node concept="liA8E" id="2AcrvuoGXBx" role="2OqNvi">
+                        <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
+                        <node concept="Xl_RD" id="2AcrvuoGXHM" role="37wK5m">
+                          <property role="Xl_RC" value="project" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="2AcrvuoGW3K" role="2Oq$k0">
+                        <node concept="2WthIp" id="2AcrvuoGW3L" role="2Oq$k0" />
+                        <node concept="liA8E" id="2AcrvuoGW3M" role="2OqNvi">
+                          <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="6KjVnJoXqPg" role="1B3o_S" />
     </node>
@@ -2170,25 +2232,40 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2HzhasN$8Yo" role="3cqZAp">
-          <node concept="2OqwBi" id="2HzhasN$8Zj" role="3clFbG">
-            <node concept="2OqwBi" id="2HzhasN$8YE" role="2Oq$k0">
-              <node concept="2WthIp" id="2HzhasN$8Yp" role="2Oq$k0" />
-              <node concept="liA8E" id="2HzhasN$8Z2" role="2OqNvi">
-                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
-              </node>
+        <node concept="3clFbF" id="2AcrvuoI7lv" role="3cqZAp">
+          <node concept="2OqwBi" id="2AcrvuoI8F8" role="3clFbG">
+            <node concept="2YIFZM" id="2AcrvuoI7KB" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="liA8E" id="2HzhasN$8Zp" role="2OqNvi">
-              <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
-              <node concept="3cpWs3" id="4Q2Vz3iBgJB" role="37wK5m">
-                <node concept="Xl_RD" id="4Q2Vz3iBgJF" role="3uHU7B">
-                  <property role="Xl_RC" value=" model " />
-                </node>
-                <node concept="2OqwBi" id="2HzhasN$8ZZ" role="3uHU7w">
-                  <node concept="37vLTw" id="2HzhasN$8ZI" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2HzhasNzPxo" resolve="m" />
+            <node concept="liA8E" id="2AcrvuoI9lq" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="2AcrvuoI9rR" role="37wK5m">
+                <node concept="3clFbS" id="2AcrvuoI9rU" role="1bW5cS">
+                  <node concept="3clFbF" id="2HzhasN$8Yo" role="3cqZAp">
+                    <node concept="2OqwBi" id="2HzhasN$8Zj" role="3clFbG">
+                      <node concept="liA8E" id="2HzhasN$8Zp" role="2OqNvi">
+                        <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
+                        <node concept="3cpWs3" id="4Q2Vz3iBgJB" role="37wK5m">
+                          <node concept="Xl_RD" id="4Q2Vz3iBgJF" role="3uHU7B">
+                            <property role="Xl_RC" value="model " />
+                          </node>
+                          <node concept="2OqwBi" id="2HzhasN$8ZZ" role="3uHU7w">
+                            <node concept="37vLTw" id="2HzhasN$8ZI" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2HzhasNzPxo" resolve="m" />
+                            </node>
+                            <node concept="LkI2h" id="2HzhasN$905" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="2AcrvuoGV1E" role="2Oq$k0">
+                        <node concept="2WthIp" id="2AcrvuoGV1F" role="2Oq$k0" />
+                        <node concept="liA8E" id="2AcrvuoGV1G" role="2OqNvi">
+                          <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="LkI2h" id="2HzhasN$905" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -2221,26 +2298,41 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2Gn1WTgMSe8" role="3cqZAp">
-          <node concept="2OqwBi" id="2Gn1WTgMSe9" role="3clFbG">
-            <node concept="2OqwBi" id="2Gn1WTgMSea" role="2Oq$k0">
-              <node concept="2WthIp" id="2Gn1WTgMSeb" role="2Oq$k0" />
-              <node concept="liA8E" id="2Gn1WTgMSec" role="2OqNvi">
-                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
-              </node>
+        <node concept="3clFbF" id="2AcrvuoKcCo" role="3cqZAp">
+          <node concept="2OqwBi" id="2AcrvuoKdLV" role="3clFbG">
+            <node concept="2YIFZM" id="2AcrvuoKd3C" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="liA8E" id="2Gn1WTgMSed" role="2OqNvi">
-              <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
-              <node concept="3cpWs3" id="2Gn1WTgMSee" role="37wK5m">
-                <node concept="Xl_RD" id="2Gn1WTgMSef" role="3uHU7B">
-                  <property role="Xl_RC" value=" solution " />
-                </node>
-                <node concept="2OqwBi" id="2Gn1WTgPlUK" role="3uHU7w">
-                  <node concept="37vLTw" id="2Gn1WTgPlO3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
-                  </node>
-                  <node concept="liA8E" id="2Gn1WTgPnEc" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
+            <node concept="liA8E" id="2AcrvuoKesi" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="2AcrvuoKez5" role="37wK5m">
+                <node concept="3clFbS" id="2AcrvuoKez8" role="1bW5cS">
+                  <node concept="3clFbF" id="2Gn1WTgMSe8" role="3cqZAp">
+                    <node concept="2OqwBi" id="2Gn1WTgMSe9" role="3clFbG">
+                      <node concept="liA8E" id="2Gn1WTgMSed" role="2OqNvi">
+                        <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
+                        <node concept="3cpWs3" id="2Gn1WTgMSee" role="37wK5m">
+                          <node concept="Xl_RD" id="2Gn1WTgMSef" role="3uHU7B">
+                            <property role="Xl_RC" value="solution " />
+                          </node>
+                          <node concept="2OqwBi" id="2Gn1WTgPlUK" role="3uHU7w">
+                            <node concept="37vLTw" id="2Gn1WTgPlO3" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
+                            </node>
+                            <node concept="liA8E" id="2Gn1WTgPnEc" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="2AcrvuoKfrz" role="2Oq$k0">
+                        <node concept="2WthIp" id="2AcrvuoKfr$" role="2Oq$k0" />
+                        <node concept="liA8E" id="2AcrvuoKfr_" role="2OqNvi">
+                          <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>

From 204e2e72f589f1b2824d4514ae4d860da9d4a7f8 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 23:31:01 +0100
Subject: [PATCH 15/38] update the readme

---
 CHANGELOG.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 860e642068c..e05f04f43ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 # December 2024
 
+## com.mbeddr.core.base
+
+### Changed
+
+- The mbeddr search tool was improved: It can now also search the project and globally. It also got options for approximate searching with an error distance, and matching the case. The UI was also improved.
+
 ## com.mbeddr.mpsutil
 
 ### Fixed
@@ -17,7 +23,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ## com.mbeddr.mpsutil
 
-### Feature
+### Added
 
 - A new language `com.mbeddr.mpsutil.collections` was added that adds support for a set type `nset` that use nodes as the values of the set. Equivalence of nodes is checked structurally. The hash code calculation is done for all properties and children and the first level of references. The runtime solution also contains a more general class `EquivalenceHashSet` to implement hashsets with arbitrary `equals` and `hashcode` methods.
 
@@ -45,7 +51,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ## com.mbeddr.mpsutil.interpreter
 
-### Feature
+### Added
 
 - Added user defineable call back function when trace node is added to the trace tree
 
@@ -63,7 +69,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ## com.mbeddr.mpsutil.checkinHandler
 
-### Feature
+### Added
 
 - A new kind of Checkin handlers (background handler) now support the interface `CommitCheck` which allows more options like running the code after the commit or in the background.
 

From f10d2d94452b8be5a6bbfee595c057e8810bc417 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 10 Dec 2024 23:42:29 +0100
Subject: [PATCH 16/38] update the build script

---
 .../com.mbeddr.platform/models/com/mbeddr/platform/build.mps | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index dab70c29fad..4aad44f7fb9 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -15178,6 +15178,11 @@
             <ref role="3bR37D" to="90a9:4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1dH515xDROo" role="3bR37C">
+          <node concept="3bR9La" id="1dH515xDROp" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="$bJ0jguQfr" role="2G$12L">
         <property role="BnDLt" value="true" />

From 24833d0b2af9e87319984735285ed3fc700fefdc Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 11 Dec 2024 00:16:09 +0100
Subject: [PATCH 17/38] core.base: force the search tool to open at the bottom

---
 .../core/base/pluginSolution/plugin.mps       | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 9b26f109b08..fcbd8ec0155 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3838,6 +3838,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="3K9FTCmK7XR" role="3cqZAp">
+          <node concept="2OqwBi" id="3K9FTCmK7XS" role="3clFbG">
+            <node concept="2OqwBi" id="3K9FTCmK7XT" role="2Oq$k0">
+              <node concept="37vLTw" id="3K9FTCmK7XU" role="2Oq$k0">
+                <ref role="3cqZAo" node="2HzhasNzNK6" resolve="searchViewer" />
+              </node>
+              <node concept="liA8E" id="3K9FTCmK7XV" role="2OqNvi">
+                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3K9FTCmK7XW" role="2OqNvi">
+              <ref role="37wK5l" to="jkny:~ToolWindow.setAnchor(com.intellij.openapi.wm.ToolWindowAnchor,java.lang.Runnable)" resolve="setAnchor" />
+              <node concept="10M0yZ" id="3K9FTCmK7XX" role="37wK5m">
+                <ref role="3cqZAo" to="jkny:~ToolWindowAnchor.BOTTOM" resolve="BOTTOM" />
+                <ref role="1PxDUh" to="jkny:~ToolWindowAnchor" resolve="ToolWindowAnchor" />
+              </node>
+              <node concept="10Nm6u" id="3K9FTCmK7XY" role="37wK5m" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="2HzhasNzNKd" role="3cqZAp">
           <node concept="2OqwBi" id="2HzhasNzNKe" role="3clFbG">
             <node concept="37vLTw" id="2HzhasNzNKf" role="2Oq$k0">
@@ -12905,6 +12925,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="3K9FTCmK8RN" role="3cqZAp">
+          <node concept="2OqwBi" id="3K9FTCmK8RO" role="3clFbG">
+            <node concept="2OqwBi" id="3K9FTCmK8RP" role="2Oq$k0">
+              <node concept="37vLTw" id="3K9FTCmK8RQ" role="2Oq$k0">
+                <ref role="3cqZAo" node="2Gn1WTgS$If" resolve="searchViewer" />
+              </node>
+              <node concept="liA8E" id="3K9FTCmK8RR" role="2OqNvi">
+                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3K9FTCmK8RS" role="2OqNvi">
+              <ref role="37wK5l" to="jkny:~ToolWindow.setAnchor(com.intellij.openapi.wm.ToolWindowAnchor,java.lang.Runnable)" resolve="setAnchor" />
+              <node concept="10M0yZ" id="3K9FTCmK8RT" role="37wK5m">
+                <ref role="3cqZAo" to="jkny:~ToolWindowAnchor.BOTTOM" resolve="BOTTOM" />
+                <ref role="1PxDUh" to="jkny:~ToolWindowAnchor" resolve="ToolWindowAnchor" />
+              </node>
+              <node concept="10Nm6u" id="3K9FTCmK8RU" role="37wK5m" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="2Gn1WTgS$Im" role="3cqZAp">
           <node concept="2OqwBi" id="2Gn1WTgS$In" role="3clFbG">
             <node concept="37vLTw" id="2Gn1WTgS$Io" role="2Oq$k0">
@@ -23141,6 +23181,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="3K9FTCmK8hs" role="3cqZAp">
+          <node concept="2OqwBi" id="3K9FTCmK8ht" role="3clFbG">
+            <node concept="2OqwBi" id="3K9FTCmK8hu" role="2Oq$k0">
+              <node concept="37vLTw" id="3K9FTCmK8hv" role="2Oq$k0">
+                <ref role="3cqZAo" node="6KjVnJoX4FB" resolve="searchViewer" />
+              </node>
+              <node concept="liA8E" id="3K9FTCmK8hw" role="2OqNvi">
+                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3K9FTCmK8hx" role="2OqNvi">
+              <ref role="37wK5l" to="jkny:~ToolWindow.setAnchor(com.intellij.openapi.wm.ToolWindowAnchor,java.lang.Runnable)" resolve="setAnchor" />
+              <node concept="10M0yZ" id="3K9FTCmK8hy" role="37wK5m">
+                <ref role="3cqZAo" to="jkny:~ToolWindowAnchor.BOTTOM" resolve="BOTTOM" />
+                <ref role="1PxDUh" to="jkny:~ToolWindowAnchor" resolve="ToolWindowAnchor" />
+              </node>
+              <node concept="10Nm6u" id="3K9FTCmK8hz" role="37wK5m" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6KjVnJoX4FI" role="3cqZAp">
           <node concept="2OqwBi" id="6KjVnJoX4FJ" role="3clFbG">
             <node concept="37vLTw" id="6KjVnJoX4FK" role="2Oq$k0">
@@ -23248,6 +23308,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="3K9FTCmK1PH" role="3cqZAp">
+          <node concept="2OqwBi" id="3K9FTCmK2JG" role="3clFbG">
+            <node concept="2OqwBi" id="3K9FTCmK25W" role="2Oq$k0">
+              <node concept="37vLTw" id="3K9FTCmK1PF" role="2Oq$k0">
+                <ref role="3cqZAo" node="vqDSpa9D$t" resolve="searchViewer" />
+              </node>
+              <node concept="liA8E" id="3K9FTCmK2kn" role="2OqNvi">
+                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow()" resolve="getToolWindow" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3K9FTCmK5hp" role="2OqNvi">
+              <ref role="37wK5l" to="jkny:~ToolWindow.setAnchor(com.intellij.openapi.wm.ToolWindowAnchor,java.lang.Runnable)" resolve="setAnchor" />
+              <node concept="10M0yZ" id="3K9FTCmK6JO" role="37wK5m">
+                <ref role="3cqZAo" to="jkny:~ToolWindowAnchor.BOTTOM" resolve="BOTTOM" />
+                <ref role="1PxDUh" to="jkny:~ToolWindowAnchor" resolve="ToolWindowAnchor" />
+              </node>
+              <node concept="10Nm6u" id="3K9FTCmK725" role="37wK5m" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="vqDSpa9D$$" role="3cqZAp">
           <node concept="2OqwBi" id="vqDSpa9D$_" role="3clFbG">
             <node concept="37vLTw" id="vqDSpa9D$A" role="2Oq$k0">

From be245801baa52d9b282cb490c5bfc99e5e24a304 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 11 Dec 2024 08:05:53 +0100
Subject: [PATCH 18/38] core.base: also enable the search tool for languages

---
 CHANGELOG.md                                  |  2 +-
 .../core/base/pluginSolution/plugin.mps       | 84 ++++++++++---------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e05f04f43ae..24017274fdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ### Changed
 
-- The mbeddr search tool was improved: It can now also search the project and globally. It also got options for approximate searching with an error distance, and matching the case. The UI was also improved.
+- The mbeddr search tool was improved: It can now also search languages, the project and globally. It also got options for approximate searching with an error distance, and matching the case. The UI was also improved.
 
 ## com.mbeddr.mpsutil
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index fcbd8ec0155..c88ad9dbfb0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2279,7 +2279,7 @@
       </node>
     </node>
     <node concept="2XrIbr" id="2Gn1WTgMSdY" role="2XNbBy">
-      <property role="TrG5h" value="setSolution" />
+      <property role="TrG5h" value="setModule" />
       <node concept="3cqZAl" id="2Gn1WTgMSdZ" role="3clF45" />
       <node concept="3clFbS" id="2Gn1WTgMSe0" role="3clF47">
         <node concept="3clFbF" id="2Gn1WTgMSe1" role="3cqZAp">
@@ -2291,7 +2291,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2Gn1WTgMSe6" role="2OqNvi">
-              <ref role="37wK5l" node="2Gn1WTgNQ7i" resolve="setSolutionScope" />
+              <ref role="37wK5l" node="2Gn1WTgNQ7i" resolve="setModuleScope" />
               <node concept="37vLTw" id="2Gn1WTgMSe7" role="37wK5m">
                 <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
               </node>
@@ -2314,14 +2314,14 @@
                         <ref role="37wK5l" to="jkny:~ToolWindow.setTitle(java.lang.String)" resolve="setTitle" />
                         <node concept="3cpWs3" id="2Gn1WTgMSee" role="37wK5m">
                           <node concept="Xl_RD" id="2Gn1WTgMSef" role="3uHU7B">
-                            <property role="Xl_RC" value="solution " />
+                            <property role="Xl_RC" value="module " />
                           </node>
                           <node concept="2OqwBi" id="2Gn1WTgPlUK" role="3uHU7w">
                             <node concept="37vLTw" id="2Gn1WTgPlO3" role="2Oq$k0">
                               <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
                             </node>
                             <node concept="liA8E" id="2Gn1WTgPnEc" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~AbstractModule.getModuleName()" resolve="getModuleName" />
+                              <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
                             </node>
                           </node>
                         </node>
@@ -2342,9 +2342,9 @@
       </node>
       <node concept="3Tm1VV" id="2Gn1WTgMSej" role="1B3o_S" />
       <node concept="37vLTG" id="2Gn1WTgMSek" role="3clF46">
-        <property role="TrG5h" value="s" />
+        <property role="TrG5h" value="module" />
         <node concept="3uibUv" id="2Gn1WTgNGtJ" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
         </node>
       </node>
     </node>
@@ -3045,7 +3045,7 @@
     </node>
     <node concept="2tJIrI" id="1GW3SvfBGLw" role="jymVt" />
     <node concept="3clFb_" id="2Gn1WTgNQ7i" role="jymVt">
-      <property role="TrG5h" value="setSolutionScope" />
+      <property role="TrG5h" value="setModuleScope" />
       <node concept="3cqZAl" id="2Gn1WTgNQ7j" role="3clF45" />
       <node concept="3Tm1VV" id="2Gn1WTgNQ7k" role="1B3o_S" />
       <node concept="3clFbS" id="2Gn1WTgNQ7l" role="3clF47">
@@ -3072,9 +3072,9 @@
         </node>
       </node>
       <node concept="37vLTG" id="2Gn1WTgNQ7Y" role="3clF46">
-        <property role="TrG5h" value="solution" />
+        <property role="TrG5h" value="module" />
         <node concept="3uibUv" id="2Gn1WTgOgJl" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
         </node>
       </node>
     </node>
@@ -12891,8 +12891,8 @@
   </node>
   <node concept="sE7Ow" id="2Gn1WTgS$I7">
     <property role="3GE5qa" value="search" />
-    <property role="TrG5h" value="OpenSearchActionOnSolution" />
-    <property role="2uzpH1" value="Search Solution" />
+    <property role="TrG5h" value="OpenSearchActionOnModule" />
+    <property role="2uzpH1" value="Search Module" />
     <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2Gn1WTgS$Ia" role="1NuT2Z">
       <property role="TrG5h" value="project" />
@@ -12900,7 +12900,7 @@
       <node concept="1oajcY" id="2Gn1WTgS$Ib" role="1oa70y" />
     </node>
     <node concept="1DS2jV" id="2Gn1WTgS$Yk" role="1NuT2Z">
-      <property role="TrG5h" value="solution" />
+      <property role="TrG5h" value="module" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.CONTEXT_MODULE" resolve="CONTEXT_MODULE" />
       <node concept="1oajcY" id="2Gn1WTgS$Yl" role="1oa70y" />
     </node>
@@ -12964,18 +12964,11 @@
               <ref role="3cqZAo" node="2Gn1WTgS$If" resolve="searchViewer" />
             </node>
             <node concept="2XshWL" id="2Gn1WTgSDs1" role="2OqNvi">
-              <ref role="2WH_rO" node="2Gn1WTgMSdY" resolve="setSolution" />
-              <node concept="1eOMI4" id="2Gn1WTgSFiw" role="2XxRq1">
-                <node concept="10QFUN" id="2Gn1WTgSFix" role="1eOMHV">
-                  <node concept="2OqwBi" id="2Gn1WTgSFit" role="10QFUP">
-                    <node concept="2WthIp" id="2Gn1WTgSFiu" role="2Oq$k0" />
-                    <node concept="1DTwFV" id="2Gn1WTgSFiv" role="2OqNvi">
-                      <ref role="2WH_rO" node="2Gn1WTgS$Yk" resolve="solution" />
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="2Gn1WTgSFzZ" role="10QFUM">
-                    <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
-                  </node>
+              <ref role="2WH_rO" node="2Gn1WTgMSdY" resolve="setModule" />
+              <node concept="2OqwBi" id="2Gn1WTgSFit" role="2XxRq1">
+                <node concept="2WthIp" id="2Gn1WTgSFiu" role="2Oq$k0" />
+                <node concept="1DTwFV" id="2Gn1WTgSFiv" role="2OqNvi">
+                  <ref role="2WH_rO" node="2Gn1WTgS$Yk" resolve="solution" />
                 </node>
               </node>
             </node>
@@ -12983,23 +12976,6 @@
         </node>
       </node>
     </node>
-    <node concept="2ScWuX" id="2Gn1WTgS_2H" role="tmbBb">
-      <node concept="3clFbS" id="2Gn1WTgS_2I" role="2VODD2">
-        <node concept="3clFbF" id="2Gn1WTgS_iH" role="3cqZAp">
-          <node concept="2ZW3vV" id="2Gn1WTgSCdc" role="3clFbG">
-            <node concept="3uibUv" id="2Gn1WTgSCuh" role="2ZW6by">
-              <ref role="3uigEE" to="z1c3:~Solution" resolve="Solution" />
-            </node>
-            <node concept="2OqwBi" id="2Gn1WTgS_iB" role="2ZW6bz">
-              <node concept="2WthIp" id="2Gn1WTgS_iE" role="2Oq$k0" />
-              <node concept="1DTwFV" id="2Gn1WTgS_iG" role="2OqNvi">
-                <ref role="2WH_rO" node="2Gn1WTgS$Yk" resolve="solution" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1QGGSu" id="MipY_gaSlR" role="3Uehp1">
       <node concept="10M0yZ" id="MipY_gaUVb" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
@@ -24068,5 +24044,31 @@
       </node>
     </node>
   </node>
+  <node concept="tC5Ba" id="6hfhqO7XuD$">
+    <property role="TrG5h" value="mbeddrPlatformLanguageGroup" />
+    <node concept="ftmFs" id="6hfhqO7XuD_" role="ftER_">
+      <node concept="2a7GMi" id="6hfhqO7XuDA" role="ftvYc" />
+      <node concept="10WQ6h" id="6hfhqO7XuDB" role="ftvYc">
+        <property role="TrG5h" value="mbeddrPlatformLanguageExtensions" />
+      </node>
+    </node>
+    <node concept="tT9cl" id="6hfhqO7XuDC" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:hyf4IKE" resolve="LanguageActions" />
+      <ref role="2f8Tey" to="tprs:1Fww89lo1oU" resolve="ex" />
+    </node>
+  </node>
+  <node concept="tC5Ba" id="6hfhqO7XuP1">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="MbeddrSearchLanguageGroup" />
+    <node concept="ftmFs" id="6hfhqO7XuP2" role="ftER_">
+      <node concept="tCFHf" id="6hfhqO7XuP3" role="ftvYc">
+        <ref role="tCJdB" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnSolution" />
+      </node>
+    </node>
+    <node concept="tT9cl" id="6hfhqO7XuP4" role="2f5YQi">
+      <ref role="tU$_T" node="6hfhqO7XuD$" resolve="mbeddrPlatformLanguageGroup" />
+      <ref role="2f8Tey" node="6hfhqO7XuDB" resolve="mbeddrPlatformLanguageExtensions" />
+    </node>
+  </node>
 </model>
 

From 33419a54927e8042a026da40b01dd29d4792a157 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 11 Dec 2024 11:08:44 +0100
Subject: [PATCH 19/38] core.base: customize the empty search table text

---
 .../core/base/pluginSolution/plugin.mps       | 102 +++++++++++++++++-
 1 file changed, 100 insertions(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index c88ad9dbfb0..9b6b3140af5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2538,8 +2538,8 @@
         <ref role="3uigEE" to="3pb2:~JBTable" resolve="JBTable" />
       </node>
       <node concept="2ShNRf" id="jpyKDg1OG2" role="33vP2m">
-        <node concept="1pGfFk" id="jpyKDg1OG3" role="2ShVmc">
-          <ref role="37wK5l" to="3pb2:~JBTable.&lt;init&gt;()" resolve="JBTable" />
+        <node concept="HV5vD" id="1gBxUY8atHJ" role="2ShVmc">
+          <ref role="HV5vE" node="1gBxUY86ZVt" resolve="SearchResultsTable" />
         </node>
       </node>
     </node>
@@ -24070,5 +24070,103 @@
       <ref role="2f8Tey" node="6hfhqO7XuDB" resolve="mbeddrPlatformLanguageExtensions" />
     </node>
   </node>
+  <node concept="312cEu" id="1gBxUY86ZVt">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchResultsTable" />
+    <node concept="3Tm1VV" id="1gBxUY86ZVu" role="1B3o_S" />
+    <node concept="3uibUv" id="1gBxUY874Wo" role="1zkMxy">
+      <ref role="3uigEE" to="3pb2:~JBTable" resolve="JBTable" />
+    </node>
+    <node concept="3uibUv" id="1gBxUY87gp9" role="EKbjA">
+      <ref role="3uigEE" to="g1qu:~ComponentWithEmptyText" resolve="ComponentWithEmptyText" />
+    </node>
+    <node concept="3clFb_" id="1gBxUY87gJc" role="jymVt">
+      <property role="TrG5h" value="getEmptyText" />
+      <node concept="3Tm1VV" id="1gBxUY87gJd" role="1B3o_S" />
+      <node concept="2AHcQZ" id="1gBxUY87gJf" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="1gBxUY87gJg" role="3clF45">
+        <ref role="3uigEE" to="g1qu:~StatusText" resolve="StatusText" />
+      </node>
+      <node concept="3clFbS" id="1gBxUY87gJh" role="3clF47">
+        <node concept="3cpWs8" id="1gBxUY8aAiP" role="3cqZAp">
+          <node concept="3cpWsn" id="1gBxUY8aAiQ" role="3cpWs9">
+            <property role="TrG5h" value="text" />
+            <node concept="3uibUv" id="1gBxUY8aAiO" role="1tU5fm">
+              <ref role="3uigEE" to="g1qu:~StatusText" resolve="StatusText" />
+            </node>
+            <node concept="2ShNRf" id="1gBxUY8aAiR" role="33vP2m">
+              <node concept="YeOm9" id="1gBxUY8aAiS" role="2ShVmc">
+                <node concept="1Y3b0j" id="1gBxUY8aAiT" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <property role="373rjd" value="true" />
+                  <ref role="1Y3XeK" to="g1qu:~StatusText" resolve="StatusText" />
+                  <ref role="37wK5l" to="g1qu:~StatusText.&lt;init&gt;()" resolve="StatusText" />
+                  <node concept="3Tm1VV" id="1gBxUY8aAiU" role="1B3o_S" />
+                  <node concept="3clFb_" id="1gBxUY8aAiV" role="jymVt">
+                    <property role="TrG5h" value="isStatusVisible" />
+                    <node concept="3Tmbuc" id="1gBxUY8aAiW" role="1B3o_S" />
+                    <node concept="10P_77" id="1gBxUY8aAiX" role="3clF45" />
+                    <node concept="3clFbS" id="1gBxUY8aAiY" role="3clF47">
+                      <node concept="3clFbF" id="1gBxUY8c1gV" role="3cqZAp">
+                        <node concept="3clFbC" id="1gBxUY8crUO" role="3clFbG">
+                          <node concept="3cmrfG" id="1gBxUY8cvRd" role="3uHU7w">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                          <node concept="2OqwBi" id="1gBxUY8co1C" role="3uHU7B">
+                            <node concept="0kSF2" id="1gBxUY8cmk6" role="2Oq$k0">
+                              <node concept="3uibUv" id="1gBxUY8cmk8" role="0kSFW">
+                                <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+                              </node>
+                              <node concept="2OqwBi" id="1gBxUY8cid1" role="0kSFX">
+                                <node concept="Xjq3P" id="1gBxUY8cf3k" role="2Oq$k0">
+                                  <ref role="1HBi2w" node="1gBxUY86ZVt" resolve="SearchResultsTable" />
+                                </node>
+                                <node concept="liA8E" id="1gBxUY8clou" role="2OqNvi">
+                                  <ref role="37wK5l" to="dxuu:~JTable.getModel()" resolve="getModel" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="1gBxUY8coOt" role="2OqNvi">
+                              <ref role="37wK5l" node="5jGyeU5Xznu" resolve="getRowCount" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="1gBxUY8aAj1" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1gBxUY8aF2e" role="3cqZAp">
+          <node concept="2OqwBi" id="1gBxUY8aGtt" role="3clFbG">
+            <node concept="37vLTw" id="1gBxUY8aF2c" role="2Oq$k0">
+              <ref role="3cqZAo" node="1gBxUY8aAiQ" resolve="text" />
+            </node>
+            <node concept="liA8E" id="1gBxUY8aGWb" role="2OqNvi">
+              <ref role="37wK5l" to="g1qu:~StatusText.setText(java.lang.String)" resolve="setText" />
+              <node concept="Xl_RD" id="1gBxUY8aIcm" role="37wK5m">
+                <property role="Xl_RC" value="No results found" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1gBxUY8a54w" role="3cqZAp">
+          <node concept="37vLTw" id="1gBxUY8aAj2" role="3clFbG">
+            <ref role="3cqZAo" node="1gBxUY8aAiQ" resolve="text" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1gBxUY87gJi" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 737062fe4a06a0f291f5932ef609ae2a759ca683 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 12 Dec 2024 10:09:14 +0100
Subject: [PATCH 20/38] core.base: unify search solution and language group and
 add all search actions to the MPS search group

---
 .../core/base/pluginSolution/plugin.mps       | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 9b6b3140af5..4ec4d6fd1c7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3801,6 +3801,9 @@
       <ref role="tU$_T" node="goNQ8fiCdc" resolve="mbeddrPlatformModelGroup" />
       <ref role="2f8Tey" node="goNQ8fiCdf" resolve="mbeddrPlatformModelExtensions" />
     </node>
+    <node concept="tT9cl" id="14DpnPoxNW$" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:6RIKhBiOn6O" resolve="Search" />
+    </node>
   </node>
   <node concept="sE7Ow" id="2HzhasNzNK1">
     <property role="3GE5qa" value="search" />
@@ -17139,19 +17142,6 @@
       <ref role="2f8Tey" to="tprs:1bRM4HyGOKI" resolve="contents" />
     </node>
   </node>
-  <node concept="tC5Ba" id="goNQ8fiHkf">
-    <property role="3GE5qa" value="search" />
-    <property role="TrG5h" value="MbeddrSearchSolutionGroup" />
-    <node concept="ftmFs" id="goNQ8fiHkg" role="ftER_">
-      <node concept="tCFHf" id="goNQ8fiHki" role="ftvYc">
-        <ref role="tCJdB" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnSolution" />
-      </node>
-    </node>
-    <node concept="tT9cl" id="goNQ8fiHkk" role="2f5YQi">
-      <ref role="tU$_T" node="goNQ8fiE3l" resolve="mbeddrPlatformSolutionGroup" />
-      <ref role="2f8Tey" node="goNQ8fiE3o" resolve="mbeddrPlatformSolutionExtensions" />
-    </node>
-  </node>
   <node concept="tC5Ba" id="goNQ8fnbtb">
     <property role="TrG5h" value="mbeddrPlatformProjectionModeGroup" />
     <property role="2f7twF" value="Projection" />
@@ -23125,6 +23115,9 @@
     <node concept="tT9cl" id="6KjVnJoTXb3" role="2f5YQi">
       <ref role="tU$_T" node="6KjVnJoXyer" resolve="mbeddrPlatformProjectGroup" />
     </node>
+    <node concept="tT9cl" id="14DpnPoxNWK" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:6RIKhBiOn6O" resolve="Search" />
+    </node>
   </node>
   <node concept="sE7Ow" id="6KjVnJoX4Fv">
     <property role="3GE5qa" value="search" />
@@ -23252,6 +23245,9 @@
     <node concept="tT9cl" id="vqDSpa73XA" role="2f5YQi">
       <ref role="tU$_T" node="6KjVnJoXyer" resolve="mbeddrPlatformProjectGroup" />
     </node>
+    <node concept="tT9cl" id="14DpnPoxNWH" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:6RIKhBiOn6O" resolve="Search" />
+    </node>
   </node>
   <node concept="sE7Ow" id="vqDSpa9D$n">
     <property role="3GE5qa" value="search" />
@@ -24059,7 +24055,7 @@
   </node>
   <node concept="tC5Ba" id="6hfhqO7XuP1">
     <property role="3GE5qa" value="search" />
-    <property role="TrG5h" value="MbeddrSearchLanguageGroup" />
+    <property role="TrG5h" value="MbeddrSearchModuleGroup" />
     <node concept="ftmFs" id="6hfhqO7XuP2" role="ftER_">
       <node concept="tCFHf" id="6hfhqO7XuP3" role="ftvYc">
         <ref role="tCJdB" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnSolution" />
@@ -24069,6 +24065,13 @@
       <ref role="tU$_T" node="6hfhqO7XuD$" resolve="mbeddrPlatformLanguageGroup" />
       <ref role="2f8Tey" node="6hfhqO7XuDB" resolve="mbeddrPlatformLanguageExtensions" />
     </node>
+    <node concept="tT9cl" id="14DpnPozEhd" role="2f5YQi">
+      <ref role="tU$_T" node="goNQ8fiE3l" resolve="mbeddrPlatformSolutionGroup" />
+      <ref role="2f8Tey" node="goNQ8fiE3o" resolve="mbeddrPlatformSolutionExtensions" />
+    </node>
+    <node concept="tT9cl" id="14DpnPoxNWJ" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:6RIKhBiOn6O" resolve="Search" />
+    </node>
   </node>
   <node concept="312cEu" id="1gBxUY86ZVt">
     <property role="3GE5qa" value="search" />

From 6630b83f33a51a63f5fdcdb868ad765d3d044c34 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 12 Dec 2024 10:14:01 +0100
Subject: [PATCH 21/38] core.base: convert to search button action to an
 internal action

---
 .../core/base/pluginSolution/plugin.mps       | 205 ++++++++++--------
 1 file changed, 116 insertions(+), 89 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 4ec4d6fd1c7..8018fb0df5b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -220,9 +220,6 @@
       <concept id="1208528650020" name="jetbrains.mps.lang.plugin.structure.ToolType" flags="in" index="1xUVSX">
         <reference id="1208529537963" name="tool" index="1xYkEM" />
       </concept>
-      <concept id="3205675194086589964" name="jetbrains.mps.lang.plugin.structure.ActionAccessOperation" flags="nn" index="3$FdUm">
-        <reference id="3205675194086671728" name="action" index="3$FpRE" />
-      </concept>
       <concept id="1217252042208" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterDeclaration" flags="ng" index="1DS2jV">
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
@@ -2989,8 +2986,11 @@
             </node>
             <node concept="liA8E" id="6ysF3v1j_gv" role="2OqNvi">
               <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
-              <node concept="3$FdUm" id="1GW3SvfQP1l" role="37wK5m">
-                <ref role="3$FpRE" node="1GW3SvfQllV" resolve="MbeddrSearch" />
+              <node concept="2ShNRf" id="14DpnPo__wt" role="37wK5m">
+                <node concept="1pGfFk" id="14DpnPo_RXi" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" node="14DpnPo$WHY" resolve="SearchAction" />
+                </node>
               </node>
             </node>
           </node>
@@ -22862,90 +22862,6 @@
       <ref role="3uigEE" to="zyr2:~InspectorEditorComponent" resolve="InspectorEditorComponent" />
     </node>
   </node>
-  <node concept="sE7Ow" id="1GW3SvfQllV">
-    <property role="1rBW0U" value="true" />
-    <property role="3GE5qa" value="search" />
-    <property role="TrG5h" value="MbeddrSearch" />
-    <property role="2uzpH1" value="Search" />
-    <node concept="1DS2jV" id="1GW3SvfXE9e" role="1NuT2Z">
-      <property role="TrG5h" value="project" />
-      <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
-      <node concept="1oajcY" id="1GW3SvfXE9f" role="1oa70y" />
-    </node>
-    <node concept="tnohg" id="1GW3SvfQllW" role="tncku">
-      <node concept="3clFbS" id="1GW3SvfQllX" role="2VODD2">
-        <node concept="3cpWs8" id="1GW3SvfY6yT" role="3cqZAp">
-          <node concept="3cpWsn" id="1GW3SvfY6yU" role="3cpWs9">
-            <property role="TrG5h" value="viewer" />
-            <node concept="3uibUv" id="1GW3SvfY6yV" role="1tU5fm">
-              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
-            </node>
-            <node concept="10QFUN" id="1GW3SvfYx$_" role="33vP2m">
-              <node concept="3uibUv" id="1GW3SvfYxU9" role="10QFUM">
-                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
-              </node>
-              <node concept="2OqwBi" id="1GW3SvfXGn4" role="10QFUP">
-                <node concept="2OqwBi" id="1GW3SvfXFyN" role="2Oq$k0">
-                  <node concept="2OqwBi" id="1GW3SvfXEUa" role="2Oq$k0">
-                    <node concept="2WthIp" id="1GW3SvfXEUd" role="2Oq$k0" />
-                    <node concept="1DTwFV" id="1GW3SvfXEUf" role="2OqNvi">
-                      <ref role="2WH_rO" node="1GW3SvfXE9e" resolve="project" />
-                    </node>
-                  </node>
-                  <node concept="LR4U6" id="1GW3SvfXG8o" role="2OqNvi">
-                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="1GW3SvfY6pW" role="2OqNvi">
-                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1GW3SvfYyk4" role="3cqZAp">
-          <node concept="2OqwBi" id="1GW3SvfY$$V" role="3clFbG">
-            <node concept="37vLTw" id="1GW3SvfYyk2" role="2Oq$k0">
-              <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
-            </node>
-            <node concept="liA8E" id="1GW3SvfZ281" role="2OqNvi">
-              <ref role="37wK5l" node="jpyKDg2tIn" resolve="runSearch" />
-              <node concept="2OqwBi" id="1GW3SvfZ2Nw" role="37wK5m">
-                <node concept="37vLTw" id="1GW3SvfZ2hk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
-                </node>
-                <node concept="liA8E" id="1GW3SvfZ3mt" role="2OqNvi">
-                  <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="vqDSpamaBO" role="37wK5m">
-                <node concept="37vLTw" id="vqDSpam8mk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
-                </node>
-                <node concept="liA8E" id="vqDSpamdjL" role="2OqNvi">
-                  <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="vqDSpawxJY" role="37wK5m">
-                <node concept="37vLTw" id="vqDSpawvuc" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1GW3SvfY6yU" resolve="viewer" />
-                </node>
-                <node concept="liA8E" id="vqDSpaw$zs" role="2OqNvi">
-                  <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1QGGSu" id="1GW3SvfQlES" role="3Uehp1">
-      <node concept="10M0yZ" id="1GW3SvfQoEd" role="3xaMm5">
-        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="1GW3SvfRw80">
     <property role="3GE5qa" value="search" />
     <property role="TrG5h" value="SearchAllNodePresentationsToggleAction" />
@@ -24171,5 +24087,116 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="14DpnPo$W6I">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchAction" />
+    <node concept="2tJIrI" id="14DpnPo$WuM" role="jymVt" />
+    <node concept="3clFbW" id="14DpnPo$WHY" role="jymVt">
+      <node concept="3cqZAl" id="14DpnPo$WHZ" role="3clF45" />
+      <node concept="3clFbS" id="14DpnPo$WI1" role="3clF47">
+        <node concept="XkiVB" id="14DpnPo$X3i" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~AnAction.&lt;init&gt;(javax.swing.Icon)" resolve="AnAction" />
+          <node concept="10M0yZ" id="14DpnPo$XwL" role="37wK5m">
+            <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="14DpnPo$WI2" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="14DpnPo$WyK" role="jymVt" />
+    <node concept="3Tm1VV" id="14DpnPo$W6J" role="1B3o_S" />
+    <node concept="3uibUv" id="14DpnPo$WuA" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+    </node>
+    <node concept="3clFb_" id="14DpnPo$Wv7" role="jymVt">
+      <property role="TrG5h" value="actionPerformed" />
+      <node concept="3Tm1VV" id="14DpnPo$Wv8" role="1B3o_S" />
+      <node concept="3cqZAl" id="14DpnPo$Wva" role="3clF45" />
+      <node concept="37vLTG" id="14DpnPo$Wvb" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="14DpnPo$Wvc" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="14DpnPo$Wvd" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="14DpnPo$Wve" role="3clF47">
+        <node concept="3cpWs8" id="14DpnPo$XYL" role="3cqZAp">
+          <node concept="3cpWsn" id="14DpnPo$XYM" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="14DpnPo$XYN" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="14DpnPo$XYO" role="33vP2m">
+              <node concept="3uibUv" id="14DpnPo$XYP" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2OqwBi" id="14DpnPo$XYQ" role="10QFUP">
+                <node concept="2OqwBi" id="14DpnPo$XYR" role="2Oq$k0">
+                  <node concept="LR4U6" id="14DpnPo$XYV" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                  <node concept="2OqwBi" id="14DpnPo_31j" role="2Oq$k0">
+                    <node concept="37vLTw" id="14DpnPo_2my" role="2Oq$k0">
+                      <ref role="3cqZAo" node="14DpnPo$Wvb" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="14DpnPo_48P" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getData(com.intellij.openapi.actionSystem.DataKey)" resolve="getData" />
+                      <node concept="10M0yZ" id="14DpnPo_oWf" role="37wK5m">
+                        <ref role="3cqZAo" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+                        <ref role="1PxDUh" to="qkt:~CommonDataKeys" resolve="CommonDataKeys" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="14DpnPo$XYW" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="14DpnPo$XYX" role="3cqZAp">
+          <node concept="2OqwBi" id="14DpnPo$XYY" role="3clFbG">
+            <node concept="37vLTw" id="14DpnPo$XYZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="14DpnPo$XYM" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="14DpnPo$XZ0" role="2OqNvi">
+              <ref role="37wK5l" node="jpyKDg2tIn" resolve="runSearch" />
+              <node concept="2OqwBi" id="14DpnPo$XZ1" role="37wK5m">
+                <node concept="37vLTw" id="14DpnPo$XZ2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="14DpnPo$XYM" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="14DpnPo$XZ3" role="2OqNvi">
+                  <ref role="37wK5l" node="1GW3SvfUCam" resolve="isSearchAll" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="14DpnPo$XZ4" role="37wK5m">
+                <node concept="37vLTw" id="14DpnPo$XZ5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="14DpnPo$XYM" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="14DpnPo$XZ6" role="2OqNvi">
+                  <ref role="37wK5l" node="vqDSpagXys" resolve="isApproximateSearch" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="14DpnPo$XZ7" role="37wK5m">
+                <node concept="37vLTw" id="14DpnPo$XZ8" role="2Oq$k0">
+                  <ref role="3cqZAo" node="14DpnPo$XYM" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="14DpnPo$XZ9" role="2OqNvi">
+                  <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="14DpnPo$Wvf" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 99bb4fb5ac8d52688cdf064bf77edf3f4cbf0314 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 12 Dec 2024 10:43:49 +0100
Subject: [PATCH 22/38] core.base: update the search results on the EDT thread

---
 .../core/base/pluginSolution/plugin.mps       | 129 ++++++++++--------
 1 file changed, 72 insertions(+), 57 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 8018fb0df5b..a09ca78ec80 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3324,73 +3324,88 @@
                         </node>
                       </node>
                       <node concept="3clFbS" id="7ipIhbo7mb4" role="3clF47">
-                        <node concept="3cpWs8" id="3wUOPyJLoRt" role="3cqZAp">
-                          <node concept="3cpWsn" id="3wUOPyJLoRu" role="3cpWs9">
-                            <property role="TrG5h" value="model" />
-                            <node concept="3uibUv" id="3wUOPyJL49G" role="1tU5fm">
-                              <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+                        <node concept="3clFbF" id="14DpnPoWYbi" role="3cqZAp">
+                          <node concept="2OqwBi" id="14DpnPoX8ZE" role="3clFbG">
+                            <node concept="2YIFZM" id="14DpnPoX7RZ" role="2Oq$k0">
+                              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+                              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
                             </node>
-                            <node concept="2ShNRf" id="3wUOPyJLoRv" role="33vP2m">
-                              <node concept="1pGfFk" id="3wUOPyJLoRw" role="2ShVmc">
-                                <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
-                                <node concept="2OqwBi" id="3wUOPyJLoRx" role="37wK5m">
-                                  <node concept="2OqwBi" id="3wUOPyJLoRy" role="2Oq$k0">
-                                    <node concept="Xjq3P" id="3wUOPyJLoRz" role="2Oq$k0">
-                                      <ref role="1HBi2w" node="2HzhasNzNEW" resolve="SearchViewer" />
+                            <node concept="liA8E" id="14DpnPoXeMF" role="2OqNvi">
+                              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+                              <node concept="1bVj0M" id="14DpnPoXmR5" role="37wK5m">
+                                <node concept="3clFbS" id="14DpnPoXmR8" role="1bW5cS">
+                                  <node concept="3cpWs8" id="3wUOPyJLoRt" role="3cqZAp">
+                                    <node concept="3cpWsn" id="3wUOPyJLoRu" role="3cpWs9">
+                                      <property role="TrG5h" value="model" />
+                                      <node concept="3uibUv" id="3wUOPyJL49G" role="1tU5fm">
+                                        <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+                                      </node>
+                                      <node concept="2ShNRf" id="3wUOPyJLoRv" role="33vP2m">
+                                        <node concept="1pGfFk" id="3wUOPyJLoRw" role="2ShVmc">
+                                          <ref role="37wK5l" node="jpyKDg1OH8" resolve="ResultTableModel" />
+                                          <node concept="2OqwBi" id="3wUOPyJLoRx" role="37wK5m">
+                                            <node concept="2OqwBi" id="3wUOPyJLoRy" role="2Oq$k0">
+                                              <node concept="Xjq3P" id="3wUOPyJLoRz" role="2Oq$k0">
+                                                <ref role="1HBi2w" node="2HzhasNzNEW" resolve="SearchViewer" />
+                                              </node>
+                                              <node concept="2OwXpG" id="3wUOPyJLoR$" role="2OqNvi">
+                                                <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                                              </node>
+                                            </node>
+                                            <node concept="liA8E" id="3wUOPyJLoR_" role="2OqNvi">
+                                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                                            </node>
+                                          </node>
+                                          <node concept="37vLTw" id="3wUOPyJLoRA" role="37wK5m">
+                                            <ref role="3cqZAo" node="7ipIhbo7mb1" resolve="results" />
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
-                                    <node concept="2OwXpG" id="3wUOPyJLoR$" role="2OqNvi">
-                                      <ref role="2Oxat5" node="2HzhasNzNGZ" resolve="myProject" />
+                                  </node>
+                                  <node concept="3clFbF" id="6wvhQs7njzN" role="3cqZAp">
+                                    <node concept="3P9mCS" id="6wvhQs7njzO" role="3clFbG">
+                                      <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
+                                      <node concept="37vLTw" id="3wUOPyJLoRB" role="37wK5m">
+                                        <ref role="3cqZAo" node="3wUOPyJLoRu" resolve="model" />
+                                      </node>
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="3wUOPyJLoR_" role="2OqNvi">
-                                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                                  <node concept="3clFbF" id="3wUOPyJLBHw" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3wUOPyJLPKX" role="3clFbG">
+                                      <node concept="liA8E" id="3wUOPyJLWRP" role="2OqNvi">
+                                        <ref role="37wK5l" to="c8ee:~AbstractTableModel.fireTableDataChanged()" resolve="fireTableDataChanged" />
+                                      </node>
+                                      <node concept="37vLTw" id="3wUOPyJMySg" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3wUOPyJLoRu" resolve="model" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="3wUOPyJJlks" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3wUOPyJJlkt" role="3clFbG">
+                                      <node concept="liA8E" id="3wUOPyJJlkx" role="2OqNvi">
+                                        <ref role="37wK5l" to="dxuu:~JComponent.revalidate()" resolve="revalidate" />
+                                      </node>
+                                      <node concept="37vLTw" id="3wUOPyJJMG2" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="3wUOPyJJloK" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3wUOPyJJloL" role="3clFbG">
+                                      <node concept="liA8E" id="3wUOPyJJloP" role="2OqNvi">
+                                        <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
+                                      </node>
+                                      <node concept="37vLTw" id="3wUOPyJK2e_" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+                                      </node>
+                                    </node>
                                   </node>
-                                </node>
-                                <node concept="37vLTw" id="3wUOPyJLoRA" role="37wK5m">
-                                  <ref role="3cqZAo" node="7ipIhbo7mb1" resolve="results" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="6wvhQs7njzN" role="3cqZAp">
-                          <node concept="3P9mCS" id="6wvhQs7njzO" role="3clFbG">
-                            <ref role="37wK5l" node="6wvhQs7njzg" resolve="setTableModel" />
-                            <node concept="37vLTw" id="3wUOPyJLoRB" role="37wK5m">
-                              <ref role="3cqZAo" node="3wUOPyJLoRu" resolve="model" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="3wUOPyJLBHw" role="3cqZAp">
-                          <node concept="2OqwBi" id="3wUOPyJLPKX" role="3clFbG">
-                            <node concept="liA8E" id="3wUOPyJLWRP" role="2OqNvi">
-                              <ref role="37wK5l" to="c8ee:~AbstractTableModel.fireTableDataChanged()" resolve="fireTableDataChanged" />
-                            </node>
-                            <node concept="37vLTw" id="3wUOPyJMySg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3wUOPyJLoRu" resolve="model" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="3wUOPyJJlks" role="3cqZAp">
-                          <node concept="2OqwBi" id="3wUOPyJJlkt" role="3clFbG">
-                            <node concept="liA8E" id="3wUOPyJJlkx" role="2OqNvi">
-                              <ref role="37wK5l" to="dxuu:~JComponent.revalidate()" resolve="revalidate" />
-                            </node>
-                            <node concept="37vLTw" id="3wUOPyJJMG2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="3wUOPyJJloK" role="3cqZAp">
-                          <node concept="2OqwBi" id="3wUOPyJJloL" role="3clFbG">
-                            <node concept="liA8E" id="3wUOPyJJloP" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
-                            </node>
-                            <node concept="37vLTw" id="3wUOPyJK2e_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-                            </node>
-                          </node>
-                        </node>
                       </node>
                       <node concept="2AHcQZ" id="7ipIhbo7mb6" role="2AJF6D">
                         <ref role="2AI5Lk" to="wyt6:~Override" />

From 191c61293322b8b7f78ad2e26b000bffa99fd127 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 08:41:05 +0100
Subject: [PATCH 23/38] core.base: show all platform action groups next to find
 usages

---
 .../models/com/mbeddr/core/base/pluginSolution/plugin.mps   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index a09ca78ec80..c25a789bcf2 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -17141,7 +17141,7 @@
     </node>
     <node concept="tT9cl" id="goNQ8fiCdg" role="2f5YQi">
       <ref role="tU$_T" to="tprs:hyf4Hgq" resolve="ModelActions" />
-      <ref role="2f8Tey" to="tprs:2blMBvV$tE0" resolve="showHelp" />
+      <ref role="2f8Tey" to="tprs:Ymhd0bfr94" resolve="modelUsages" />
     </node>
   </node>
   <node concept="tC5Ba" id="goNQ8fiE3l">
@@ -17154,7 +17154,7 @@
     </node>
     <node concept="tT9cl" id="goNQ8fiE3p" role="2f5YQi">
       <ref role="tU$_T" to="tprs:hyf4Jd1" resolve="SolutionActions" />
-      <ref role="2f8Tey" to="tprs:1bRM4HyGOKI" resolve="contents" />
+      <ref role="2f8Tey" to="tprs:6gJrPYfWcoC" resolve="find_usages" />
     </node>
   </node>
   <node concept="tC5Ba" id="goNQ8fnbtb">
@@ -23981,7 +23981,7 @@
     </node>
     <node concept="tT9cl" id="6hfhqO7XuDC" role="2f5YQi">
       <ref role="tU$_T" to="tprs:hyf4IKE" resolve="LanguageActions" />
-      <ref role="2f8Tey" to="tprs:1Fww89lo1oU" resolve="ex" />
+      <ref role="2f8Tey" to="tprs:i0Y3C8d" resolve="find_usages" />
     </node>
   </node>
   <node concept="tC5Ba" id="6hfhqO7XuP1">

From f5ff1c742955b12132622af10a97b0dfe9203edf Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 10:15:50 +0100
Subject: [PATCH 24/38] core.base: improve the approximate search

---
 .../core/base/pluginSolution/plugin.mps       | 97 +++++++++++++++++--
 1 file changed, 90 insertions(+), 7 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index c25a789bcf2..35012f6136a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3920,13 +3920,56 @@
     <node concept="3Tm1VV" id="2HzhasN$akQ" role="1B3o_S" />
     <node concept="2tJIrI" id="4Q2Vz3i$yYf" role="jymVt" />
     <node concept="Wx3nA" id="vqDSpamxv4" role="jymVt">
-      <property role="TrG5h" value="ALLOWED_DISTANCE" />
+      <property role="TrG5h" value="MEDIUM_SEARCH_TOLERANCE" />
       <node concept="10Oyi0" id="vqDSpamxv7" role="1tU5fm" />
       <node concept="3cmrfG" id="vqDSpamxv8" role="33vP2m">
-        <property role="3cmrfH" value="3" />
+        <property role="3cmrfH" value="2" />
       </node>
       <node concept="3Tm1VV" id="vqDSpamxv6" role="1B3o_S" />
     </node>
+    <node concept="Wx3nA" id="6ajFgCz$Mob" role="jymVt">
+      <property role="TrG5h" value="LONG_SEARCH_TOLERANCE" />
+      <node concept="10Oyi0" id="6ajFgCz$Moc" role="1tU5fm" />
+      <node concept="3cmrfG" id="6ajFgCz$Mod" role="33vP2m">
+        <property role="3cmrfH" value="3" />
+      </node>
+      <node concept="3Tm1VV" id="6ajFgCz$Moe" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6ajFgCz_nHB" role="jymVt" />
+    <node concept="Wx3nA" id="6ajFgCz_eQN" role="jymVt">
+      <property role="TrG5h" value="SHORT_SEARCH_MAXIMUM" />
+      <node concept="3Tm1VV" id="6ajFgCz_eQO" role="1B3o_S" />
+      <node concept="10Oyi0" id="6ajFgCz_eQP" role="1tU5fm" />
+      <node concept="3cmrfG" id="6ajFgCz_eQQ" role="33vP2m">
+        <property role="3cmrfH" value="3" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6ajFgCz_imw" role="jymVt" />
+    <node concept="Wx3nA" id="6ajFgCz_gVt" role="jymVt">
+      <property role="TrG5h" value="MEDIUM_SEARCH_MINIMUM" />
+      <node concept="3Tm1VV" id="6ajFgCz_gVu" role="1B3o_S" />
+      <node concept="10Oyi0" id="6ajFgCz_gVv" role="1tU5fm" />
+      <node concept="3cmrfG" id="6ajFgCz_gVw" role="33vP2m">
+        <property role="3cmrfH" value="4" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="6ajFgCz_gVx" role="jymVt">
+      <property role="TrG5h" value="MEDIUM_SEARCH_MAXIMUM" />
+      <node concept="3Tm1VV" id="6ajFgCz_gVy" role="1B3o_S" />
+      <node concept="10Oyi0" id="6ajFgCz_gVz" role="1tU5fm" />
+      <node concept="3cmrfG" id="6ajFgCz_gV$" role="33vP2m">
+        <property role="3cmrfH" value="7" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6ajFgCz_q_G" role="jymVt" />
+    <node concept="Wx3nA" id="6ajFgCz_q_I" role="jymVt">
+      <property role="TrG5h" value="LONG_SEARCH_MINIMUM" />
+      <node concept="3Tm1VV" id="6ajFgCz_q_J" role="1B3o_S" />
+      <node concept="10Oyi0" id="6ajFgCz_q_K" role="1tU5fm" />
+      <node concept="3cmrfG" id="6ajFgCz_q_L" role="33vP2m">
+        <property role="3cmrfH" value="8" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="vqDSpamANO" role="jymVt" />
     <node concept="312cEg" id="4Q2Vz3i_rqf" role="jymVt">
       <property role="TrG5h" value="project" />
@@ -4669,6 +4712,21 @@
                                           </node>
                                           <node concept="3clFbJ" id="vqDSpaov7O" role="3cqZAp">
                                             <node concept="3clFbS" id="vqDSpaov7Q" role="3clFbx">
+                                              <node concept="3cpWs8" id="6ajFgCz_Q$F" role="3cqZAp">
+                                                <node concept="3cpWsn" id="6ajFgCz_Q$G" role="3cpWs9">
+                                                  <property role="TrG5h" value="searchlength" />
+                                                  <node concept="10Oyi0" id="6ajFgCz_Q5n" role="1tU5fm" />
+                                                  <node concept="2OqwBi" id="6ajFgCz_Q$H" role="33vP2m">
+                                                    <node concept="37vLTw" id="6ajFgCz_Q$I" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
+                                                    </node>
+                                                    <node concept="liA8E" id="6ajFgCz_Q$J" role="2OqNvi">
+                                                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3clFbH" id="6ajFgCz_SMM" role="3cqZAp" />
                                               <node concept="3clFbJ" id="vqDSpal0By" role="3cqZAp">
                                                 <node concept="3clFbS" id="vqDSpal0B$" role="3clFbx">
                                                   <node concept="3clFbF" id="vqDSpamNpL" role="3cqZAp">
@@ -4677,9 +4735,6 @@
                                                         <ref role="3cqZAo" node="vqDSpakMW9" resolve="matches" />
                                                       </node>
                                                       <node concept="2dkUwp" id="vqDSpapoBA" role="37vLTx">
-                                                        <node concept="37vLTw" id="vqDSpapoBB" role="3uHU7w">
-                                                          <ref role="3cqZAo" node="vqDSpamxv4" resolve="ALLOWED_DISTANCE" />
-                                                        </node>
                                                         <node concept="2YIFZM" id="vqDSpapoBC" role="3uHU7B">
                                                           <ref role="37wK5l" node="vqDSpaiUHg" resolve="compute" />
                                                           <ref role="1Pybhc" node="vqDSpaiUeD" resolve="LevenshteinDistance" />
@@ -4690,12 +4745,40 @@
                                                             <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
                                                           </node>
                                                         </node>
+                                                        <node concept="1eOMI4" id="6ajFgCzAlGn" role="3uHU7w">
+                                                          <node concept="3K4zz7" id="6ajFgCzAbap" role="1eOMHV">
+                                                            <node concept="37vLTw" id="6ajFgCzAcS1" role="3K4E3e">
+                                                              <ref role="3cqZAo" node="vqDSpamxv4" resolve="MEDIUM_SEARCH_TOLERANCE" />
+                                                            </node>
+                                                            <node concept="37vLTw" id="6ajFgCzAg7R" role="3K4GZi">
+                                                              <ref role="3cqZAo" node="6ajFgCz$Mob" resolve="LONG_SEARCH_TOLERANCE" />
+                                                            </node>
+                                                            <node concept="3eOVzh" id="6ajFgCzA5ts" role="3K4Cdx">
+                                                              <node concept="37vLTw" id="6ajFgCzA79Y" role="3uHU7w">
+                                                                <ref role="3cqZAo" node="6ajFgCz_q_I" resolve="LONG_SEARCH_MINIMUM" />
+                                                              </node>
+                                                              <node concept="37vLTw" id="6ajFgCz_WkQ" role="3uHU7B">
+                                                                <ref role="3cqZAo" node="6ajFgCz_Q$G" resolve="searchlength" />
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
-                                                <node concept="37vLTw" id="vqDSpamGgQ" role="3clFbw">
-                                                  <ref role="3cqZAo" node="vqDSpal5Zc" resolve="approximateSearch" />
+                                                <node concept="1Wc70l" id="6ajFgCz$spO" role="3clFbw">
+                                                  <node concept="2d3UOw" id="6ajFgCz$W8H" role="3uHU7w">
+                                                    <node concept="37vLTw" id="6ajFgCz_Q$K" role="3uHU7B">
+                                                      <ref role="3cqZAo" node="6ajFgCz_Q$G" resolve="length" />
+                                                    </node>
+                                                    <node concept="37vLTw" id="6ajFgCz$YT_" role="3uHU7w">
+                                                      <ref role="3cqZAo" node="6ajFgCz_gVt" resolve="MEDIUM_SEARCH_MINIMUM" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="37vLTw" id="vqDSpamGgQ" role="3uHU7B">
+                                                    <ref role="3cqZAo" node="vqDSpal5Zc" resolve="approximateSearch" />
+                                                  </node>
                                                 </node>
                                                 <node concept="9aQIb" id="vqDSpaoC7B" role="9aQIa">
                                                   <node concept="3clFbS" id="vqDSpaoC7C" role="9aQI4">

From 4303ad8d23337d5a519668da5961fa11bc5035b5 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 10:23:25 +0100
Subject: [PATCH 25/38] core.base: always show the search tool and set the
 project scope as the default scope

---
 .../com/mbeddr/core/base/pluginSolution/plugin.mps     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 35012f6136a..9074655b70a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -194,6 +194,7 @@
       <concept id="1214307303872" name="jetbrains.mps.lang.plugin.structure.GetComponentBlock" flags="in" index="2UmK3q" />
       <concept id="6547237850567458268" name="jetbrains.mps.lang.plugin.structure.BaseToolDeclaration" flags="ng" index="2XNcJY">
         <property id="2498620720770664572" name="position" index="2bmUCM" />
+        <property id="43535111852086466" name="isAvailableOnStartup" index="tEvSQ" />
         <property id="6547237850567462620" name="caption" index="2XNbzY" />
         <child id="8096638938275469615" name="toolDisposeBlock" index="uR5co" />
         <child id="8096638938275469614" name="toolInitBlock" index="uR5cp" />
@@ -2107,6 +2108,7 @@
     <property role="TrG5h" value="MbeddrSearchViewer" />
     <property role="2XNbzY" value="Search" />
     <property role="3GE5qa" value="search" />
+    <property role="tEvSQ" value="true" />
     <node concept="2XrIbr" id="vqDSpa77ZY" role="2XNbBy">
       <property role="TrG5h" value="setGlobal" />
       <node concept="3cqZAl" id="vqDSpa77ZZ" role="3clF45" />
@@ -2391,6 +2393,14 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="1k90KlDplPc" role="3cqZAp">
+          <node concept="2OqwBi" id="1k90KlDpm7K" role="3clFbG">
+            <node concept="2WthIp" id="1k90KlDplPa" role="2Oq$k0" />
+            <node concept="2XshWL" id="1k90KlDpmo1" role="2OqNvi">
+              <ref role="2WH_rO" node="6KjVnJoXq9s" resolve="setProject" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2xpOpl" id="2HzhasNzNEc" role="uR5co">

From 8565b3c8fd92f426bbcd46e54b477daedc3b585c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 10:30:15 +0100
Subject: [PATCH 26/38] core.base: sort the results by the short name length

---
 .../core/base/pluginSolution/plugin.mps       | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 9074655b70a..0014464639a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -747,6 +747,9 @@
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
+      <concept id="1209727891789" name="jetbrains.mps.baseLanguage.collections.structure.ComparatorSortOperation" flags="nn" index="2DpFxk">
+        <child id="1209727996925" name="ascending" index="2Dq5b$" />
+      </concept>
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -5458,8 +5461,60 @@
                             </node>
                             <node concept="liA8E" id="7ipIhbo1Mf9" role="2OqNvi">
                               <ref role="37wK5l" node="7ipIhbnXdL4" resolve="resultsReceived" />
-                              <node concept="37vLTw" id="7ipIhbo1TyQ" role="37wK5m">
-                                <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                              <node concept="2OqwBi" id="55oOaAF9qGu" role="37wK5m">
+                                <node concept="2OqwBi" id="55oOaAF9em5" role="2Oq$k0">
+                                  <node concept="37vLTw" id="55oOaAF9aUz" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                                  </node>
+                                  <node concept="2DpFxk" id="55oOaAF9jNv" role="2OqNvi">
+                                    <node concept="1nlBCl" id="55oOaAF9jNx" role="2Dq5b$">
+                                      <property role="3clFbU" value="true" />
+                                    </node>
+                                    <node concept="1bVj0M" id="55oOaAF9jNy" role="23t8la">
+                                      <node concept="3clFbS" id="55oOaAF9jNz" role="1bW5cS">
+                                        <node concept="3clFbF" id="55oOaAFa85D" role="3cqZAp">
+                                          <node concept="3cpWsd" id="55oOaAFaoo7" role="3clFbG">
+                                            <node concept="2OqwBi" id="55oOaAFax9Q" role="3uHU7w">
+                                              <node concept="2OqwBi" id="55oOaAFasBz" role="2Oq$k0">
+                                                <node concept="37vLTw" id="55oOaAFaqOv" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="55oOaAF9jNA" resolve="b" />
+                                                </node>
+                                                <node concept="liA8E" id="55oOaAFav92" role="2OqNvi">
+                                                  <ref role="37wK5l" node="2HzhasN$aut" resolve="getShortName" />
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="55oOaAFa$rj" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                                              </node>
+                                            </node>
+                                            <node concept="2OqwBi" id="55oOaAFadKz" role="3uHU7B">
+                                              <node concept="2OqwBi" id="55oOaAFa9Pp" role="2Oq$k0">
+                                                <node concept="37vLTw" id="55oOaAFa85C" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="55oOaAF9jN$" resolve="a" />
+                                                </node>
+                                                <node concept="liA8E" id="55oOaAFab2W" role="2OqNvi">
+                                                  <ref role="37wK5l" node="2HzhasN$aut" resolve="getShortName" />
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="55oOaAFah8h" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="gl6BB" id="55oOaAF9jN$" role="1bW2Oz">
+                                        <property role="TrG5h" value="a" />
+                                        <node concept="2jxLKc" id="55oOaAF9jN_" role="1tU5fm" />
+                                      </node>
+                                      <node concept="gl6BB" id="55oOaAF9jNA" role="1bW2Oz">
+                                        <property role="TrG5h" value="b" />
+                                        <node concept="2jxLKc" id="55oOaAF9jNB" role="1tU5fm" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="ANE8D" id="55oOaAF9u8d" role="2OqNvi" />
                               </node>
                             </node>
                           </node>

From d19fa1d05b83d08e3edf8103551eea99d7aa3e7c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 10:38:27 +0100
Subject: [PATCH 27/38] core.base: add the ability to search by regex

---
 CHANGELOG.md                                  |   2 +-
 .../core/base/pluginSolution/plugin.mps       | 499 ++++++++++++++++++
 2 files changed, 500 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24017274fdf..cc26eb06775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ### Changed
 
-- The mbeddr search tool was improved: It can now also search languages, the project and globally. It also got options for approximate searching with an error distance, and matching the case. The UI was also improved.
+- The mbeddr search tool was improved: It can now also search languages, the project and globally. It also got options for approximate searching with an error distance matching the case and searching by a regular expression. The UI was also improved.
 
 ## com.mbeddr.mpsutil
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 0014464639a..5355b824f33 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -117,6 +117,7 @@
     <import index="mte6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
+    <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
@@ -2571,6 +2572,12 @@
       <node concept="10P_77" id="vqDSpatsO0" role="1tU5fm" />
       <node concept="3clFbT" id="vqDSpatM36" role="33vP2m" />
     </node>
+    <node concept="312cEg" id="55oOaAFcfOp" role="jymVt">
+      <property role="TrG5h" value="matchRegex" />
+      <node concept="3Tm6S6" id="55oOaAFc3Ao" role="1B3o_S" />
+      <node concept="10P_77" id="55oOaAFc83f" role="1tU5fm" />
+      <node concept="3clFbT" id="55oOaAFco4x" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="1GW3SvfSRyG" role="jymVt" />
     <node concept="3clFbW" id="2HzhasNzNH5" role="jymVt">
       <node concept="3Tm1VV" id="2HzhasNzNH6" role="1B3o_S" />
@@ -2683,6 +2690,110 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="55oOaAFhIuI" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFhOUo" role="3clFbG">
+            <node concept="37vLTw" id="55oOaAFhIuG" role="2Oq$k0">
+              <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+            </node>
+            <node concept="liA8E" id="55oOaAFhV11" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~JComponent.setInputVerifier(javax.swing.InputVerifier)" resolve="setInputVerifier" />
+              <node concept="2ShNRf" id="55oOaAFi5fI" role="37wK5m">
+                <node concept="YeOm9" id="55oOaAFidqA" role="2ShVmc">
+                  <node concept="1Y3b0j" id="55oOaAFidqD" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <property role="373rjd" value="true" />
+                    <ref role="1Y3XeK" to="dxuu:~InputVerifier" resolve="InputVerifier" />
+                    <ref role="37wK5l" to="dxuu:~InputVerifier.&lt;init&gt;()" resolve="InputVerifier" />
+                    <node concept="3Tm1VV" id="55oOaAFidqE" role="1B3o_S" />
+                    <node concept="3clFb_" id="55oOaAFidqQ" role="jymVt">
+                      <property role="TrG5h" value="verify" />
+                      <node concept="3Tm1VV" id="55oOaAFidqR" role="1B3o_S" />
+                      <node concept="10P_77" id="55oOaAFidqT" role="3clF45" />
+                      <node concept="37vLTG" id="55oOaAFidqU" role="3clF46">
+                        <property role="TrG5h" value="comp" />
+                        <node concept="3uibUv" id="55oOaAFidqV" role="1tU5fm">
+                          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="55oOaAFidqW" role="3clF47">
+                        <node concept="3clFbJ" id="55oOaAFiZqB" role="3cqZAp">
+                          <node concept="37vLTw" id="55oOaAFjlAq" role="3clFbw">
+                            <ref role="3cqZAo" node="55oOaAFcfOp" resolve="matchRegex" />
+                          </node>
+                          <node concept="3clFbS" id="55oOaAFiZqD" role="3clFbx">
+                            <node concept="3J1_TO" id="55oOaAFl8Gd" role="3cqZAp">
+                              <node concept="3uVAMA" id="55oOaAFleLo" role="1zxBo5">
+                                <node concept="XOnhg" id="55oOaAFleLp" role="1zc67B">
+                                  <property role="TrG5h" value="ex" />
+                                  <node concept="nSUau" id="55oOaAFleLq" role="1tU5fm">
+                                    <node concept="3uibUv" id="55oOaAFliyX" role="nSUat">
+                                      <ref role="3uigEE" to="ni5j:~PatternSyntaxException" resolve="PatternSyntaxException" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbS" id="55oOaAFleLr" role="1zc67A">
+                                  <node concept="3cpWs6" id="55oOaAFlxpo" role="3cqZAp">
+                                    <node concept="3clFbT" id="55oOaAFlCKI" role="3cqZAk" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbS" id="55oOaAFl8Ge" role="1zxBo7">
+                                <node concept="3cpWs8" id="55oOaAFkbZd" role="3cqZAp">
+                                  <node concept="3cpWsn" id="55oOaAFkbZe" role="3cpWs9">
+                                    <property role="TrG5h" value="pattern" />
+                                    <node concept="3uibUv" id="55oOaAFkbZf" role="1tU5fm">
+                                      <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
+                                    </node>
+                                    <node concept="2YIFZM" id="55oOaAFkqlG" role="33vP2m">
+                                      <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String)" resolve="compile" />
+                                      <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
+                                      <node concept="2OqwBi" id="55oOaAFky$Y" role="37wK5m">
+                                        <node concept="37vLTw" id="55oOaAFkuVX" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+                                        </node>
+                                        <node concept="liA8E" id="55oOaAFkWV4" role="2OqNvi">
+                                          <ref role="37wK5l" to="r791:~JTextComponent.getText()" resolve="getText" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="RRSsy" id="55oOaAFmg4v" role="3cqZAp">
+                                  <node concept="3cpWs3" id="55oOaAFmwJP" role="RRSoy">
+                                    <node concept="37vLTw" id="55oOaAFm_y3" role="3uHU7w">
+                                      <ref role="3cqZAo" node="55oOaAFkbZe" resolve="pattern" />
+                                    </node>
+                                    <node concept="Xl_RD" id="55oOaAFmg4x" role="3uHU7B">
+                                      <property role="Xl_RC" value="Verifying search regex:" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs6" id="55oOaAFlZcD" role="3cqZAp">
+                                  <node concept="3clFbT" id="55oOaAFm4wu" role="3cqZAk">
+                                    <property role="3clFbU" value="true" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="55oOaAFj2Eu" role="3cqZAp" />
+                        <node concept="3cpWs6" id="55oOaAFjbK3" role="3cqZAp">
+                          <node concept="3clFbT" id="55oOaAFjh2L" role="3cqZAk">
+                            <property role="3clFbU" value="true" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="55oOaAFidqY" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="jpyKDg2tHv" role="3cqZAp">
           <node concept="2OqwBi" id="jpyKDg2tHP" role="3clFbG">
             <node concept="37vLTw" id="jpyKDg2tHw" role="2Oq$k0">
@@ -2738,6 +2849,9 @@
                                 <node concept="1rXfSq" id="vqDSpawNFT" role="37wK5m">
                                   <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
                                 </node>
+                                <node concept="1rXfSq" id="55oOaAFfq_F" role="37wK5m">
+                                  <ref role="37wK5l" node="55oOaAFczTg" resolve="isMatchRegex" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -2992,6 +3106,21 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="55oOaAFdpgv" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFdpgw" role="3clFbG">
+            <node concept="37vLTw" id="55oOaAFdpgx" role="2Oq$k0">
+              <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
+            </node>
+            <node concept="liA8E" id="55oOaAFdpgy" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+              <node concept="2ShNRf" id="55oOaAFdpgz" role="37wK5m">
+                <node concept="1pGfFk" id="55oOaAFdpg$" role="2ShVmc">
+                  <ref role="37wK5l" node="55oOaAFbF8_" resolve="SearchMatchRegexToggleAction" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6ysF3v1j_gs" role="3cqZAp">
           <node concept="2OqwBi" id="6ysF3v1j_gt" role="3clFbG">
             <node concept="37vLTw" id="791RMwCWCHr" role="2Oq$k0">
@@ -3316,6 +3445,9 @@
               <node concept="37vLTw" id="vqDSpawlG2" role="37wK5m">
                 <ref role="3cqZAo" node="vqDSpavYDD" resolve="matchCase" />
               </node>
+              <node concept="37vLTw" id="55oOaAFeSni" role="37wK5m">
+                <ref role="3cqZAo" node="55oOaAFezSG" resolve="matchRegex" />
+              </node>
               <node concept="2ShNRf" id="7ipIhbo7evk" role="37wK5m">
                 <node concept="YeOm9" id="7ipIhbo7maw" role="2ShVmc">
                   <node concept="1Y3b0j" id="7ipIhbo7maz" role="YeSDq">
@@ -3443,6 +3575,10 @@
         <property role="TrG5h" value="matchCase" />
         <node concept="10P_77" id="vqDSpaw3gD" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="55oOaAFezSG" role="3clF46">
+        <property role="TrG5h" value="matchRegex" />
+        <node concept="10P_77" id="55oOaAFeCuR" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1GW3SvfBplv" role="jymVt" />
     <node concept="3clFb_" id="6wvhQs7njzg" role="jymVt">
@@ -3816,6 +3952,42 @@
         <node concept="10P_77" id="vqDSpatSQ_" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="55oOaAFczpu" role="jymVt" />
+    <node concept="3clFb_" id="55oOaAFczTg" role="jymVt">
+      <property role="TrG5h" value="isMatchRegex" />
+      <node concept="3clFbS" id="55oOaAFczTh" role="3clF47">
+        <node concept="3clFbF" id="55oOaAFczTi" role="3cqZAp">
+          <node concept="37vLTw" id="55oOaAFczTj" role="3clFbG">
+            <ref role="3cqZAo" node="55oOaAFcfOp" resolve="matchRegex" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="55oOaAFczTk" role="1B3o_S" />
+      <node concept="10P_77" id="55oOaAFczTl" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="55oOaAFczTm" role="jymVt" />
+    <node concept="3clFb_" id="55oOaAFczTn" role="jymVt">
+      <property role="TrG5h" value="toggleMatchRegex" />
+      <node concept="3clFbS" id="55oOaAFczTo" role="3clF47">
+        <node concept="3clFbF" id="55oOaAFczTp" role="3cqZAp">
+          <node concept="37vLTI" id="55oOaAFczTq" role="3clFbG">
+            <node concept="37vLTw" id="55oOaAFczTr" role="37vLTx">
+              <ref role="3cqZAo" node="55oOaAFczTv" resolve="flag" />
+            </node>
+            <node concept="37vLTw" id="55oOaAFczTs" role="37vLTJ">
+              <ref role="3cqZAo" node="55oOaAFcfOp" resolve="matchRegex" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="55oOaAFczTt" role="1B3o_S" />
+      <node concept="3cqZAl" id="55oOaAFczTu" role="3clF45" />
+      <node concept="37vLTG" id="55oOaAFczTv" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="55oOaAFczTw" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="55oOaAFczpv" role="jymVt" />
   </node>
   <node concept="tC5Ba" id="2HzhasNzNJV">
     <property role="3GE5qa" value="search" />
@@ -4111,6 +4283,9 @@
             <node concept="37vLTw" id="vqDSpavI2o" role="37wK5m">
               <ref role="3cqZAo" node="vqDSpavEHM" resolve="matchCase" />
             </node>
+            <node concept="37vLTw" id="55oOaAFehZi" role="37wK5m">
+              <ref role="3cqZAo" node="55oOaAFeekp" resolve="matchRegex" />
+            </node>
             <node concept="37vLTw" id="vqDSp9RYfZ" role="37wK5m">
               <ref role="3cqZAo" node="7ipIhbnXdOW" resolve="callback" />
             </node>
@@ -4135,6 +4310,10 @@
         <property role="TrG5h" value="matchCase" />
         <node concept="10P_77" id="vqDSpavGzK" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="55oOaAFeekp" role="3clF46">
+        <property role="TrG5h" value="matchRegex" />
+        <node concept="10P_77" id="55oOaAFef7B" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7ipIhbnXdOW" role="3clF46">
         <property role="TrG5h" value="callback" />
         <node concept="3uibUv" id="7ipIhbnXfIW" role="1tU5fm">
@@ -4282,6 +4461,94 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3cpWs8" id="55oOaAFo5N1" role="3cqZAp">
+                          <node concept="3cpWsn" id="55oOaAFo5N2" role="3cpWs9">
+                            <property role="TrG5h" value="searchPattern" />
+                            <node concept="3uibUv" id="55oOaAFo5N3" role="1tU5fm">
+                              <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="55oOaAFowhZ" role="3cqZAp">
+                          <node concept="3clFbS" id="55oOaAFowi1" role="3clFbx">
+                            <node concept="3J1_TO" id="55oOaAFoJUO" role="3cqZAp">
+                              <node concept="3uVAMA" id="55oOaAFoLa7" role="1zxBo5">
+                                <node concept="XOnhg" id="55oOaAFoLa8" role="1zc67B">
+                                  <property role="TrG5h" value="e" />
+                                  <node concept="nSUau" id="55oOaAFoLa9" role="1tU5fm">
+                                    <node concept="3uibUv" id="55oOaAFoMEI" role="nSUat">
+                                      <ref role="3uigEE" to="ni5j:~PatternSyntaxException" resolve="PatternSyntaxException" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbS" id="55oOaAFoLaa" role="1zc67A">
+                                  <node concept="3clFbF" id="55oOaAFoPSk" role="3cqZAp">
+                                    <node concept="2OqwBi" id="55oOaAFoTlq" role="3clFbG">
+                                      <node concept="37vLTw" id="55oOaAFoPSj" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7ipIhbo0$sq" resolve="callback" />
+                                      </node>
+                                      <node concept="liA8E" id="55oOaAFoUTQ" role="2OqNvi">
+                                        <ref role="37wK5l" node="7ipIhbnXdL4" resolve="resultsReceived" />
+                                        <node concept="37vLTw" id="55oOaAFp0dN" role="37wK5m">
+                                          <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3cpWs6" id="55oOaAFriPo" role="3cqZAp" />
+                                </node>
+                              </node>
+                              <node concept="3clFbS" id="55oOaAFoJUP" role="1zxBo7">
+                                <node concept="3clFbJ" id="55oOaAFxofA" role="3cqZAp">
+                                  <node concept="3clFbS" id="55oOaAFxofC" role="3clFbx">
+                                    <node concept="3clFbF" id="55oOaAFp35u" role="3cqZAp">
+                                      <node concept="37vLTI" id="55oOaAFp6M6" role="3clFbG">
+                                        <node concept="2YIFZM" id="55oOaAFpfeZ" role="37vLTx">
+                                          <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String)" resolve="compile" />
+                                          <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
+                                          <node concept="37vLTw" id="55oOaAFph4T" role="37wK5m">
+                                            <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                          </node>
+                                        </node>
+                                        <node concept="37vLTw" id="55oOaAFp35t" role="37vLTJ">
+                                          <ref role="3cqZAo" node="55oOaAFo5N2" resolve="searchPattern" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="37vLTw" id="55oOaAFxq6E" role="3clFbw">
+                                    <ref role="3cqZAo" node="vqDSpav_e_" resolve="matchCase" />
+                                  </node>
+                                  <node concept="9aQIb" id="55oOaAFxwvS" role="9aQIa">
+                                    <node concept="3clFbS" id="55oOaAFxwvT" role="9aQI4">
+                                      <node concept="3clFbF" id="55oOaAFxxLI" role="3cqZAp">
+                                        <node concept="37vLTI" id="55oOaAFxxLJ" role="3clFbG">
+                                          <node concept="2YIFZM" id="55oOaAFxxLK" role="37vLTx">
+                                            <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String,int)" resolve="compile" />
+                                            <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
+                                            <node concept="37vLTw" id="55oOaAFxxLL" role="37wK5m">
+                                              <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
+                                            </node>
+                                            <node concept="10M0yZ" id="55oOaAFxByw" role="37wK5m">
+                                              <ref role="3cqZAo" to="ni5j:~Pattern.CASE_INSENSITIVE" resolve="CASE_INSENSITIVE" />
+                                              <ref role="1PxDUh" to="ni5j:~Pattern" resolve="Pattern" />
+                                            </node>
+                                          </node>
+                                          <node concept="37vLTw" id="55oOaAFxxLM" role="37vLTJ">
+                                            <ref role="3cqZAo" node="55oOaAFo5N2" resolve="searchPattern" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="55oOaAFoyxC" role="3clFbw">
+                            <ref role="3cqZAo" node="55oOaAFe4tW" resolve="matchRegex" />
+                          </node>
+                        </node>
                         <node concept="3cpWs8" id="vqDSp9YA8B" role="3cqZAp">
                           <node concept="3cpWsn" id="vqDSp9YA8E" role="3cpWs9">
                             <property role="TrG5h" value="modelIndex" />
@@ -4793,6 +5060,36 @@
                                                     <ref role="3cqZAo" node="vqDSpal5Zc" resolve="approximateSearch" />
                                                   </node>
                                                 </node>
+                                                <node concept="3eNFk2" id="55oOaAFfUsL" role="3eNLev">
+                                                  <node concept="37vLTw" id="55oOaAFfWWq" role="3eO9$A">
+                                                    <ref role="3cqZAo" node="55oOaAFe4tW" resolve="matchRegex" />
+                                                  </node>
+                                                  <node concept="3clFbS" id="55oOaAFfUsN" role="3eOfB_">
+                                                    <node concept="3clFbF" id="55oOaAFg4FK" role="3cqZAp">
+                                                      <node concept="37vLTI" id="55oOaAFgaer" role="3clFbG">
+                                                        <node concept="37vLTw" id="55oOaAFg4FJ" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="vqDSpakMW9" resolve="matches" />
+                                                        </node>
+                                                        <node concept="2OqwBi" id="55oOaAFpC$z" role="37vLTx">
+                                                          <node concept="2OqwBi" id="55oOaAFpqlj" role="2Oq$k0">
+                                                            <node concept="37vLTw" id="55oOaAFpmWF" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="55oOaAFo5N2" resolve="searchPattern" />
+                                                            </node>
+                                                            <node concept="liA8E" id="55oOaAFpzYG" role="2OqNvi">
+                                                              <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
+                                                              <node concept="37vLTw" id="55oOaAFp_OV" role="37wK5m">
+                                                                <ref role="3cqZAo" node="vqDSpaxuw5" resolve="name" />
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                          <node concept="liA8E" id="55oOaAFpEJg" role="2OqNvi">
+                                                            <ref role="37wK5l" to="ni5j:~Matcher.matches()" resolve="matches" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                                 <node concept="9aQIb" id="vqDSpaoC7B" role="9aQIa">
                                                   <node concept="3clFbS" id="vqDSpaoC7C" role="9aQI4">
                                                     <node concept="3clFbF" id="vqDSpanKS9" role="3cqZAp">
@@ -5190,6 +5487,36 @@
                                                 <node concept="37vLTw" id="vqDSpapcee" role="3clFbw">
                                                   <ref role="3cqZAo" node="vqDSpal5Zc" resolve="approximateSearch" />
                                                 </node>
+                                                <node concept="3eNFk2" id="55oOaAFfwM_" role="3eNLev">
+                                                  <node concept="37vLTw" id="55oOaAFfzQ6" role="3eO9$A">
+                                                    <ref role="3cqZAo" node="55oOaAFe4tW" resolve="matchRegex" />
+                                                  </node>
+                                                  <node concept="3clFbS" id="55oOaAFfwMB" role="3eOfB_">
+                                                    <node concept="3clFbF" id="55oOaAFfAAF" role="3cqZAp">
+                                                      <node concept="37vLTI" id="55oOaAFfGx3" role="3clFbG">
+                                                        <node concept="37vLTw" id="55oOaAFfAAE" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="vqDSpaoVca" resolve="matches" />
+                                                        </node>
+                                                        <node concept="2OqwBi" id="55oOaAFpOAB" role="37vLTx">
+                                                          <node concept="2OqwBi" id="55oOaAFpOAC" role="2Oq$k0">
+                                                            <node concept="37vLTw" id="55oOaAFpOAD" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="55oOaAFo5N2" resolve="searchPattern" />
+                                                            </node>
+                                                            <node concept="liA8E" id="55oOaAFpOAE" role="2OqNvi">
+                                                              <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
+                                                              <node concept="37vLTw" id="55oOaAFpURs" role="37wK5m">
+                                                                <ref role="3cqZAo" node="7DRyZmErI5e" resolve="pres" />
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                          <node concept="liA8E" id="55oOaAFpOAG" role="2OqNvi">
+                                                            <ref role="37wK5l" to="ni5j:~Matcher.matches()" resolve="matches" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                                 <node concept="9aQIb" id="vqDSpapJ3L" role="9aQIa">
                                                   <node concept="3clFbS" id="vqDSpapJ3M" role="9aQI4">
                                                     <node concept="3clFbF" id="vqDSpapLE7" role="3cqZAp">
@@ -5609,6 +5936,7 @@
       </node>
       <node concept="37vLTG" id="4Q2Vz3i$q7V" role="3clF46">
         <property role="TrG5h" value="text" />
+        <property role="3TUv4t" value="true" />
         <node concept="17QB3L" id="4Q2Vz3i$q7W" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="7DRyZmDozcG" role="3clF46">
@@ -5626,6 +5954,11 @@
         <property role="3TUv4t" value="true" />
         <node concept="10P_77" id="vqDSpavB4z" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="55oOaAFe4tW" role="3clF46">
+        <property role="3TUv4t" value="true" />
+        <property role="TrG5h" value="matchRegex" />
+        <node concept="10P_77" id="55oOaAFeaWR" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7ipIhbo0$sq" role="3clF46">
         <property role="TrG5h" value="callback" />
         <property role="3TUv4t" value="true" />
@@ -24352,6 +24685,14 @@
                   <ref role="37wK5l" node="vqDSpatSQl" resolve="isMatchCase" />
                 </node>
               </node>
+              <node concept="2OqwBi" id="55oOaAFf6M9" role="37wK5m">
+                <node concept="37vLTw" id="55oOaAFf4f9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="14DpnPo$XYM" resolve="viewer" />
+                </node>
+                <node concept="liA8E" id="55oOaAFfa4u" role="2OqNvi">
+                  <ref role="37wK5l" node="55oOaAFczTg" resolve="isMatchRegex" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -24361,5 +24702,163 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="55oOaAFbF8y">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchMatchRegexToggleAction" />
+    <node concept="2tJIrI" id="55oOaAFbF8z" role="jymVt" />
+    <node concept="2tJIrI" id="55oOaAFbF8$" role="jymVt" />
+    <node concept="3clFbW" id="55oOaAFbF8_" role="jymVt">
+      <node concept="3cqZAl" id="55oOaAFbF8A" role="3clF45" />
+      <node concept="3clFbS" id="55oOaAFbF8B" role="3clF47">
+        <node concept="XkiVB" id="55oOaAFbF8C" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~ToggleAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="ToggleAction" />
+          <node concept="Xl_RD" id="55oOaAFbF8D" role="37wK5m">
+            <property role="Xl_RC" value="Match Regular Expression" />
+          </node>
+          <node concept="Xl_RD" id="55oOaAFbF8E" role="37wK5m">
+            <property role="Xl_RC" value="Match by regular expression when searching" />
+          </node>
+          <node concept="10M0yZ" id="55oOaAFbHWw" role="37wK5m">
+            <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Regex" resolve="Regex" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="55oOaAFbF8G" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="55oOaAFbF8H" role="jymVt" />
+    <node concept="3Tm1VV" id="55oOaAFbF8I" role="1B3o_S" />
+    <node concept="3uibUv" id="55oOaAFbF8J" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+    </node>
+    <node concept="3clFb_" id="55oOaAFbF8K" role="jymVt">
+      <property role="TrG5h" value="isSelected" />
+      <node concept="3Tm1VV" id="55oOaAFbF8L" role="1B3o_S" />
+      <node concept="10P_77" id="55oOaAFbF8M" role="3clF45" />
+      <node concept="37vLTG" id="55oOaAFbF8N" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="55oOaAFbF8O" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="55oOaAFbF8P" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="55oOaAFbF8Q" role="3clF47">
+        <node concept="3cpWs8" id="55oOaAFbF8R" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAFbF8S" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="55oOaAFbF8T" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="55oOaAFbF8U" role="33vP2m">
+              <node concept="3uibUv" id="55oOaAFbF8V" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="55oOaAFbF8W" role="10QFUP">
+                <node concept="2EnYce" id="55oOaAFbF8X" role="2Oq$k0">
+                  <node concept="2OqwBi" id="55oOaAFbF8Y" role="2Oq$k0">
+                    <node concept="37vLTw" id="55oOaAFbF8Z" role="2Oq$k0">
+                      <ref role="3cqZAo" node="55oOaAFbF8N" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="55oOaAFbF90" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="55oOaAFbF91" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="55oOaAFbF92" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="55oOaAFbF93" role="3cqZAp">
+          <node concept="2EnYce" id="55oOaAFbF94" role="3clFbG">
+            <node concept="37vLTw" id="55oOaAFbF95" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAFbF8S" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="55oOaAFbF96" role="2OqNvi">
+              <ref role="37wK5l" node="55oOaAFczTg" resolve="isMatchRegex" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="55oOaAFbF97" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="55oOaAFbF98" role="jymVt" />
+    <node concept="3clFb_" id="55oOaAFbF99" role="jymVt">
+      <property role="TrG5h" value="setSelected" />
+      <node concept="3Tm1VV" id="55oOaAFbF9a" role="1B3o_S" />
+      <node concept="3cqZAl" id="55oOaAFbF9b" role="3clF45" />
+      <node concept="37vLTG" id="55oOaAFbF9c" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="55oOaAFbF9d" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+        <node concept="2AHcQZ" id="55oOaAFbF9e" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="55oOaAFbF9f" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="55oOaAFbF9g" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="55oOaAFbF9h" role="3clF47">
+        <node concept="3cpWs8" id="55oOaAFbF9i" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAFbF9j" role="3cpWs9">
+            <property role="TrG5h" value="viewer" />
+            <node concept="3uibUv" id="55oOaAFbF9k" role="1tU5fm">
+              <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+            </node>
+            <node concept="10QFUN" id="55oOaAFbF9l" role="33vP2m">
+              <node concept="3uibUv" id="55oOaAFbF9m" role="10QFUM">
+                <ref role="3uigEE" node="2HzhasNzNEW" resolve="SearchViewer" />
+              </node>
+              <node concept="2EnYce" id="55oOaAFbF9n" role="10QFUP">
+                <node concept="2EnYce" id="55oOaAFbF9o" role="2Oq$k0">
+                  <node concept="2EnYce" id="55oOaAFbF9p" role="2Oq$k0">
+                    <node concept="37vLTw" id="55oOaAFbF9q" role="2Oq$k0">
+                      <ref role="3cqZAo" node="55oOaAFbF9c" resolve="event" />
+                    </node>
+                    <node concept="liA8E" id="55oOaAFbF9r" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.getProject()" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="LR4U6" id="55oOaAFbF9s" role="2OqNvi">
+                    <ref role="LR4U5" node="2HzhasNzNDO" resolve="MbeddrSearchViewer" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="55oOaAFbF9t" role="2OqNvi">
+                  <ref role="37wK5l" to="71xd:~BaseTool.getComponent()" resolve="getComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="55oOaAFbF9u" role="3cqZAp">
+          <node concept="2EnYce" id="55oOaAFbF9v" role="3clFbG">
+            <node concept="37vLTw" id="55oOaAFbF9w" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAFbF9j" resolve="viewer" />
+            </node>
+            <node concept="liA8E" id="55oOaAFbF9x" role="2OqNvi">
+              <ref role="37wK5l" node="55oOaAFczTn" resolve="toggleMatchRegex" />
+              <node concept="37vLTw" id="55oOaAFbF9y" role="37wK5m">
+                <ref role="3cqZAo" node="55oOaAFbF9f" resolve="flag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="55oOaAFbF9z" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 979ae7f20c3b0b57327c30daa263fc5de8a923b8 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 11:26:31 +0100
Subject: [PATCH 28/38] core.base: search the orginal text when the node
 implements ISearchSupport

---
 .../models/com/mbeddr/core/base/pluginSolution/plugin.mps     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 5355b824f33..0726586f5d9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -4901,8 +4901,8 @@
                                               </node>
                                               <node concept="2qgKlT" id="7DRyZmEC7tF" role="2OqNvi">
                                                 <ref role="37wK5l" to="hwgx:jpyKDg1onB" resolve="containsText" />
-                                                <node concept="37vLTw" id="7DRyZmEC7tG" role="37wK5m">
-                                                  <ref role="3cqZAo" node="vqDSpavrgI" resolve="textToSearch" />
+                                                <node concept="37vLTw" id="55oOaAFzvQX" role="37wK5m">
+                                                  <ref role="3cqZAo" node="4Q2Vz3i$q7V" resolve="text" />
                                                 </node>
                                               </node>
                                             </node>

From a332712c445c28211896a0b13b2f5914f60f49a7 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 11:34:33 +0100
Subject: [PATCH 29/38] core.base: generate a better default namespace for
 search results

---
 .../models/com/mbeddr/platform/build.mps      |   5 +
 .../languageModels/behavior.mps               |  55 --
 .../languages/com.mbeddr.core.base/base.mpl   |   2 +
 .../languageModels/behavior.mps               |  90 +--
 .../core/base/pluginSolution/plugin.mps       | 547 +++++++++++-------
 .../languageModels/behavior.mps               |  35 +-
 .../languageModels/behavior.mps               | 375 +++---------
 7 files changed, 449 insertions(+), 660 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index 4aad44f7fb9..cd0d88aea69 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -15427,6 +15427,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1SiIV0" id="55oOaAG4FTH" role="3bR37C">
+          <node concept="3bR9La" id="55oOaAG4FTI" role="1SiIV1">
+            <ref role="3bR37D" node="$bJ0jguQdz" resolve="com.mbeddr.core.base.pluginSolution" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Nsh5Tc2mTg" role="3989C9">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
index 631378d4552..5db2543ce70 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
@@ -267,7 +267,6 @@
       <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
       <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -2960,60 +2959,6 @@
       </node>
       <node concept="17QB3L" id="5MaVmNI5y3E" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="5MaVmNI5CU2" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultNamespace" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="5MaVmNI5CU3" role="1B3o_S" />
-      <node concept="3clFbS" id="5MaVmNI5CU6" role="3clF47">
-        <node concept="3cpWs8" id="1ki5dbA8JW3" role="3cqZAp">
-          <node concept="3cpWsn" id="1ki5dbA8JW4" role="3cpWs9">
-            <property role="TrG5h" value="r" />
-            <node concept="3Tqbb2" id="1ki5dbA8JW0" role="1tU5fm" />
-            <node concept="2OqwBi" id="1ki5dbA8JW5" role="33vP2m">
-              <node concept="13iPFW" id="1ki5dbA8JW6" role="2Oq$k0" />
-              <node concept="2Rxl7S" id="1ki5dbA8JW7" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="1ki5dbA8JUr" role="3cqZAp">
-          <node concept="3clFbS" id="1ki5dbA8JUu" role="3clFbx">
-            <node concept="3cpWs6" id="1ki5dbA8KxP" role="3cqZAp">
-              <node concept="2OqwBi" id="1ki5dbA8KNH" role="3cqZAk">
-                <node concept="1PxgMI" id="1ki5dbA8KGc" role="2Oq$k0">
-                  <node concept="chp4Y" id="79i$vAY5OOo" role="3oSUPX">
-                    <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                  </node>
-                  <node concept="37vLTw" id="1ki5dbA8KB_" role="1m5AlR">
-                    <ref role="3cqZAo" node="1ki5dbA8JW4" resolve="r" />
-                  </node>
-                </node>
-                <node concept="3TrcHB" id="1ki5dbA8LwA" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="1ki5dbA8K2v" role="3clFbw">
-            <node concept="37vLTw" id="1ki5dbA8JZO" role="2Oq$k0">
-              <ref role="3cqZAo" node="1ki5dbA8JW4" resolve="r" />
-            </node>
-            <node concept="1mIQ4w" id="1ki5dbA8Kv$" role="2OqNvi">
-              <node concept="chp4Y" id="1ki5dbA8KwD" role="cj9EA">
-                <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5MaVmNI5DkK" role="3cqZAp">
-          <node concept="Xl_RD" id="1ki5dbA8L$I" role="3clFbG">
-            <property role="Xl_RC" value="" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="5MaVmNI5CU7" role="3clF45" />
-    </node>
     <node concept="13i0hz" id="5jmmCdx$f5W" role="13h7CS">
       <property role="TrG5h" value="isStaticallyEvaluatable" />
       <ref role="13i0hy" to="ywuz:3ilck8Kr3zN" resolve="isStaticallyEvaluatable" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
index 265ed4b6de1..56a3238edc9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
@@ -108,6 +108,7 @@
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
     <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -185,6 +186,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
+    <module reference="9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 075f931493a..7d6853a0f02 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -69,6 +69,7 @@
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
     <import index="z1c5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="d244" ref="r:0a882e21-5553-485b-8777-3b0ace5a0d84(com.mbeddr.core.base.pluginSolution.plugin)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
@@ -1134,74 +1135,15 @@
           </node>
         </node>
         <node concept="3cpWs6" id="4ueXZrqtwHb" role="3cqZAp">
-          <node concept="Xl_RD" id="4ueXZrqtwHd" role="3cqZAk">
-            <property role="Xl_RC" value="&lt;documentation&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="4ueXZrqtwC1" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="4ueXZrqtwC2" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" node="jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="4ueXZrqtwC3" role="1B3o_S" />
-      <node concept="3clFbS" id="4ueXZrqtwC4" role="3clF47">
-        <node concept="3clFbJ" id="4ueXZrqtwHe" role="3cqZAp">
-          <node concept="3clFbS" id="4ueXZrqtwHf" role="3clFbx">
-            <node concept="3cpWs6" id="4ueXZrqtwHg" role="3cqZAp">
-              <node concept="2OqwBi" id="4ueXZrqtwHh" role="3cqZAk">
-                <node concept="1PxgMI" id="4ueXZrqtwHi" role="2Oq$k0">
-                  <node concept="chp4Y" id="79i$vAY5P5s" role="3oSUPX">
-                    <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                  </node>
-                  <node concept="2OqwBi" id="4ueXZrqtwHj" role="1m5AlR">
-                    <node concept="13iPFW" id="4ueXZrqtwHk" role="2Oq$k0" />
-                    <node concept="1mfA1w" id="4ueXZrqtwHl" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="6wvhQs7nAwi" role="2OqNvi">
-                  <ref role="37wK5l" node="4JF77iuPCMH" resolve="qualifiedName" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="4ueXZrqtwHn" role="3clFbw">
-            <node concept="2OqwBi" id="4ueXZrqtwHo" role="2Oq$k0">
-              <node concept="13iPFW" id="4ueXZrqtwHp" role="2Oq$k0" />
-              <node concept="1mfA1w" id="4ueXZrqtwHq" role="2OqNvi" />
-            </node>
-            <node concept="1mIQ4w" id="4ueXZrqtwHr" role="2OqNvi">
-              <node concept="chp4Y" id="4ueXZrqtwHs" role="cj9EA">
-                <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-              </node>
-            </node>
-          </node>
-          <node concept="9aQIb" id="4ueXZrqtwHw" role="9aQIa">
-            <node concept="3clFbS" id="4ueXZrqtwHx" role="9aQI4">
-              <node concept="3cpWs6" id="4ueXZrqtwHy" role="3cqZAp">
-                <node concept="2OqwBi" id="jpyKDg34h6" role="3cqZAk">
-                  <node concept="2OqwBi" id="jpyKDg34h7" role="2Oq$k0">
-                    <node concept="13iPFW" id="jpyKDg34h8" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="jpyKDg34h9" role="2OqNvi">
-                      <node concept="1xMEDy" id="jpyKDg34ha" role="1xVPHs">
-                        <node concept="chp4Y" id="jpyKDg34hb" role="ri$Ld">
-                          <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="6wvhQs7nAwk" role="2OqNvi">
-                    <ref role="37wK5l" node="6wvhQs7n_YM" resolve="namespace" />
-                  </node>
-                </node>
-              </node>
+          <node concept="2OqwBi" id="55oOaAF$R5c" role="3cqZAk">
+            <node concept="13iPFW" id="55oOaAF$QMb" role="2Oq$k0" />
+            <node concept="2qgKlT" id="55oOaAF_1Rr" role="2OqNvi">
+              <ref role="37wK5l" to="tpcu:fB3l80ylIb" resolve="getTextualRepresentation" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="4ueXZrqtwC5" role="3clF45" />
+      <node concept="17QB3L" id="4ueXZrqtwC1" role="3clF45" />
     </node>
     <node concept="13i0hz" id="BsHjoDSP5B" role="13h7CS">
       <property role="TrG5h" value="getTextColor" />
@@ -2486,12 +2428,28 @@
       <node concept="3clFbS" id="jpyKDg1pW8" role="3clF47" />
     </node>
     <node concept="13i0hz" id="jpyKDg2TXB" role="13h7CS">
-      <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />
       <property role="TrG5h" value="resultNamespace" />
       <node concept="3Tm1VV" id="jpyKDg2TXC" role="1B3o_S" />
       <node concept="17QB3L" id="jpyKDg2TXD" role="3clF45" />
-      <node concept="3clFbS" id="jpyKDg2TXE" role="3clF47" />
+      <node concept="3clFbS" id="jpyKDg2TXE" role="3clF47">
+        <node concept="3SKdUt" id="55oOaAG4QOO" role="3cqZAp">
+          <node concept="1PaTwC" id="55oOaAG4QOP" role="1aUNEU">
+            <node concept="3oM_SD" id="55oOaAG4Rli" role="1PaTwD">
+              <property role="3oM_SC" value="delegate" />
+            </node>
+            <node concept="3oM_SD" id="55oOaAG4Rlj" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="55oOaAG5XHN" role="1PaTwD">
+              <property role="3oM_SC" value="SearchEngine#getNameSpace" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="55oOaAG4PP6" role="3cqZAp">
+          <node concept="10Nm6u" id="55oOaAG4PP5" role="3clFbG" />
+        </node>
+      </node>
     </node>
     <node concept="13hLZK" id="jpyKDg1on_" role="13h7CW">
       <node concept="3clFbS" id="jpyKDg1onA" role="2VODD2" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 0726586f5d9..7ecf69f8aa2 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -682,7 +682,9 @@
       <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
         <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -4867,12 +4869,10 @@
                                                                 <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
                                                               </node>
                                                             </node>
-                                                            <node concept="2OqwBi" id="7DRyZmEC7tA" role="37wK5m">
-                                                              <node concept="37vLTw" id="7DRyZmEC7tB" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="7DRyZmEC7t5" resolve="iss" />
-                                                              </node>
-                                                              <node concept="2qgKlT" id="7DRyZmEC7tC" role="2OqNvi">
-                                                                <ref role="37wK5l" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
+                                                            <node concept="1rXfSq" id="55oOaAFRBto" role="37wK5m">
+                                                              <ref role="37wK5l" node="55oOaAFWQ33" resolve="getNameSpace" />
+                                                              <node concept="37vLTw" id="55oOaAFRHFa" role="37wK5m">
+                                                                <ref role="3cqZAo" node="7DRyZmEC7td" resolve="resultNode" />
                                                               </node>
                                                             </node>
                                                           </node>
@@ -5125,121 +5125,6 @@
                                             <node concept="3clFbS" id="7DRyZmECiBy" role="3clFbx">
                                               <node concept="3clFbJ" id="7DRyZmECiBz" role="3cqZAp">
                                                 <node concept="3clFbS" id="7DRyZmECiB$" role="3clFbx">
-                                                  <node concept="3cpWs8" id="7DRyZmECiB_" role="3cqZAp">
-                                                    <node concept="3cpWsn" id="7DRyZmECiBA" role="3cpWs9">
-                                                      <property role="TrG5h" value="ns" />
-                                                      <node concept="17QB3L" id="7DRyZmECiBB" role="1tU5fm" />
-                                                      <node concept="Xl_RD" id="7DRyZmECiBC" role="33vP2m">
-                                                        <property role="Xl_RC" value="" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                  <node concept="3clFbJ" id="7DRyZmECiBD" role="3cqZAp">
-                                                    <node concept="3clFbS" id="7DRyZmECiBE" role="3clFbx">
-                                                      <node concept="3clFbF" id="7DRyZmECiBF" role="3cqZAp">
-                                                        <node concept="37vLTI" id="7DRyZmECiBG" role="3clFbG">
-                                                          <node concept="37vLTw" id="7DRyZmECiBH" role="37vLTJ">
-                                                            <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
-                                                          </node>
-                                                          <node concept="2OqwBi" id="7DRyZmECiBI" role="37vLTx">
-                                                            <node concept="1PxgMI" id="7DRyZmECiBJ" role="2Oq$k0">
-                                                              <node concept="2GrUjf" id="7DRyZmECiBK" role="1m5AlR">
-                                                                <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                              </node>
-                                                              <node concept="chp4Y" id="7DRyZmECiBL" role="3oSUPX">
-                                                                <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                                                              </node>
-                                                            </node>
-                                                            <node concept="2qgKlT" id="7DRyZmECiBM" role="2OqNvi">
-                                                              <ref role="37wK5l" to="hwgx:6wvhQs7n_YM" resolve="namespace" />
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                    <node concept="2OqwBi" id="7DRyZmECiBN" role="3clFbw">
-                                                      <node concept="2GrUjf" id="7DRyZmECiBO" role="2Oq$k0">
-                                                        <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                      </node>
-                                                      <node concept="1mIQ4w" id="7DRyZmECiBP" role="2OqNvi">
-                                                        <node concept="chp4Y" id="7DRyZmECiBQ" role="cj9EA">
-                                                          <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                    <node concept="9aQIb" id="7DRyZmECiBR" role="9aQIa">
-                                                      <node concept="3clFbS" id="7DRyZmECiBS" role="9aQI4">
-                                                        <node concept="3cpWs8" id="7DRyZmECiBT" role="3cqZAp">
-                                                          <node concept="3cpWsn" id="7DRyZmECiBU" role="3cpWs9">
-                                                            <property role="TrG5h" value="ancestor" />
-                                                            <node concept="3Tqbb2" id="7DRyZmECiBV" role="1tU5fm">
-                                                              <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                            </node>
-                                                            <node concept="2OqwBi" id="7DRyZmECiBW" role="33vP2m">
-                                                              <node concept="2GrUjf" id="7DRyZmECiBX" role="2Oq$k0">
-                                                                <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                              </node>
-                                                              <node concept="2Xjw5R" id="7DRyZmECiBY" role="2OqNvi">
-                                                                <node concept="1xMEDy" id="7DRyZmECiBZ" role="1xVPHs">
-                                                                  <node concept="chp4Y" id="7DRyZmECiC0" role="ri$Ld">
-                                                                    <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                                  </node>
-                                                                </node>
-                                                              </node>
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                        <node concept="3clFbJ" id="7DRyZmECiC1" role="3cqZAp">
-                                                          <node concept="3clFbS" id="7DRyZmECiC2" role="3clFbx">
-                                                            <node concept="3clFbF" id="7DRyZmECiC3" role="3cqZAp">
-                                                              <node concept="37vLTI" id="7DRyZmECiC4" role="3clFbG">
-                                                                <node concept="37vLTw" id="7DRyZmECiC5" role="37vLTJ">
-                                                                  <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
-                                                                </node>
-                                                                <node concept="3cpWs3" id="7DRyZmECiC6" role="37vLTx">
-                                                                  <node concept="Xl_RD" id="7DRyZmECiC7" role="3uHU7w">
-                                                                    <property role="Xl_RC" value="]" />
-                                                                  </node>
-                                                                  <node concept="3cpWs3" id="7DRyZmECiC8" role="3uHU7B">
-                                                                    <node concept="3cpWs3" id="7DRyZmECiC9" role="3uHU7B">
-                                                                      <node concept="2OqwBi" id="7DRyZmECiCa" role="3uHU7B">
-                                                                        <node concept="37vLTw" id="7DRyZmECiCb" role="2Oq$k0">
-                                                                          <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
-                                                                        </node>
-                                                                        <node concept="3TrcHB" id="7DRyZmECiCc" role="2OqNvi">
-                                                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                                        </node>
-                                                                      </node>
-                                                                      <node concept="Xl_RD" id="7DRyZmECiCd" role="3uHU7w">
-                                                                        <property role="Xl_RC" value=" [" />
-                                                                      </node>
-                                                                    </node>
-                                                                    <node concept="2OqwBi" id="7DRyZmECiCe" role="3uHU7w">
-                                                                      <node concept="2OqwBi" id="7DRyZmECiCf" role="2Oq$k0">
-                                                                        <node concept="37vLTw" id="7DRyZmECiCg" role="2Oq$k0">
-                                                                          <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
-                                                                        </node>
-                                                                        <node concept="2yIwOk" id="7DRyZmECiCh" role="2OqNvi" />
-                                                                      </node>
-                                                                      <node concept="liA8E" id="7DRyZmECiCi" role="2OqNvi">
-                                                                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
-                                                                      </node>
-                                                                    </node>
-                                                                  </node>
-                                                                </node>
-                                                              </node>
-                                                            </node>
-                                                          </node>
-                                                          <node concept="3y3z36" id="7DRyZmECiCj" role="3clFbw">
-                                                            <node concept="10Nm6u" id="7DRyZmECiCk" role="3uHU7w" />
-                                                            <node concept="37vLTw" id="7DRyZmECiCl" role="3uHU7B">
-                                                              <ref role="3cqZAo" node="7DRyZmECiBU" resolve="ancestor" />
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                  </node>
                                                   <node concept="3clFbJ" id="7DRyZmEDFGj" role="3cqZAp">
                                                     <node concept="3clFbS" id="7DRyZmEDFGl" role="3clFbx">
                                                       <node concept="3clFbF" id="7DRyZmEE0d7" role="3cqZAp">
@@ -5288,8 +5173,11 @@
                                                                   <ref role="3cqZAo" node="7DRyZmECiBs" resolve="in" />
                                                                 </node>
                                                               </node>
-                                                              <node concept="37vLTw" id="7DRyZmECiC$" role="37wK5m">
-                                                                <ref role="3cqZAo" node="7DRyZmECiBA" resolve="ns" />
+                                                              <node concept="1rXfSq" id="55oOaAFRxLP" role="37wK5m">
+                                                                <ref role="37wK5l" node="55oOaAFWQ33" resolve="getNameSpace" />
+                                                                <node concept="2GrUjf" id="55oOaAFRxLQ" role="37wK5m">
+                                                                  <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                                </node>
                                                               </node>
                                                             </node>
                                                           </node>
@@ -5544,83 +5432,6 @@
                                                 <node concept="3clFbS" id="7DRyZmErcIk" role="3clFbx">
                                                   <node concept="3clFbJ" id="7DRyZmEra8u" role="3cqZAp">
                                                     <node concept="3clFbS" id="7DRyZmEra8v" role="3clFbx">
-                                                      <node concept="3cpWs8" id="7DRyZmEyd9r" role="3cqZAp">
-                                                        <node concept="3cpWsn" id="7DRyZmEyd9s" role="3cpWs9">
-                                                          <property role="TrG5h" value="ancestor" />
-                                                          <node concept="3Tqbb2" id="7DRyZmEyd7n" role="1tU5fm">
-                                                            <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                          </node>
-                                                          <node concept="2OqwBi" id="7DRyZmEyd9t" role="33vP2m">
-                                                            <node concept="2GrUjf" id="7DRyZmEyd9u" role="2Oq$k0">
-                                                              <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
-                                                            </node>
-                                                            <node concept="2Xjw5R" id="7DRyZmEyd9v" role="2OqNvi">
-                                                              <node concept="1xMEDy" id="7DRyZmEyd9w" role="1xVPHs">
-                                                                <node concept="chp4Y" id="7DRyZmEyd9x" role="ri$Ld">
-                                                                  <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                                                </node>
-                                                              </node>
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                      <node concept="3cpWs8" id="7DRyZmEAuJu" role="3cqZAp">
-                                                        <node concept="3cpWsn" id="7DRyZmEAuJv" role="3cpWs9">
-                                                          <property role="TrG5h" value="ns" />
-                                                          <node concept="17QB3L" id="7DRyZmEAuJw" role="1tU5fm" />
-                                                          <node concept="Xl_RD" id="7DRyZmEButI" role="33vP2m">
-                                                            <property role="Xl_RC" value="" />
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                      <node concept="3clFbJ" id="7DRyZmEAods" role="3cqZAp">
-                                                        <node concept="3clFbS" id="7DRyZmEAodu" role="3clFbx">
-                                                          <node concept="3clFbF" id="7DRyZmEAHJF" role="3cqZAp">
-                                                            <node concept="37vLTI" id="7DRyZmEAJwS" role="3clFbG">
-                                                              <node concept="37vLTw" id="7DRyZmEAHJD" role="37vLTJ">
-                                                                <ref role="3cqZAo" node="7DRyZmEAuJv" resolve="ns" />
-                                                              </node>
-                                                              <node concept="3cpWs3" id="7DRyZmEytqZ" role="37vLTx">
-                                                                <node concept="Xl_RD" id="7DRyZmEytS9" role="3uHU7w">
-                                                                  <property role="Xl_RC" value="]" />
-                                                                </node>
-                                                                <node concept="3cpWs3" id="7DRyZmEyiKD" role="3uHU7B">
-                                                                  <node concept="3cpWs3" id="7DRyZmEyeyY" role="3uHU7B">
-                                                                    <node concept="2OqwBi" id="7DRyZmErxit" role="3uHU7B">
-                                                                      <node concept="37vLTw" id="7DRyZmEyd9y" role="2Oq$k0">
-                                                                        <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
-                                                                      </node>
-                                                                      <node concept="3TrcHB" id="7DRyZmEryhk" role="2OqNvi">
-                                                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                                                      </node>
-                                                                    </node>
-                                                                    <node concept="Xl_RD" id="7DRyZmEyf08" role="3uHU7w">
-                                                                      <property role="Xl_RC" value=" [" />
-                                                                    </node>
-                                                                  </node>
-                                                                  <node concept="2OqwBi" id="7DRyZmEyp6j" role="3uHU7w">
-                                                                    <node concept="2OqwBi" id="7DRyZmEymKz" role="2Oq$k0">
-                                                                      <node concept="37vLTw" id="7DRyZmEykVK" role="2Oq$k0">
-                                                                        <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
-                                                                      </node>
-                                                                      <node concept="2yIwOk" id="7DRyZmEynZT" role="2OqNvi" />
-                                                                    </node>
-                                                                    <node concept="liA8E" id="7DRyZmEyq_m" role="2OqNvi">
-                                                                      <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
-                                                                    </node>
-                                                                  </node>
-                                                                </node>
-                                                              </node>
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                        <node concept="3y3z36" id="7DRyZmEArLV" role="3clFbw">
-                                                          <node concept="10Nm6u" id="7DRyZmEAtuw" role="3uHU7w" />
-                                                          <node concept="37vLTw" id="7DRyZmEAqpC" role="3uHU7B">
-                                                            <ref role="3cqZAo" node="7DRyZmEyd9s" resolve="ancestor" />
-                                                          </node>
-                                                        </node>
-                                                      </node>
                                                       <node concept="3cpWs8" id="7DRyZmErRzj" role="3cqZAp">
                                                         <node concept="3cpWsn" id="7DRyZmErRzm" role="3cpWs9">
                                                           <property role="TrG5h" value="label" />
@@ -5673,8 +5484,11 @@
                                                                       <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
                                                                     </node>
                                                                   </node>
-                                                                  <node concept="37vLTw" id="7DRyZmEra90" role="37wK5m">
-                                                                    <ref role="3cqZAo" node="7DRyZmEAuJv" resolve="ns" />
+                                                                  <node concept="1rXfSq" id="55oOaAFQJLi" role="37wK5m">
+                                                                    <ref role="37wK5l" node="55oOaAFWQ33" resolve="getNameSpace" />
+                                                                    <node concept="2GrUjf" id="55oOaAFQO3h" role="37wK5m">
+                                                                      <ref role="2Gs0qQ" node="7DRyZmDp$pR" resolve="it" />
+                                                                    </node>
                                                                   </node>
                                                                 </node>
                                                               </node>
@@ -5918,6 +5732,7 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="2tJIrI" id="55oOaAFLnM8" role="jymVt" />
                   </node>
                 </node>
               </node>
@@ -5925,6 +5740,7 @@
           </node>
         </node>
         <node concept="3clFbH" id="4Q2Vz3i$q7N" role="3cqZAp" />
+        <node concept="3clFbH" id="55oOaAFZpDS" role="3cqZAp" />
       </node>
       <node concept="3cqZAl" id="4Q2Vz3iAja2" role="3clF45" />
       <node concept="37vLTG" id="4Q2Vz3i$q7T" role="3clF46">
@@ -5967,6 +5783,331 @@
         </node>
       </node>
     </node>
+    <node concept="2YIFZL" id="55oOaAFWQ33" role="jymVt">
+      <property role="TrG5h" value="getNameSpace" />
+      <node concept="3clFbS" id="55oOaAFWQ35" role="3clF47">
+        <node concept="3cpWs8" id="55oOaAFWQ36" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAFWQ37" role="3cpWs9">
+            <property role="TrG5h" value="nameSpaceSupport" />
+            <node concept="17QB3L" id="55oOaAFWQ38" role="1tU5fm" />
+            <node concept="2OqwBi" id="55oOaAFWQ39" role="33vP2m">
+              <node concept="1PxgMI" id="55oOaAFWQ3a" role="2Oq$k0">
+                <property role="1BlNFB" value="true" />
+                <node concept="chp4Y" id="55oOaAFWQ3b" role="3oSUPX">
+                  <ref role="cht4Q" to="vs0r:jpyKDg1onz" resolve="ISearchSupport" />
+                </node>
+                <node concept="37vLTw" id="55oOaAFWQ3c" role="1m5AlR">
+                  <ref role="3cqZAo" node="55oOaAFWQ57" resolve="node" />
+                </node>
+              </node>
+              <node concept="2qgKlT" id="55oOaAFWQ3d" role="2OqNvi">
+                <ref role="37wK5l" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="55oOaAFWQ3e" role="3cqZAp">
+          <node concept="3clFbS" id="55oOaAFWQ3f" role="3clFbx">
+            <node concept="3cpWs6" id="55oOaAFWQ3g" role="3cqZAp">
+              <node concept="37vLTw" id="55oOaAFWQ3h" role="3cqZAk">
+                <ref role="3cqZAo" node="55oOaAFWQ37" resolve="nameSpaceSupport" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="55oOaAFWQ3i" role="3clFbw">
+            <node concept="37vLTw" id="55oOaAFWQ3j" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAFWQ37" resolve="nameSpaceSupport" />
+            </node>
+            <node concept="17RvpY" id="55oOaAFWQ3k" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="55oOaAG3t5r" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAG3t5s" role="3cpWs9">
+            <property role="TrG5h" value="namedConcept" />
+            <node concept="3Tqbb2" id="55oOaAG3kz6" role="1tU5fm">
+              <ref role="ehGHo" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
+            </node>
+            <node concept="2OqwBi" id="55oOaAG3t5t" role="33vP2m">
+              <node concept="37vLTw" id="55oOaAG3t5u" role="2Oq$k0">
+                <ref role="3cqZAo" node="55oOaAFWQ57" resolve="node" />
+              </node>
+              <node concept="2Xjw5R" id="55oOaAG3t5v" role="2OqNvi">
+                <node concept="1xMEDy" id="55oOaAG3t5w" role="1xVPHs">
+                  <node concept="chp4Y" id="55oOaAG3t5x" role="ri$Ld">
+                    <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
+                  </node>
+                </node>
+                <node concept="1xIGOp" id="55oOaAG3t5y" role="1xVPHs" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="55oOaAFWQ3l" role="3cqZAp">
+          <node concept="3clFbS" id="55oOaAFWQ3m" role="3clFbx">
+            <node concept="3clFbF" id="55oOaAFWQ3n" role="3cqZAp">
+              <node concept="37vLTI" id="55oOaAFWQ3o" role="3clFbG">
+                <node concept="2OqwBi" id="55oOaAFWQ3p" role="37vLTx">
+                  <node concept="2qgKlT" id="55oOaAFWQ3t" role="2OqNvi">
+                    <ref role="37wK5l" to="hwgx:6wvhQs7n_YM" resolve="namespace" />
+                  </node>
+                  <node concept="37vLTw" id="55oOaAG3xkZ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="55oOaAG3t5s" resolve="namedConcepted" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="55oOaAFWQ3u" role="37vLTJ">
+                  <ref role="3cqZAo" node="55oOaAFWQ37" resolve="nameSpaceSupport" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="55oOaAG3hTM" role="3clFbw">
+            <node concept="37vLTw" id="55oOaAG3t5z" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAG3t5s" resolve="ancestor" />
+            </node>
+            <node concept="3x8VRR" id="55oOaAG3jN7" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="55oOaAFWQ3z" role="3cqZAp">
+          <node concept="3clFbS" id="55oOaAFWQ3$" role="3clFbx">
+            <node concept="3cpWs6" id="55oOaAFWQ3_" role="3cqZAp">
+              <node concept="37vLTw" id="55oOaAFWQ3A" role="3cqZAk">
+                <ref role="3cqZAo" node="55oOaAFWQ37" resolve="nameSpaceSupport" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="55oOaAFWQ3B" role="3clFbw">
+            <node concept="37vLTw" id="55oOaAFWQ3C" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAFWQ37" resolve="nameSpaceSupport" />
+            </node>
+            <node concept="17RvpY" id="55oOaAFWQ3D" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="55oOaAFWQ3E" role="3cqZAp" />
+        <node concept="3cpWs8" id="55oOaAFWQ3F" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAFWQ3G" role="3cpWs9">
+            <property role="TrG5h" value="nameSpace" />
+            <node concept="3uibUv" id="55oOaAFWQ3H" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+            </node>
+            <node concept="2ShNRf" id="55oOaAFWQ3I" role="33vP2m">
+              <node concept="1pGfFk" id="55oOaAFWQ3J" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;()" resolve="StringBuilder" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="55oOaAFWQ3K" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAFWQ3L" role="3cpWs9">
+            <property role="TrG5h" value="model" />
+            <node concept="H_c77" id="55oOaAFWQ3M" role="1tU5fm" />
+            <node concept="2OqwBi" id="55oOaAFWQ3N" role="33vP2m">
+              <node concept="37vLTw" id="55oOaAFWQ3O" role="2Oq$k0">
+                <ref role="3cqZAo" node="55oOaAFWQ57" resolve="node" />
+              </node>
+              <node concept="I4A8Y" id="55oOaAFWQ3P" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="55oOaAFWQ3Q" role="3cqZAp">
+          <node concept="3clFbS" id="55oOaAFWQ3R" role="3clFbx">
+            <node concept="3clFbF" id="55oOaAFWQ3S" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ3T" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ3U" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ3V" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="2YIFZM" id="55oOaAFWQ3W" role="37wK5m">
+                    <ref role="37wK5l" to="18ew:~NameUtil.compactModelName(org.jetbrains.mps.openapi.model.SModelReference)" resolve="compactModelName" />
+                    <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
+                    <node concept="2OqwBi" id="55oOaAFWQ3X" role="37wK5m">
+                      <node concept="2JrnkZ" id="55oOaAFWQ3Y" role="2Oq$k0">
+                        <node concept="2OqwBi" id="55oOaAFWQ3Z" role="2JrQYb">
+                          <node concept="37vLTw" id="55oOaAFWQ40" role="2Oq$k0">
+                            <ref role="3cqZAo" node="55oOaAFWQ57" resolve="node" />
+                          </node>
+                          <node concept="I4A8Y" id="55oOaAFWQ41" role="2OqNvi" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="55oOaAFWQ42" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="55oOaAFWQ43" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ44" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ45" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ46" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="Xl_RD" id="55oOaAFWQ47" role="37wK5m">
+                    <property role="Xl_RC" value="." />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="55oOaAFWQ48" role="3clFbw">
+            <node concept="37vLTw" id="55oOaAFWQ49" role="3uHU7B">
+              <ref role="3cqZAo" node="55oOaAFWQ3L" resolve="model" />
+            </node>
+            <node concept="10Nm6u" id="55oOaAFWQ4a" role="3uHU7w" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="55oOaAFWQ4b" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFWQ4c" role="3clFbG">
+            <node concept="37vLTw" id="55oOaAFWQ4d" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+            </node>
+            <node concept="liA8E" id="55oOaAFWQ4e" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+              <node concept="2OqwBi" id="55oOaAFWQ4f" role="37wK5m">
+                <node concept="2JrnkZ" id="55oOaAFWQ4g" role="2Oq$k0">
+                  <node concept="2OqwBi" id="55oOaAFWQ4h" role="2JrQYb">
+                    <node concept="37vLTw" id="55oOaAFWQ4i" role="2Oq$k0">
+                      <ref role="3cqZAo" node="55oOaAFWQ57" resolve="node" />
+                    </node>
+                    <node concept="2Rxl7S" id="55oOaAFWQ4j" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ4k" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getName()" resolve="getName" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="55oOaAFWQ4l" role="3cqZAp">
+          <node concept="3cpWsn" id="55oOaAFWQ4m" role="3cpWs9">
+            <property role="TrG5h" value="ancestor" />
+            <node concept="3Tqbb2" id="55oOaAFWQ4n" role="1tU5fm">
+              <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+            </node>
+            <node concept="2OqwBi" id="55oOaAFWQ4o" role="33vP2m">
+              <node concept="37vLTw" id="55oOaAFWQ4p" role="2Oq$k0">
+                <ref role="3cqZAo" node="55oOaAFWQ57" resolve="node" />
+              </node>
+              <node concept="2Xjw5R" id="55oOaAFWQ4q" role="2OqNvi">
+                <node concept="1xMEDy" id="55oOaAFWQ4r" role="1xVPHs">
+                  <node concept="chp4Y" id="55oOaAFWQ4s" role="ri$Ld">
+                    <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="55oOaAFWQ4t" role="3cqZAp">
+          <node concept="3clFbS" id="55oOaAFWQ4u" role="3clFbx">
+            <node concept="3clFbF" id="55oOaAFWQ4v" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ4w" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ4x" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ4y" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="Xl_RD" id="55oOaAFWQ4z" role="37wK5m">
+                    <property role="Xl_RC" value="." />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="55oOaAFWQ4$" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ4_" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ4A" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ4B" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="2OqwBi" id="55oOaAFWQ4C" role="37wK5m">
+                    <node concept="37vLTw" id="55oOaAFWQ4D" role="2Oq$k0">
+                      <ref role="3cqZAo" node="55oOaAFWQ4m" resolve="ancestor" />
+                    </node>
+                    <node concept="3TrcHB" id="55oOaAFWQ4E" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="55oOaAFWQ4F" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ4G" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ4H" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ4I" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="Xl_RD" id="55oOaAFWQ4J" role="37wK5m">
+                    <property role="Xl_RC" value=" [" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="55oOaAFWQ4K" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ4L" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ4M" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ4N" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="2OqwBi" id="55oOaAFWQ4O" role="37wK5m">
+                    <node concept="2OqwBi" id="55oOaAFWQ4P" role="2Oq$k0">
+                      <node concept="37vLTw" id="55oOaAFWQ4Q" role="2Oq$k0">
+                        <ref role="3cqZAo" node="55oOaAFWQ4m" resolve="ancestor" />
+                      </node>
+                      <node concept="2yIwOk" id="55oOaAFWQ4R" role="2OqNvi" />
+                    </node>
+                    <node concept="liA8E" id="55oOaAFWQ4S" role="2OqNvi">
+                      <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="55oOaAFWQ4T" role="3cqZAp">
+              <node concept="2OqwBi" id="55oOaAFWQ4U" role="3clFbG">
+                <node concept="37vLTw" id="55oOaAFWQ4V" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+                </node>
+                <node concept="liA8E" id="55oOaAFWQ4W" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                  <node concept="Xl_RD" id="55oOaAFWQ4X" role="37wK5m">
+                    <property role="Xl_RC" value="]" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="55oOaAFWQ4Y" role="3clFbw">
+            <node concept="10Nm6u" id="55oOaAFWQ4Z" role="3uHU7w" />
+            <node concept="37vLTw" id="55oOaAFWQ50" role="3uHU7B">
+              <ref role="3cqZAo" node="55oOaAFWQ4m" resolve="ancestor" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="55oOaAFWQ51" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFWQ52" role="3cqZAk">
+            <node concept="37vLTw" id="55oOaAFWQ53" role="2Oq$k0">
+              <ref role="3cqZAo" node="55oOaAFWQ3G" resolve="nameSpace" />
+            </node>
+            <node concept="liA8E" id="55oOaAFWQ54" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="55oOaAFWQ56" role="3clF45" />
+      <node concept="37vLTG" id="55oOaAFWQ57" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="55oOaAFWQ58" role="1tU5fm" />
+      </node>
+      <node concept="3Tm1VV" id="55oOaAFWQ55" role="1B3o_S" />
+    </node>
   </node>
   <node concept="312cEu" id="2HzhasN$atp">
     <property role="3GE5qa" value="search" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps
index f65ecc20b10..3939a748a2e 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/behavior.mps
@@ -3470,39 +3470,20 @@
       <node concept="3Tm1VV" id="4ueXZrqtevq" role="1B3o_S" />
       <node concept="3clFbS" id="4ueXZrqtevr" role="3clF47">
         <node concept="3clFbF" id="4ueXZrqtews" role="3cqZAp">
-          <node concept="Xl_RD" id="4ueXZrqtewt" role="3clFbG">
-            <property role="Xl_RC" value="&lt;comment&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="4ueXZrqtevs" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="4ueXZrqtevt" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="4ueXZrqtevu" role="1B3o_S" />
-      <node concept="3clFbS" id="4ueXZrqtevv" role="3clF47">
-        <node concept="3clFbF" id="4ueXZrqtewu" role="3cqZAp">
-          <node concept="2OqwBi" id="4ueXZrqtexB" role="3clFbG">
-            <node concept="2OqwBi" id="4ueXZrqtex8" role="2Oq$k0">
-              <node concept="13iPFW" id="4ueXZrqtewv" role="2Oq$k0" />
-              <node concept="2Xjw5R" id="4ueXZrqtexe" role="2OqNvi">
-                <node concept="1xMEDy" id="4ueXZrqtexf" role="1xVPHs">
-                  <node concept="chp4Y" id="4ueXZrqtexi" role="ri$Ld">
-                    <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                  </node>
-                </node>
+          <node concept="2OqwBi" id="55oOaAFAnvQ" role="3clFbG">
+            <node concept="2OqwBi" id="55oOaAFAm3E" role="2Oq$k0">
+              <node concept="13iPFW" id="55oOaAFAlDH" role="2Oq$k0" />
+              <node concept="3TrEf2" id="55oOaAFAmD$" role="2OqNvi">
+                <ref role="3Tt5mk" to="c4fa:7uLL3Mf3Z6z" resolve="textblock" />
               </node>
             </node>
-            <node concept="2qgKlT" id="6wvhQs7nAwg" role="2OqNvi">
-              <ref role="37wK5l" to="hwgx:6wvhQs7n_YM" resolve="namespace" />
+            <node concept="2qgKlT" id="55oOaAFAnKP" role="2OqNvi">
+              <ref role="37wK5l" to="hwgx:6byLOcR3jNg" resolve="asTextString" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="4ueXZrqtevw" role="3clF45" />
+      <node concept="17QB3L" id="4ueXZrqtevs" role="3clF45" />
     </node>
     <node concept="13i0hz" id="BsHjoDSP5B" role="13h7CS">
       <property role="TrG5h" value="getTextColor" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
index b8dceabbf48..f1f6b2ce499 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
@@ -679,45 +679,21 @@
       <ref role="13i0hy" to="hwgx:jpyKDg1pW5" resolve="resultName" />
       <node concept="3Tm1VV" id="jpyKDg34bh" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34bi" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34bo" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34bp" role="3clFbG">
-            <property role="Xl_RC" value="&lt;paragraph&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34bj" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34bk" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34bl" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34bm" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34bq" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34cE" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34cH" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;paragraph&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34cf" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34bK" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34br" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34bQ" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34bR" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34bU" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34ck" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+        <node concept="3clFbF" id="55oOaAFBK0F" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFCkR_" role="3clFbG">
+            <node concept="2OqwBi" id="55oOaAFBKlU" role="2Oq$k0">
+              <node concept="13iPFW" id="55oOaAFBK0E" role="2Oq$k0" />
+              <node concept="3TrEf2" id="55oOaAFBKOF" role="2OqNvi">
+                <ref role="3Tt5mk" to="2c95:2TZO3DbvcWd" resolve="text" />
               </node>
             </node>
+            <node concept="2qgKlT" id="55oOaAFCl8e" role="2OqNvi">
+              <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34bn" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34bj" role="3clF45" />
     </node>
     <node concept="13i0hz" id="72AnQbQqgui" role="13h7CS">
       <property role="TrG5h" value="actuallyHasTreeNode" />
@@ -2298,24 +2274,6 @@
       </node>
       <node concept="17QB3L" id="jpyKDg34iX" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="jpyKDg34iY" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34iZ" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34j0" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34jN" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg34k9" role="3clFbG">
-            <node concept="13iPFW" id="jpyKDg34jO" role="2Oq$k0" />
-            <node concept="2qgKlT" id="jpyKDg34kf" role="2OqNvi">
-              <ref role="37wK5l" node="2TZO3DbvVw0" resolve="qualifiedName" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34jb" role="3clF45" />
-    </node>
     <node concept="13i0hz" id="1KP9ibcxmAP" role="13h7CS">
       <property role="TrG5h" value="getTreeNode" />
       <ref role="13i0hy" to="hwgx:7NyyyjNtbn2" resolve="getTreeNode" />
@@ -2643,44 +2601,15 @@
       <node concept="3Tm1VV" id="jpyKDg34hp" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34hq" role="3clF47">
         <node concept="3clFbF" id="jpyKDg34ir" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34is" role="3clFbG">
-            <property role="Xl_RC" value="&lt;image&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34hr" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34hs" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34ht" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34hu" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34it" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34iu" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34iv" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;image&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34iw" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34ix" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34iy" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34iz" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34i$" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34i_" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34iA" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
+          <node concept="2OqwBi" id="55oOaAFAKnc" role="3clFbG">
+            <node concept="13iPFW" id="55oOaAFAJZp" role="2Oq$k0" />
+            <node concept="3TrcHB" id="55oOaAFAKUG" role="2OqNvi">
+              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34hv" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34hr" role="3clF45" />
     </node>
     <node concept="13i0hz" id="2x0XdshuE$U" role="13h7CS">
       <property role="TrG5h" value="renderImage" />
@@ -3033,45 +2962,21 @@
       <ref role="13i0hy" to="hwgx:jpyKDg1pW5" resolve="resultName" />
       <node concept="3Tm1VV" id="jpyKDg34fW" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34fX" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34h0" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34h2" role="3clFbG">
-            <property role="Xl_RC" value="&lt;item&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34fY" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34fZ" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34g0" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34g1" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34h3" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34h4" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34h5" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;item&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34h6" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34h7" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34h8" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34h9" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34ha" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34hb" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34hc" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+        <node concept="3clFbF" id="55oOaAFAOqY" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFASiP" role="3clFbG">
+            <node concept="2OqwBi" id="55oOaAFAODh" role="2Oq$k0">
+              <node concept="13iPFW" id="55oOaAFAOqX" role="2Oq$k0" />
+              <node concept="3TrEf2" id="55oOaAFAS6b" role="2OqNvi">
+                <ref role="3Tt5mk" to="2c95:4E$PniRJOs_" resolve="text" />
               </node>
             </node>
+            <node concept="2qgKlT" id="55oOaAFASyx" role="2OqNvi">
+              <ref role="37wK5l" to="hwgx:6byLOcR3jNg" resolve="asTextString" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34g2" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34fY" role="3clF45" />
     </node>
     <node concept="13i0hz" id="6ec5ny863p1" role="13h7CS">
       <property role="TrG5h" value="getItemList" />
@@ -4184,45 +4089,16 @@
       <ref role="13i0hy" to="hwgx:jpyKDg1pW5" resolve="resultName" />
       <node concept="3Tm1VV" id="jpyKDg34cV" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34cW" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34e9" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34ea" role="3clFbG">
-            <property role="Xl_RC" value="&lt;paragraph&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34cX" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34cY" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34cZ" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34d0" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34eb" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34ec" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34ed" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;paragraph&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34ee" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34ef" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34eg" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34eh" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34ei" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34ej" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34ek" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
+        <node concept="3clFbF" id="55oOaAFBLo8" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFBL_J" role="3clFbG">
+            <node concept="13iPFW" id="55oOaAFBLo7" role="2Oq$k0" />
+            <node concept="3TrcHB" id="55oOaAFBLNm" role="2OqNvi">
+              <ref role="3TsBF5" to="2c95:4vQSg$Ar0ev" resolve="text" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34d1" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34cX" role="3clF45" />
     </node>
   </node>
   <node concept="13h7C7" id="jpyKDg34en">
@@ -4268,45 +4144,21 @@
       <ref role="13i0hy" to="hwgx:jpyKDg1pW5" resolve="resultName" />
       <node concept="3Tm1VV" id="jpyKDg34ez" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34e$" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34f_" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34fA" role="3clFbG">
-            <property role="Xl_RC" value="&lt;listing&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34e_" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34eA" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34eB" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34eC" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34fB" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34fC" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34fD" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;listing&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34fE" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34fF" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34fG" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34fH" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34fI" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34fJ" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34fK" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+        <node concept="3clFbF" id="55oOaAFBwaq" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFByas" role="3clFbG">
+            <node concept="2OqwBi" id="55oOaAFBwuv" role="2Oq$k0">
+              <node concept="13iPFW" id="55oOaAFBwap" role="2Oq$k0" />
+              <node concept="3TrcHB" id="55oOaAFBwUl" role="2OqNvi">
+                <ref role="3TsBF5" to="2c95:7$DvC4gUq7E" resolve="text" />
               </node>
             </node>
+            <node concept="liA8E" id="55oOaAFBz5t" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~String.toString()" resolve="toString" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34eD" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34e_" role="3clF45" />
     </node>
     <node concept="13i0hz" id="3il$LAnLxir" role="13h7CS">
       <property role="TrG5h" value="getTreeNode" />
@@ -4382,45 +4234,21 @@
       <ref role="13i0hy" to="hwgx:jpyKDg1pW5" resolve="resultName" />
       <node concept="3Tm1VV" id="jpyKDg34ky" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34kz" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34k$" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34k_" role="3clFbG">
-            <property role="Xl_RC" value="&lt;cell&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34kA" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34kB" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34kC" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34kD" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34kE" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34kF" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34kG" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;cell&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34kH" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34kI" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34kJ" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34kK" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34kL" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34kM" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34kN" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+        <node concept="3clFbF" id="55oOaAFBHf2" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFBHUK" role="3clFbG">
+            <node concept="2OqwBi" id="55oOaAFBHtl" role="2Oq$k0">
+              <node concept="13iPFW" id="55oOaAFBHf1" role="2Oq$k0" />
+              <node concept="3TrEf2" id="55oOaAFBHI6" role="2OqNvi">
+                <ref role="3Tt5mk" to="2c95:519ky_SlYNb" resolve="text" />
               </node>
             </node>
+            <node concept="2qgKlT" id="55oOaAFBIar" role="2OqNvi">
+              <ref role="37wK5l" to="hwgx:6byLOcR3jNg" resolve="asTextString" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34kO" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34kA" role="3clF45" />
     </node>
     <node concept="13hLZK" id="jpyKDg34ki" role="13h7CW">
       <node concept="3clFbS" id="jpyKDg34kj" role="2VODD2" />
@@ -4466,45 +4294,16 @@
       <ref role="13i0hy" to="hwgx:jpyKDg1pW5" resolve="resultName" />
       <node concept="3Tm1VV" id="jpyKDg34la" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34lb" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34lc" role="3cqZAp">
-          <node concept="Xl_RD" id="jpyKDg34ld" role="3clFbG">
-            <property role="Xl_RC" value="&lt;cell&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34le" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="jpyKDg34lf" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34lg" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34lh" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34li" role="3cqZAp">
-          <node concept="3cpWs3" id="jpyKDg34lj" role="3clFbG">
-            <node concept="Xl_RD" id="jpyKDg34lk" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;cell&gt;" />
-            </node>
-            <node concept="2OqwBi" id="jpyKDg34ll" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg34lm" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg34ln" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="jpyKDg34lo" role="2OqNvi">
-                  <node concept="1xMEDy" id="jpyKDg34lp" role="1xVPHs">
-                    <node concept="chp4Y" id="jpyKDg34lq" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="jpyKDg34lr" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
+        <node concept="3clFbF" id="55oOaAFBF1u" role="3cqZAp">
+          <node concept="2OqwBi" id="55oOaAFBFfL" role="3clFbG">
+            <node concept="13iPFW" id="55oOaAFBF1r" role="2Oq$k0" />
+            <node concept="3TrcHB" id="55oOaAFBFvX" role="2OqNvi">
+              <ref role="3TsBF5" to="2c95:4vQSg$ArKJS" resolve="text" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="jpyKDg34ls" role="3clF45" />
+      <node concept="17QB3L" id="jpyKDg34le" role="3clF45" />
     </node>
     <node concept="13hLZK" id="jpyKDg34kU" role="13h7CW">
       <node concept="3clFbS" id="jpyKDg34kV" role="2VODD2" />
@@ -4561,24 +4360,6 @@
       </node>
       <node concept="17QB3L" id="jpyKDg34m0" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="jpyKDg34m1" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="jpyKDg34m2" role="1B3o_S" />
-      <node concept="3clFbS" id="jpyKDg34m3" role="3clF47">
-        <node concept="3clFbF" id="jpyKDg34mK" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg34n6" role="3clFbG">
-            <node concept="13iPFW" id="jpyKDg34mL" role="2Oq$k0" />
-            <node concept="2qgKlT" id="jpyKDg34nc" role="2OqNvi">
-              <ref role="37wK5l" to="hwgx:4JF77iuPCMH" resolve="qualifiedName" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="jpyKDg34me" role="3clF45" />
-    </node>
     <node concept="13hLZK" id="jpyKDg34lG" role="13h7CW">
       <node concept="3clFbS" id="jpyKDg34lH" role="2VODD2" />
     </node>
@@ -6209,44 +5990,20 @@
       <node concept="3Tm1VV" id="OI5Xv77lEz" role="1B3o_S" />
       <node concept="3clFbS" id="OI5Xv77lE$" role="3clF47">
         <node concept="3clFbF" id="OI5Xv77lE_" role="3cqZAp">
-          <node concept="Xl_RD" id="OI5Xv77lEA" role="3clFbG">
-            <property role="Xl_RC" value="&lt;paragraph&gt;" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="OI5Xv77lEB" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="OI5Xv77lEC" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resultQualifiedName" />
-      <ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
-      <node concept="3Tm1VV" id="OI5Xv77lED" role="1B3o_S" />
-      <node concept="3clFbS" id="OI5Xv77lEE" role="3clF47">
-        <node concept="3clFbF" id="OI5Xv77lEF" role="3cqZAp">
-          <node concept="3cpWs3" id="OI5Xv77lEG" role="3clFbG">
-            <node concept="Xl_RD" id="OI5Xv77lEH" role="3uHU7w">
-              <property role="Xl_RC" value=".&lt;paragraph&gt;" />
-            </node>
-            <node concept="2OqwBi" id="OI5Xv77lEI" role="3uHU7B">
-              <node concept="2OqwBi" id="OI5Xv77lEJ" role="2Oq$k0">
-                <node concept="13iPFW" id="OI5Xv77lEK" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="OI5Xv77lEL" role="2OqNvi">
-                  <node concept="1xMEDy" id="OI5Xv77lEM" role="1xVPHs">
-                    <node concept="chp4Y" id="OI5Xv77lEN" role="ri$Ld">
-                      <ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3TrcHB" id="OI5Xv77lEO" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+          <node concept="2OqwBi" id="55oOaAFAIMj" role="3clFbG">
+            <node concept="2OqwBi" id="55oOaAFAIc9" role="2Oq$k0">
+              <node concept="13iPFW" id="55oOaAFAHTe" role="2Oq$k0" />
+              <node concept="3TrEf2" id="55oOaAFAI_D" role="2OqNvi">
+                <ref role="3Tt5mk" to="2c95:6VFmq3I3EUo" resolve="text" />
               </node>
             </node>
+            <node concept="2qgKlT" id="55oOaAFAJ2A" role="2OqNvi">
+              <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="OI5Xv77lEP" role="3clF45" />
+      <node concept="17QB3L" id="OI5Xv77lEB" role="3clF45" />
     </node>
     <node concept="13hLZK" id="OI5Xv77kID" role="13h7CW">
       <node concept="3clFbS" id="OI5Xv77kIE" role="2VODD2">

From ede040c3bdfaf7efd4cabbc3fd510c37998eedc5 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 12:37:42 +0100
Subject: [PATCH 30/38] core.base: fix a NullPointer in IIdentifierNamedConcept

---
 .../languageModels/behavior.mps                     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 7d6853a0f02..0530299ee9a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -1489,6 +1489,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="3G2A$fwKZFz" role="3cqZAp">
+          <node concept="3clFbS" id="3G2A$fwKZF_" role="3clFbx">
+            <node concept="3cpWs6" id="3G2A$fwL1xS" role="3cqZAp">
+              <node concept="10Nm6u" id="3G2A$fwL1zT" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="3G2A$fwL18N" role="3clFbw">
+            <node concept="10Nm6u" id="3G2A$fwL18Q" role="3uHU7w" />
+            <node concept="37vLTw" id="3G2A$fwKZI$" role="3uHU7B">
+              <ref role="3cqZAo" node="6wvhQs7nA1E" resolve="qn" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6wvhQs7nA0d" role="3cqZAp">
           <node concept="3cpWsn" id="6wvhQs7nA0e" role="3cpWs9">
             <property role="TrG5h" value="dotPos" />

From 6fca51d82fa2127a43da55688f1462442a14e699 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 12:46:49 +0100
Subject: [PATCH 31/38] core.base: don't show more than 10000 search results

Updating the UI takes took long for more results and it freezes.
---
 .../core/base/pluginSolution/plugin.mps       | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 7ecf69f8aa2..757ed791840 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -737,6 +737,9 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
+      <concept id="1172664342967" name="jetbrains.mps.baseLanguage.collections.structure.TakeOperation" flags="nn" index="8ftyA">
+        <child id="1172664372046" name="elementsToTake" index="8f$Dv" />
+      </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
         <child id="1226511765987" name="elementType" index="2hN53Y" />
@@ -4158,6 +4161,15 @@
       </node>
     </node>
     <node concept="2tJIrI" id="vqDSpamANO" role="jymVt" />
+    <node concept="Wx3nA" id="3G2A$fxbDHu" role="jymVt">
+      <property role="TrG5h" value="MAXIMUM_RESULT" />
+      <node concept="3Tm1VV" id="3G2A$fxbBh3" role="1B3o_S" />
+      <node concept="10Oyi0" id="3G2A$fxbDFZ" role="1tU5fm" />
+      <node concept="3cmrfG" id="3G2A$fxbE$_" role="33vP2m">
+        <property role="3cmrfH" value="10000" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3G2A$fxb_91" role="jymVt" />
     <node concept="312cEg" id="4Q2Vz3i_rqf" role="jymVt">
       <property role="TrG5h" value="project" />
       <node concept="3Tm6S6" id="4Q2Vz3i_rqg" role="1B3o_S" />
@@ -5604,8 +5616,15 @@
                               <ref role="37wK5l" node="7ipIhbnXdL4" resolve="resultsReceived" />
                               <node concept="2OqwBi" id="55oOaAF9qGu" role="37wK5m">
                                 <node concept="2OqwBi" id="55oOaAF9em5" role="2Oq$k0">
-                                  <node concept="37vLTw" id="55oOaAF9aUz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                                  <node concept="2OqwBi" id="3G2A$fxbK6F" role="2Oq$k0">
+                                    <node concept="37vLTw" id="55oOaAF9aUz" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7ipIhbo1zJI" resolve="results" />
+                                    </node>
+                                    <node concept="8ftyA" id="3G2A$fxbXAh" role="2OqNvi">
+                                      <node concept="37vLTw" id="3G2A$fxc7cq" role="8f$Dv">
+                                        <ref role="3cqZAo" node="3G2A$fxbDHu" resolve="MAXIMUM_RESULT" />
+                                      </node>
+                                    </node>
                                   </node>
                                   <node concept="2DpFxk" id="55oOaAF9jNv" role="2OqNvi">
                                     <node concept="1nlBCl" id="55oOaAF9jNx" role="2Dq5b$">

From 8d6be6a0056e8025f121e1924c1a6d492aaf7491 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 13:04:31 +0100
Subject: [PATCH 32/38] core.base: adapt the size of the concept search result
 column automatically

---
 .../core/base/pluginSolution/plugin.mps       | 309 +++++++++++++++++-
 1 file changed, 296 insertions(+), 13 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 757ed791840..e0d425dea28 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -3621,23 +3621,27 @@
     <node concept="3clFb_" id="1GW3SvfftX3" role="jymVt">
       <property role="TrG5h" value="adjustColumnSizes" />
       <node concept="3clFbS" id="1GW3SvfftX6" role="3clF47">
-        <node concept="3clFbF" id="1GW3SvfiBU5" role="3cqZAp">
-          <node concept="2OqwBi" id="1GW3SvfiHpF" role="3clFbG">
-            <node concept="37vLTw" id="1GW3SvfiBU3" role="2Oq$k0">
-              <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
-            </node>
-            <node concept="liA8E" id="1GW3SvfiL3j" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int)" resolve="setAutoResizeMode" />
-              <node concept="10M0yZ" id="1GW3SvfiQ8G" role="37wK5m">
-                <ref role="3cqZAo" to="dxuu:~JTable.AUTO_RESIZE_NEXT_COLUMN" resolve="AUTO_RESIZE_NEXT_COLUMN" />
-                <ref role="1PxDUh" to="dxuu:~JTable" resolve="JTable" />
+        <node concept="1X3_iC" id="3G2A$fxp2pi" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="1GW3SvfiBU5" role="8Wnug">
+            <node concept="2OqwBi" id="1GW3SvfiHpF" role="3clFbG">
+              <node concept="37vLTw" id="1GW3SvfiBU3" role="2Oq$k0">
+                <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+              </node>
+              <node concept="liA8E" id="1GW3SvfiL3j" role="2OqNvi">
+                <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int)" resolve="setAutoResizeMode" />
+                <node concept="10M0yZ" id="1GW3SvfiQ8G" role="37wK5m">
+                  <ref role="3cqZAo" to="dxuu:~JTable.AUTO_RESIZE_NEXT_COLUMN" resolve="AUTO_RESIZE_NEXT_COLUMN" />
+                  <ref role="1PxDUh" to="dxuu:~JTable" resolve="JTable" />
+                </node>
               </node>
             </node>
           </node>
         </node>
         <node concept="3cpWs8" id="1GW3SvfiV6s" role="3cqZAp">
           <node concept="3cpWsn" id="1GW3SvfiV6t" role="3cpWs9">
-            <property role="TrG5h" value="IconColumn" />
+            <property role="TrG5h" value="iconColumn" />
             <node concept="3uibUv" id="1GW3SvfiQ_b" role="1tU5fm">
               <ref role="3uigEE" to="c8ee:~TableColumn" resolve="TableColumn" />
             </node>
@@ -3661,7 +3665,7 @@
         </node>
         <node concept="3cpWs8" id="1GW3SvfZSD3" role="3cqZAp">
           <node concept="3cpWsn" id="1GW3SvfZSD6" role="3cpWs9">
-            <property role="TrG5h" value="width" />
+            <property role="TrG5h" value="iconColumnWidth" />
             <node concept="10Oyi0" id="1GW3SvfZSD1" role="1tU5fm" />
             <node concept="3cmrfG" id="6KjVnJo8cYo" role="33vP2m">
               <property role="3cmrfH" value="40" />
@@ -3694,7 +3698,139 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1GW3SvfiqmF" role="3cqZAp" />
+        <node concept="3cpWs8" id="3G2A$fxgoeN" role="3cqZAp">
+          <node concept="3cpWsn" id="3G2A$fxgoeO" role="3cpWs9">
+            <property role="TrG5h" value="conceptColumn" />
+            <node concept="3uibUv" id="3G2A$fxgoeP" role="1tU5fm">
+              <ref role="3uigEE" to="c8ee:~TableColumn" resolve="TableColumn" />
+            </node>
+            <node concept="2OqwBi" id="3G2A$fxgoeQ" role="33vP2m">
+              <node concept="2OqwBi" id="3G2A$fxgoeR" role="2Oq$k0">
+                <node concept="37vLTw" id="3G2A$fxgoeS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+                </node>
+                <node concept="liA8E" id="3G2A$fxgoeT" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
+                </node>
+              </node>
+              <node concept="liA8E" id="3G2A$fxgoeU" role="2OqNvi">
+                <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
+                <node concept="3cmrfG" id="3G2A$fxgoeV" role="37wK5m">
+                  <property role="3cmrfH" value="3" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3G2A$fxhPIM" role="3cqZAp">
+          <node concept="3cpWsn" id="3G2A$fxhPIN" role="3cpWs9">
+            <property role="TrG5h" value="longestValue" />
+            <node concept="3uibUv" id="3G2A$fxhK4U" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="2OqwBi" id="3G2A$fxhPIO" role="33vP2m">
+              <node concept="0kSF2" id="3G2A$fxhPIP" role="2Oq$k0">
+                <node concept="3uibUv" id="3G2A$fxhPIQ" role="0kSFW">
+                  <ref role="3uigEE" node="jpyKDg1OGH" resolve="ResultTableModel" />
+                </node>
+                <node concept="2OqwBi" id="3G2A$fxhPIR" role="0kSFX">
+                  <node concept="37vLTw" id="3G2A$fxhPIS" role="2Oq$k0">
+                    <ref role="3cqZAo" node="jpyKDg1OFO" resolve="resultTable" />
+                  </node>
+                  <node concept="liA8E" id="3G2A$fxhPIT" role="2OqNvi">
+                    <ref role="37wK5l" to="dxuu:~JTable.getModel()" resolve="getModel" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="3G2A$fxhPIU" role="2OqNvi">
+                <ref role="37wK5l" node="3G2A$fxeARH" resolve="getLongestValue" />
+                <node concept="3cmrfG" id="3G2A$fxkMPF" role="37wK5m">
+                  <property role="3cmrfH" value="3" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3G2A$fxgVXa" role="3cqZAp">
+          <node concept="3cpWsn" id="3G2A$fxgVXd" role="3cpWs9">
+            <property role="TrG5h" value="conceptColumnWidth" />
+            <node concept="10Oyi0" id="3G2A$fxgVX8" role="1tU5fm" />
+            <node concept="3K4zz7" id="3G2A$fxigd6" role="33vP2m">
+              <node concept="3cmrfG" id="3G2A$fxiDa2" role="3K4GZi">
+                <property role="3cmrfH" value="-1" />
+              </node>
+              <node concept="3y3z36" id="3G2A$fxhZHD" role="3K4Cdx">
+                <node concept="10Nm6u" id="3G2A$fxi4Bs" role="3uHU7w" />
+                <node concept="37vLTw" id="3G2A$fxhPIV" role="3uHU7B">
+                  <ref role="3cqZAo" node="3G2A$fxhPIN" resolve="longestValue" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3G2A$fxuFdy" role="3K4E3e">
+                <node concept="2OqwBi" id="3G2A$fxui_q" role="2Oq$k0">
+                  <node concept="Xjq3P" id="3G2A$fxucW$" role="2Oq$k0" />
+                  <node concept="liA8E" id="3G2A$fxuo4p" role="2OqNvi">
+                    <ref role="37wK5l" to="dxuu:~JComponent.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
+                    <node concept="2OqwBi" id="3G2A$fxu__o" role="37wK5m">
+                      <node concept="Xjq3P" id="3G2A$fxuwc2" role="2Oq$k0" />
+                      <node concept="liA8E" id="3G2A$fxuCOS" role="2OqNvi">
+                        <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="3G2A$fxuNBV" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
+                  <node concept="2OqwBi" id="3G2A$fxv9kK" role="37wK5m">
+                    <node concept="37vLTw" id="3G2A$fxv7pz" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3G2A$fxhPIN" resolve="longestValue" />
+                    </node>
+                    <node concept="liA8E" id="3G2A$fxvaid" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3G2A$fxiJvI" role="3cqZAp">
+          <node concept="3clFbS" id="3G2A$fxiJvK" role="3clFbx">
+            <node concept="3clFbF" id="3G2A$fxgof0" role="3cqZAp">
+              <node concept="2OqwBi" id="3G2A$fxgof1" role="3clFbG">
+                <node concept="37vLTw" id="3G2A$fxgof2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3G2A$fxgoeO" resolve="IconColumn" />
+                </node>
+                <node concept="liA8E" id="3G2A$fxgof3" role="2OqNvi">
+                  <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
+                  <node concept="37vLTw" id="3G2A$fxgof4" role="37wK5m">
+                    <ref role="3cqZAo" node="3G2A$fxgVXd" resolve="conceptColumnWidth" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3G2A$fxgof5" role="3cqZAp">
+              <node concept="2OqwBi" id="3G2A$fxgof6" role="3clFbG">
+                <node concept="37vLTw" id="3G2A$fxgof7" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3G2A$fxgoeO" resolve="IconColumn" />
+                </node>
+                <node concept="liA8E" id="3G2A$fxgof8" role="2OqNvi">
+                  <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
+                  <node concept="37vLTw" id="3G2A$fxgof9" role="37wK5m">
+                    <ref role="3cqZAo" node="3G2A$fxgVXd" resolve="conceptColumnWidth" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="3G2A$fxj2xE" role="3clFbw">
+            <node concept="3cmrfG" id="3G2A$fxj5$J" role="3uHU7w">
+              <property role="3cmrfH" value="-1" />
+            </node>
+            <node concept="37vLTw" id="3G2A$fxiRZr" role="3uHU7B">
+              <ref role="3cqZAo" node="3G2A$fxgVXd" resolve="conceptColumnWidth" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="jpyKDg2tIK" role="3cqZAp">
           <node concept="2OqwBi" id="jpyKDg2tIL" role="3clFbG">
             <node concept="37vLTw" id="jpyKDg2tIM" role="2Oq$k0">
@@ -6852,6 +6988,150 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3G2A$fxeyeP" role="jymVt" />
+    <node concept="3clFb_" id="3G2A$fxeARH" role="jymVt">
+      <property role="TrG5h" value="getLongestValue" />
+      <node concept="3clFbS" id="3G2A$fxeARK" role="3clF47">
+        <node concept="3cpWs8" id="3G2A$fxeDOX" role="3cqZAp">
+          <node concept="3cpWsn" id="3G2A$fxeDP0" role="3cpWs9">
+            <property role="TrG5h" value="maxLength" />
+            <node concept="10Oyi0" id="3G2A$fxeDOW" role="1tU5fm" />
+            <node concept="3cmrfG" id="3G2A$fxfRk9" role="33vP2m">
+              <property role="3cmrfH" value="-1" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3G2A$fxeHu9" role="3cqZAp">
+          <node concept="3cpWsn" id="3G2A$fxeHua" role="3cpWs9">
+            <property role="TrG5h" value="maxObject" />
+            <node concept="3uibUv" id="3G2A$fxeHub" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="10Nm6u" id="3G2A$fxg4Rz" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="3G2A$fxeJBX" role="3cqZAp">
+          <node concept="3clFbS" id="3G2A$fxeJBZ" role="2LFqv$">
+            <node concept="3cpWs8" id="3G2A$fxf5qZ" role="3cqZAp">
+              <node concept="3cpWsn" id="3G2A$fxf5r0" role="3cpWs9">
+                <property role="TrG5h" value="obj" />
+                <node concept="3uibUv" id="3G2A$fxf5r1" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="1rXfSq" id="3G2A$fxf6TG" role="33vP2m">
+                  <ref role="37wK5l" node="5jGyeU5Xzo1" resolve="getValueAt" />
+                  <node concept="37vLTw" id="3G2A$fxf8dS" role="37wK5m">
+                    <ref role="3cqZAo" node="3G2A$fxeJC0" resolve="row" />
+                  </node>
+                  <node concept="37vLTw" id="3G2A$fxf96u" role="37wK5m">
+                    <ref role="3cqZAo" node="3G2A$fxeBkZ" resolve="column" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="3G2A$fxfcWs" role="3cqZAp">
+              <node concept="3cpWsn" id="3G2A$fxfcWv" role="3cpWs9">
+                <property role="TrG5h" value="currentLength" />
+                <node concept="10Oyi0" id="3G2A$fxfcWq" role="1tU5fm" />
+                <node concept="3K4zz7" id="3G2A$fxf$Bl" role="33vP2m">
+                  <node concept="3cmrfG" id="3G2A$fxf_K0" role="3K4GZi">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="3y3z36" id="3G2A$fxfyII" role="3K4Cdx">
+                    <node concept="10Nm6u" id="3G2A$fxfzDh" role="3uHU7w" />
+                    <node concept="37vLTw" id="3G2A$fxfxMJ" role="3uHU7B">
+                      <ref role="3cqZAo" node="3G2A$fxf5r0" resolve="obj" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3G2A$fxfh1K" role="3K4E3e">
+                    <node concept="2OqwBi" id="3G2A$fxff5J" role="2Oq$k0">
+                      <node concept="37vLTw" id="3G2A$fxfegV" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3G2A$fxf5r0" resolve="obj" />
+                      </node>
+                      <node concept="liA8E" id="3G2A$fxffO4" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="3G2A$fxfiyx" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="3G2A$fxfkL0" role="3cqZAp">
+              <node concept="3clFbS" id="3G2A$fxfkL2" role="3clFbx">
+                <node concept="3clFbF" id="3G2A$fxftdv" role="3cqZAp">
+                  <node concept="37vLTI" id="3G2A$fxfutS" role="3clFbG">
+                    <node concept="37vLTw" id="3G2A$fxfuXm" role="37vLTx">
+                      <ref role="3cqZAo" node="3G2A$fxfcWv" resolve="currentLength" />
+                    </node>
+                    <node concept="37vLTw" id="3G2A$fxftdt" role="37vLTJ">
+                      <ref role="3cqZAo" node="3G2A$fxeDP0" resolve="maxLength" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3G2A$fxfBog" role="3cqZAp">
+                  <node concept="37vLTI" id="3G2A$fxg0fI" role="3clFbG">
+                    <node concept="37vLTw" id="3G2A$fxg123" role="37vLTx">
+                      <ref role="3cqZAo" node="3G2A$fxf5r0" resolve="obj" />
+                    </node>
+                    <node concept="37vLTw" id="3G2A$fxfBoe" role="37vLTJ">
+                      <ref role="3cqZAo" node="3G2A$fxeHua" resolve="maxObject" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3eOSWO" id="3G2A$fxfqH8" role="3clFbw">
+                <node concept="37vLTw" id="3G2A$fxfsg$" role="3uHU7w">
+                  <ref role="3cqZAo" node="3G2A$fxeDP0" resolve="maxLength" />
+                </node>
+                <node concept="37vLTw" id="3G2A$fxflDK" role="3uHU7B">
+                  <ref role="3cqZAo" node="3G2A$fxfcWv" resolve="currentLength" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="3G2A$fxeJC0" role="1Duv9x">
+            <property role="TrG5h" value="row" />
+            <node concept="10Oyi0" id="3G2A$fxeKQq" role="1tU5fm" />
+            <node concept="3cmrfG" id="3G2A$fxeO8Y" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+          <node concept="3eOVzh" id="3G2A$fxeWeB" role="1Dwp0S">
+            <node concept="2OqwBi" id="3G2A$fxeZy1" role="3uHU7w">
+              <node concept="Xjq3P" id="3G2A$fxeXZk" role="2Oq$k0" />
+              <node concept="liA8E" id="3G2A$fxf0yd" role="2OqNvi">
+                <ref role="37wK5l" node="5jGyeU5Xznu" resolve="getRowCount" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3G2A$fxePso" role="3uHU7B">
+              <ref role="3cqZAo" node="3G2A$fxeJC0" resolve="row" />
+            </node>
+          </node>
+          <node concept="3uNrnE" id="3G2A$fxf4v4" role="1Dwrff">
+            <node concept="37vLTw" id="3G2A$fxf4v6" role="2$L3a6">
+              <ref role="3cqZAo" node="3G2A$fxeJC0" resolve="row" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="3G2A$fxfFAB" role="3cqZAp">
+          <node concept="37vLTw" id="3G2A$fxg75P" role="3cqZAk">
+            <ref role="3cqZAo" node="3G2A$fxeHua" resolve="maxObject" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3G2A$fxe_Hg" role="1B3o_S" />
+      <node concept="3uibUv" id="3G2A$fxfD6p" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      </node>
+      <node concept="37vLTG" id="3G2A$fxeBkZ" role="3clF46">
+        <property role="TrG5h" value="column" />
+        <node concept="10Oyi0" id="3G2A$fxeBkY" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3G2A$fxe$8k" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzob" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="setValueAt" />
@@ -6874,6 +7154,7 @@
       </node>
       <node concept="3clFbS" id="5jGyeU5Xzok" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="3G2A$fxeyNf" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzol" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="addTableModelListener" />
@@ -6888,6 +7169,7 @@
       </node>
       <node concept="3clFbS" id="5jGyeU5Xzoq" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="3G2A$fxeyNg" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5Xzor" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="removeTableModelListener" />
@@ -6902,6 +7184,7 @@
       </node>
       <node concept="3clFbS" id="5jGyeU5Xzow" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="3G2A$fxeztM" role="jymVt" />
     <node concept="3clFb_" id="5jGyeU5X$Pc" role="jymVt">
       <property role="TrG5h" value="getNodePointer" />
       <node concept="3uibUv" id="5jGyeU5X$Pi" role="3clF45">

From 8b3f4b09043df476fef05aa825700486955299e7 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 13:41:20 +0100
Subject: [PATCH 33/38] core.base: validate the search regex

---
 .../models/com/mbeddr/platform/build.mps      |   5 -
 .../core/base/pluginSolution/plugin.mps       | 321 ++++++++++++------
 .../pluginSolution/pluginSolution.msd         |   4 +-
 3 files changed, 214 insertions(+), 116 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index cd0d88aea69..2263175b2a6 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -15168,11 +15168,6 @@
             <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6lcdwS9PGDu" role="3bR37C">
-          <node concept="3bR9La" id="6lcdwS9PGDv" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3AVU87RT5z6" role="3bR37C">
           <node concept="3bR9La" id="3AVU87RT5z7" role="1SiIV1">
             <ref role="3bR37D" to="90a9:4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index e0d425dea28..eb26fe9d6c9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -107,17 +107,16 @@
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
     <import index="r3rm" ref="r:7fc96130-6279-4a55-aeeb-422a6879539d(de.itemis.mps.editor.diagram.runtime.jgraph)" />
     <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
-    <import index="sud2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui.table(MPS.IDEA/)" />
     <import index="qqrq" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.ui.components(MPS.ThirdParty/)" />
     <import index="3pb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.table(MPS.IDEA/)" />
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" />
-    <import index="82te" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.ui.util(MPS.Platform/)" />
     <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
     <import index="mte5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Platform/)" />
     <import index="mte6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
+    <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
@@ -2695,110 +2694,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="55oOaAFhIuI" role="3cqZAp">
-          <node concept="2OqwBi" id="55oOaAFhOUo" role="3clFbG">
-            <node concept="37vLTw" id="55oOaAFhIuG" role="2Oq$k0">
-              <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
-            </node>
-            <node concept="liA8E" id="55oOaAFhV11" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setInputVerifier(javax.swing.InputVerifier)" resolve="setInputVerifier" />
-              <node concept="2ShNRf" id="55oOaAFi5fI" role="37wK5m">
-                <node concept="YeOm9" id="55oOaAFidqA" role="2ShVmc">
-                  <node concept="1Y3b0j" id="55oOaAFidqD" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <property role="373rjd" value="true" />
-                    <ref role="1Y3XeK" to="dxuu:~InputVerifier" resolve="InputVerifier" />
-                    <ref role="37wK5l" to="dxuu:~InputVerifier.&lt;init&gt;()" resolve="InputVerifier" />
-                    <node concept="3Tm1VV" id="55oOaAFidqE" role="1B3o_S" />
-                    <node concept="3clFb_" id="55oOaAFidqQ" role="jymVt">
-                      <property role="TrG5h" value="verify" />
-                      <node concept="3Tm1VV" id="55oOaAFidqR" role="1B3o_S" />
-                      <node concept="10P_77" id="55oOaAFidqT" role="3clF45" />
-                      <node concept="37vLTG" id="55oOaAFidqU" role="3clF46">
-                        <property role="TrG5h" value="comp" />
-                        <node concept="3uibUv" id="55oOaAFidqV" role="1tU5fm">
-                          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="55oOaAFidqW" role="3clF47">
-                        <node concept="3clFbJ" id="55oOaAFiZqB" role="3cqZAp">
-                          <node concept="37vLTw" id="55oOaAFjlAq" role="3clFbw">
-                            <ref role="3cqZAo" node="55oOaAFcfOp" resolve="matchRegex" />
-                          </node>
-                          <node concept="3clFbS" id="55oOaAFiZqD" role="3clFbx">
-                            <node concept="3J1_TO" id="55oOaAFl8Gd" role="3cqZAp">
-                              <node concept="3uVAMA" id="55oOaAFleLo" role="1zxBo5">
-                                <node concept="XOnhg" id="55oOaAFleLp" role="1zc67B">
-                                  <property role="TrG5h" value="ex" />
-                                  <node concept="nSUau" id="55oOaAFleLq" role="1tU5fm">
-                                    <node concept="3uibUv" id="55oOaAFliyX" role="nSUat">
-                                      <ref role="3uigEE" to="ni5j:~PatternSyntaxException" resolve="PatternSyntaxException" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbS" id="55oOaAFleLr" role="1zc67A">
-                                  <node concept="3cpWs6" id="55oOaAFlxpo" role="3cqZAp">
-                                    <node concept="3clFbT" id="55oOaAFlCKI" role="3cqZAk" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbS" id="55oOaAFl8Ge" role="1zxBo7">
-                                <node concept="3cpWs8" id="55oOaAFkbZd" role="3cqZAp">
-                                  <node concept="3cpWsn" id="55oOaAFkbZe" role="3cpWs9">
-                                    <property role="TrG5h" value="pattern" />
-                                    <node concept="3uibUv" id="55oOaAFkbZf" role="1tU5fm">
-                                      <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
-                                    </node>
-                                    <node concept="2YIFZM" id="55oOaAFkqlG" role="33vP2m">
-                                      <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String)" resolve="compile" />
-                                      <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
-                                      <node concept="2OqwBi" id="55oOaAFky$Y" role="37wK5m">
-                                        <node concept="37vLTw" id="55oOaAFkuVX" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
-                                        </node>
-                                        <node concept="liA8E" id="55oOaAFkWV4" role="2OqNvi">
-                                          <ref role="37wK5l" to="r791:~JTextComponent.getText()" resolve="getText" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="RRSsy" id="55oOaAFmg4v" role="3cqZAp">
-                                  <node concept="3cpWs3" id="55oOaAFmwJP" role="RRSoy">
-                                    <node concept="37vLTw" id="55oOaAFm_y3" role="3uHU7w">
-                                      <ref role="3cqZAo" node="55oOaAFkbZe" resolve="pattern" />
-                                    </node>
-                                    <node concept="Xl_RD" id="55oOaAFmg4x" role="3uHU7B">
-                                      <property role="Xl_RC" value="Verifying search regex:" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3cpWs6" id="55oOaAFlZcD" role="3cqZAp">
-                                  <node concept="3clFbT" id="55oOaAFm4wu" role="3cqZAk">
-                                    <property role="3clFbU" value="true" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="55oOaAFj2Eu" role="3cqZAp" />
-                        <node concept="3cpWs6" id="55oOaAFjbK3" role="3cqZAp">
-                          <node concept="3clFbT" id="55oOaAFjh2L" role="3cqZAk">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2AHcQZ" id="55oOaAFidqY" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="jpyKDg2tHv" role="3cqZAp">
           <node concept="2OqwBi" id="jpyKDg2tHP" role="3clFbG">
             <node concept="37vLTw" id="jpyKDg2tHw" role="2Oq$k0">
@@ -2869,7 +2764,217 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2HzhasNzWSO" role="3cqZAp" />
+        <node concept="3clFbF" id="2Ltn1$mq2xj" role="3cqZAp">
+          <node concept="2OqwBi" id="2Ltn1$mFUG1" role="3clFbG">
+            <node concept="2OqwBi" id="2Ltn1$mqSLr" role="2Oq$k0">
+              <node concept="2ShNRf" id="2Ltn1$mq2xf" role="2Oq$k0">
+                <node concept="1pGfFk" id="2Ltn1$mqebe" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="jkm4:~ComponentValidator.&lt;init&gt;(com.intellij.openapi.Disposable)" resolve="ComponentValidator" />
+                  <node concept="2YIFZM" id="2Ltn1$mqJuW" role="37wK5m">
+                    <ref role="37wK5l" to="zn9m:~Disposer.newDisposable()" resolve="newDisposable" />
+                    <ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="2Ltn1$mqYy9" role="2OqNvi">
+                <ref role="37wK5l" to="jkm4:~ComponentValidator.withValidator(java.util.function.Supplier)" resolve="withValidator" />
+                <node concept="2ShNRf" id="2Ltn1$mx2ft" role="37wK5m">
+                  <node concept="YeOm9" id="2Ltn1$mxzAI" role="2ShVmc">
+                    <node concept="1Y3b0j" id="2Ltn1$mxzAL" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <property role="373rjd" value="true" />
+                      <ref role="1Y3XeK" to="82uw:~Supplier" resolve="Supplier" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <node concept="3Tm1VV" id="2Ltn1$mxzAM" role="1B3o_S" />
+                      <node concept="3clFb_" id="2Ltn1$mxzAZ" role="jymVt">
+                        <property role="TrG5h" value="get" />
+                        <node concept="3Tm1VV" id="2Ltn1$mxzB0" role="1B3o_S" />
+                        <node concept="3uibUv" id="2Ltn1$mxzBd" role="3clF45">
+                          <ref role="3uigEE" to="jkm4:~ValidationInfo" resolve="ValidationInfo" />
+                        </node>
+                        <node concept="3clFbS" id="2Ltn1$mxzB3" role="3clF47">
+                          <node concept="3clFbJ" id="55oOaAFiZqB" role="3cqZAp">
+                            <node concept="37vLTw" id="55oOaAFjlAq" role="3clFbw">
+                              <ref role="3cqZAo" node="55oOaAFcfOp" resolve="matchRegex" />
+                            </node>
+                            <node concept="3clFbS" id="55oOaAFiZqD" role="3clFbx">
+                              <node concept="3J1_TO" id="55oOaAFl8Gd" role="3cqZAp">
+                                <node concept="3uVAMA" id="55oOaAFleLo" role="1zxBo5">
+                                  <node concept="XOnhg" id="55oOaAFleLp" role="1zc67B">
+                                    <property role="TrG5h" value="ex" />
+                                    <node concept="nSUau" id="55oOaAFleLq" role="1tU5fm">
+                                      <node concept="3uibUv" id="55oOaAFliyX" role="nSUat">
+                                        <ref role="3uigEE" to="ni5j:~PatternSyntaxException" resolve="PatternSyntaxException" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbS" id="55oOaAFleLr" role="1zc67A">
+                                    <node concept="3cpWs6" id="2Ltn1$mrI3v" role="3cqZAp">
+                                      <node concept="2ShNRf" id="2Ltn1$mrX61" role="3cqZAk">
+                                        <node concept="1pGfFk" id="2Ltn1$msdbb" role="2ShVmc">
+                                          <property role="373rjd" value="true" />
+                                          <ref role="37wK5l" to="jkm4:~ValidationInfo.&lt;init&gt;(java.lang.String,javax.swing.JComponent)" resolve="ValidationInfo" />
+                                          <node concept="3cpWs3" id="2Ltn1$mssj1" role="37wK5m">
+                                            <node concept="2OqwBi" id="2Ltn1$msAjw" role="3uHU7w">
+                                              <node concept="37vLTw" id="2Ltn1$mszvp" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="55oOaAFleLp" resolve="ex" />
+                                              </node>
+                                              <node concept="liA8E" id="2Ltn1$msEHm" role="2OqNvi">
+                                                <ref role="37wK5l" to="ni5j:~PatternSyntaxException.getMessage()" resolve="getMessage" />
+                                              </node>
+                                            </node>
+                                            <node concept="Xl_RD" id="2Ltn1$msk2M" role="3uHU7B">
+                                              <property role="Xl_RC" value="Invalid regular expression:" />
+                                            </node>
+                                          </node>
+                                          <node concept="37vLTw" id="2Ltn1$msXyc" role="37wK5m">
+                                            <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbS" id="55oOaAFl8Ge" role="1zxBo7">
+                                  <node concept="3cpWs8" id="55oOaAFkbZd" role="3cqZAp">
+                                    <node concept="3cpWsn" id="55oOaAFkbZe" role="3cpWs9">
+                                      <property role="TrG5h" value="pattern" />
+                                      <node concept="3uibUv" id="55oOaAFkbZf" role="1tU5fm">
+                                        <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
+                                      </node>
+                                      <node concept="2YIFZM" id="55oOaAFkqlG" role="33vP2m">
+                                        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String)" resolve="compile" />
+                                        <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
+                                        <node concept="2OqwBi" id="55oOaAFky$Y" role="37wK5m">
+                                          <node concept="37vLTw" id="55oOaAFkuVX" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+                                          </node>
+                                          <node concept="liA8E" id="55oOaAFkWV4" role="2OqNvi">
+                                            <ref role="37wK5l" to="r791:~JTextComponent.getText()" resolve="getText" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="RRSsy" id="2Ltn1$mBOrv" role="3cqZAp">
+                                    <node concept="3cpWs3" id="2Ltn1$mC4Rc" role="RRSoy">
+                                      <node concept="37vLTw" id="2Ltn1$mC6Er" role="3uHU7w">
+                                        <ref role="3cqZAo" node="55oOaAFkbZe" resolve="pattern" />
+                                      </node>
+                                      <node concept="Xl_RD" id="2Ltn1$mBOrx" role="3uHU7B">
+                                        <property role="Xl_RC" value="Validating pattern:" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3cpWs6" id="55oOaAFlZcD" role="3cqZAp">
+                                    <node concept="10Nm6u" id="2Ltn1$mry7q" role="3cqZAk" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="2Ltn1$mz8aq" role="3cqZAp">
+                            <node concept="10Nm6u" id="2Ltn1$mzewM" role="3cqZAk" />
+                          </node>
+                        </node>
+                        <node concept="2AHcQZ" id="2Ltn1$mxzB5" role="2AJF6D">
+                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="2Ltn1$mxzBc" role="2Ghqu4">
+                        <ref role="3uigEE" to="jkm4:~ValidationInfo" resolve="ValidationInfo" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="2Ltn1$mFZZC" role="2OqNvi">
+              <ref role="37wK5l" to="jkm4:~ComponentValidator.installOn(javax.swing.JComponent)" resolve="installOn" />
+              <node concept="37vLTw" id="2Ltn1$mGaqq" role="37wK5m">
+                <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2Ltn1$mtaE1" role="3cqZAp">
+          <node concept="2OqwBi" id="2Ltn1$mtr$A" role="3clFbG">
+            <node concept="2OqwBi" id="2Ltn1$mteUy" role="2Oq$k0">
+              <node concept="37vLTw" id="2Ltn1$mtaDZ" role="2Oq$k0">
+                <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+              </node>
+              <node concept="liA8E" id="2Ltn1$mtjyR" role="2OqNvi">
+                <ref role="37wK5l" to="r791:~JTextComponent.getDocument()" resolve="getDocument" />
+              </node>
+            </node>
+            <node concept="liA8E" id="2Ltn1$mttiZ" role="2OqNvi">
+              <ref role="37wK5l" to="r791:~Document.addDocumentListener(javax.swing.event.DocumentListener)" resolve="addDocumentListener" />
+              <node concept="2ShNRf" id="2Ltn1$mtxbB" role="37wK5m">
+                <node concept="YeOm9" id="2Ltn1$mtCEF" role="2ShVmc">
+                  <node concept="1Y3b0j" id="2Ltn1$mtCEI" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <property role="373rjd" value="true" />
+                    <ref role="1Y3XeK" to="lzb2:~DocumentAdapter" resolve="DocumentAdapter" />
+                    <ref role="37wK5l" to="lzb2:~DocumentAdapter.&lt;init&gt;()" resolve="DocumentAdapter" />
+                    <node concept="3Tm1VV" id="2Ltn1$mtCEJ" role="1B3o_S" />
+                    <node concept="3clFb_" id="2Ltn1$mtCEX" role="jymVt">
+                      <property role="TrG5h" value="textChanged" />
+                      <node concept="3Tmbuc" id="2Ltn1$mtCEY" role="1B3o_S" />
+                      <node concept="3cqZAl" id="2Ltn1$mtCF0" role="3clF45" />
+                      <node concept="37vLTG" id="2Ltn1$mtCF1" role="3clF46">
+                        <property role="TrG5h" value="e" />
+                        <node concept="3uibUv" id="2Ltn1$mtCF2" role="1tU5fm">
+                          <ref role="3uigEE" to="gsia:~DocumentEvent" resolve="DocumentEvent" />
+                        </node>
+                        <node concept="2AHcQZ" id="2Ltn1$mtCF3" role="2AJF6D">
+                          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="2Ltn1$mtCF4" role="3clF47">
+                        <node concept="3clFbF" id="2Ltn1$mtNL$" role="3cqZAp">
+                          <node concept="2OqwBi" id="2Ltn1$mu2Gh" role="3clFbG">
+                            <node concept="2YIFZM" id="2Ltn1$mtP6T" role="2Oq$k0">
+                              <ref role="37wK5l" to="jkm4:~ComponentValidator.getInstance(javax.swing.JComponent)" resolve="getInstance" />
+                              <ref role="1Pybhc" to="jkm4:~ComponentValidator" resolve="ComponentValidator" />
+                              <node concept="37vLTw" id="2Ltn1$mtWZZ" role="37wK5m">
+                                <ref role="3cqZAo" node="jpyKDg1Mqe" resolve="searchTerm" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="2Ltn1$muaEz" role="2OqNvi">
+                              <ref role="37wK5l" to="33ny:~Optional.ifPresent(java.util.function.Consumer)" resolve="ifPresent" />
+                              <node concept="1bVj0M" id="2Ltn1$muj1D" role="37wK5m">
+                                <node concept="gl6BB" id="2Ltn1$muj1N" role="1bW2Oz">
+                                  <property role="TrG5h" value="v" />
+                                  <node concept="2jxLKc" id="2Ltn1$muj1O" role="1tU5fm" />
+                                </node>
+                                <node concept="3clFbS" id="2Ltn1$muj5J" role="1bW5cS">
+                                  <node concept="3clFbF" id="2Ltn1$muppO" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2Ltn1$mupLh" role="3clFbG">
+                                      <node concept="37vLTw" id="2Ltn1$muppN" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2Ltn1$muj1N" resolve="v" />
+                                      </node>
+                                      <node concept="liA8E" id="2Ltn1$muqZ_" role="2OqNvi">
+                                        <ref role="37wK5l" to="jkm4:~ComponentValidator.revalidate()" resolve="revalidate" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="2Ltn1$mtCF6" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6KjVnJoO74C" role="3cqZAp">
           <node concept="2OqwBi" id="6KjVnJoOcnA" role="3clFbG">
             <node concept="37vLTw" id="6KjVnJoO74A" role="2Oq$k0">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
index 4db4280e5c7..cb69c8aa6a9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="com.mbeddr.core.base.pluginSolution" uuid="9e24fcdc-a232-4d24-8c95-1f525946191a" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -28,7 +28,6 @@
     <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
     <dependency reexport="false">5474e4cd-6621-4b33-a39a-75552543ba57(de.slisson.mps.conditionalEditor.hints)</dependency>
     <dependency reexport="false">8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)</dependency>
-    <dependency reexport="false">f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)</dependency>
     <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
     <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
   </dependencies>
@@ -109,7 +108,6 @@
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)" version="0" />
   </dependencyVersions>
 </solution>
 

From 9f6f0dc6f22bffbb10aa62af5e83938fd34f651f Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 15:41:37 +0100
Subject: [PATCH 34/38] core.base: fix some NullPointers

---
 .../languageModels/behavior.mps               |  33 +++--
 .../languageModels/behavior.mps               |  29 +++--
 .../languageModels/behavior.mps               | 116 ++++++++++++------
 3 files changed, 123 insertions(+), 55 deletions(-)

diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
index bb3c1436b6e..9baf32068cd 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
@@ -2078,17 +2078,30 @@
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="jpyKDg1A6F" role="3uHU7B">
-              <node concept="2OqwBi" id="jpyKDg1A6f" role="2Oq$k0">
-                <node concept="13iPFW" id="jpyKDg1A5U" role="2Oq$k0" />
-                <node concept="3TrcHB" id="jpyKDg1A6l" role="2OqNvi">
-                  <ref role="3TsBF5" to="75wo:2WRRjDdoyr7" resolve="summmary" />
+            <node concept="1eOMI4" id="74_l$W0KJ_2" role="3uHU7B">
+              <node concept="1Wc70l" id="74_l$W0KJBB" role="1eOMHV">
+                <node concept="3y3z36" id="74_l$W0KNGL" role="3uHU7B">
+                  <node concept="10Nm6u" id="74_l$W0KOu9" role="3uHU7w" />
+                  <node concept="2OqwBi" id="74_l$W0KKb9" role="3uHU7B">
+                    <node concept="13iPFW" id="74_l$W0KJN$" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="74_l$W0KMlY" role="2OqNvi">
+                      <ref role="3TsBF5" to="75wo:2WRRjDdoyr7" resolve="summmary" />
+                    </node>
+                  </node>
                 </node>
-              </node>
-              <node concept="liA8E" id="jpyKDg1A6L" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                <node concept="37vLTw" id="jpyKDg1A6M" role="37wK5m">
-                  <ref role="3cqZAo" node="jpyKDg1xQE" resolve="text" />
+                <node concept="2OqwBi" id="jpyKDg1A6F" role="3uHU7w">
+                  <node concept="2OqwBi" id="jpyKDg1A6f" role="2Oq$k0">
+                    <node concept="13iPFW" id="jpyKDg1A5U" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="jpyKDg1A6l" role="2OqNvi">
+                      <ref role="3TsBF5" to="75wo:2WRRjDdoyr7" resolve="summmary" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="jpyKDg1A6L" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                    <node concept="37vLTw" id="jpyKDg1A6M" role="37wK5m">
+                      <ref role="3cqZAo" node="jpyKDg1xQE" resolve="text" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 0530299ee9a..5beea8bb0ed 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -1021,17 +1021,28 @@
       <node concept="3Tm1VV" id="4ueXZrqtwBR" role="1B3o_S" />
       <node concept="3clFbS" id="4ueXZrqtwBS" role="3clF47">
         <node concept="3clFbF" id="4ueXZrqtwC7" role="3cqZAp">
-          <node concept="2OqwBi" id="4ueXZrqtwCT" role="3clFbG">
-            <node concept="2OqwBi" id="4ueXZrqtwCt" role="2Oq$k0">
-              <node concept="13iPFW" id="4ueXZrqtwC8" role="2Oq$k0" />
-              <node concept="3TrEf2" id="4ueXZrqtwCz" role="2OqNvi">
-                <ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
+          <node concept="1Wc70l" id="74_l$W0LTj4" role="3clFbG">
+            <node concept="3y3z36" id="7dimqCumkVo" role="3uHU7B">
+              <node concept="10Nm6u" id="7dimqCuml0j" role="3uHU7w" />
+              <node concept="2OqwBi" id="7dimqCumkg6" role="3uHU7B">
+                <node concept="13iPFW" id="7dimqCumjYi" role="2Oq$k0" />
+                <node concept="3TrEf2" id="7dimqCumkIv" role="2OqNvi">
+                  <ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
+                </node>
               </node>
             </node>
-            <node concept="2qgKlT" id="4ueXZrqtwCZ" role="2OqNvi">
-              <ref role="37wK5l" node="jpyKDg1A7A" resolve="containsText" />
-              <node concept="37vLTw" id="4ueXZrqtwD0" role="37wK5m">
-                <ref role="3cqZAo" node="4ueXZrqtwBT" resolve="text" />
+            <node concept="2OqwBi" id="4ueXZrqtwCT" role="3uHU7w">
+              <node concept="2OqwBi" id="4ueXZrqtwCt" role="2Oq$k0">
+                <node concept="13iPFW" id="4ueXZrqtwC8" role="2Oq$k0" />
+                <node concept="3TrEf2" id="4ueXZrqtwCz" role="2OqNvi">
+                  <ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
+                </node>
+              </node>
+              <node concept="2qgKlT" id="4ueXZrqtwCZ" role="2OqNvi">
+                <ref role="37wK5l" node="jpyKDg1A7A" resolve="containsText" />
+                <node concept="37vLTw" id="4ueXZrqtwD0" role="37wK5m">
+                  <ref role="3cqZAo" node="4ueXZrqtwBT" resolve="text" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
index f1f6b2ce499..adb0a21f102 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
@@ -2234,17 +2234,28 @@
       <node concept="3Tm1VV" id="jpyKDg34iG" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34iH" role="3clF47">
         <node concept="3clFbF" id="jpyKDg34iI" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg34iJ" role="3clFbG">
-            <node concept="2OqwBi" id="jpyKDg34iK" role="2Oq$k0">
-              <node concept="13iPFW" id="jpyKDg34iL" role="2Oq$k0" />
-              <node concept="3TrcHB" id="jpyKDg34jf" role="2OqNvi">
-                <ref role="3TsBF5" to="2c95:2TZO3Dbv6Jx" resolve="text" />
+          <node concept="1Wc70l" id="74_l$W0M7fx" role="3clFbG">
+            <node concept="3y3z36" id="74_l$W0M9xv" role="3uHU7B">
+              <node concept="10Nm6u" id="74_l$W0MahM" role="3uHU7w" />
+              <node concept="2OqwBi" id="74_l$W0M7E9" role="3uHU7B">
+                <node concept="13iPFW" id="74_l$W0M7ho" role="2Oq$k0" />
+                <node concept="3TrcHB" id="74_l$W0M8gv" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:2TZO3Dbv6Jx" resolve="text" />
+                </node>
               </node>
             </node>
-            <node concept="liA8E" id="jpyKDg34jj" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-              <node concept="37vLTw" id="jpyKDg34jk" role="37wK5m">
-                <ref role="3cqZAo" node="jpyKDg34iP" resolve="text" />
+            <node concept="2OqwBi" id="jpyKDg34iJ" role="3uHU7w">
+              <node concept="2OqwBi" id="jpyKDg34iK" role="2Oq$k0">
+                <node concept="13iPFW" id="jpyKDg34iL" role="2Oq$k0" />
+                <node concept="3TrcHB" id="jpyKDg34jf" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:2TZO3Dbv6Jx" resolve="text" />
+                </node>
+              </node>
+              <node concept="liA8E" id="jpyKDg34jj" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                <node concept="37vLTw" id="jpyKDg34jk" role="37wK5m">
+                  <ref role="3cqZAo" node="jpyKDg34iP" resolve="text" />
+                </node>
               </node>
             </node>
           </node>
@@ -4060,17 +4071,28 @@
       <node concept="3Tm1VV" id="jpyKDg34cN" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34cO" role="3clF47">
         <node concept="3clFbF" id="jpyKDg34d3" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg34e1" role="3clFbG">
-            <node concept="2OqwBi" id="jpyKDg34dp" role="2Oq$k0">
-              <node concept="13iPFW" id="jpyKDg34d4" role="2Oq$k0" />
-              <node concept="3TrcHB" id="jpyKDg34dx" role="2OqNvi">
-                <ref role="3TsBF5" to="2c95:4vQSg$Ar0ev" resolve="text" />
+          <node concept="1Wc70l" id="74_l$W0MkIO" role="3clFbG">
+            <node concept="3y3z36" id="74_l$W0Mmv3" role="3uHU7B">
+              <node concept="10Nm6u" id="74_l$W0MnfD" role="3uHU7w" />
+              <node concept="2OqwBi" id="74_l$W0MkZ0" role="3uHU7B">
+                <node concept="13iPFW" id="74_l$W0MkKf" role="2Oq$k0" />
+                <node concept="3TrcHB" id="74_l$W0MldY" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:4vQSg$Ar0ev" resolve="text" />
+                </node>
               </node>
             </node>
-            <node concept="liA8E" id="jpyKDg34e7" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-              <node concept="37vLTw" id="jpyKDg34e8" role="37wK5m">
-                <ref role="3cqZAo" node="jpyKDg34cP" resolve="text" />
+            <node concept="2OqwBi" id="jpyKDg34e1" role="3uHU7w">
+              <node concept="2OqwBi" id="jpyKDg34dp" role="2Oq$k0">
+                <node concept="13iPFW" id="jpyKDg34d4" role="2Oq$k0" />
+                <node concept="3TrcHB" id="jpyKDg34dx" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:4vQSg$Ar0ev" resolve="text" />
+                </node>
+              </node>
+              <node concept="liA8E" id="jpyKDg34e7" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                <node concept="37vLTw" id="jpyKDg34e8" role="37wK5m">
+                  <ref role="3cqZAo" node="jpyKDg34cP" resolve="text" />
+                </node>
               </node>
             </node>
           </node>
@@ -4115,17 +4137,28 @@
       <node concept="3Tm1VV" id="jpyKDg34er" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34es" role="3clF47">
         <node concept="3clFbF" id="jpyKDg34eF" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg34ft" role="3clFbG">
-            <node concept="2OqwBi" id="jpyKDg34f1" role="2Oq$k0">
-              <node concept="13iPFW" id="jpyKDg34eG" role="2Oq$k0" />
-              <node concept="3TrcHB" id="jpyKDg34f7" role="2OqNvi">
-                <ref role="3TsBF5" to="2c95:7$DvC4gUq7E" resolve="text" />
+          <node concept="1Wc70l" id="74_l$W0MeYx" role="3clFbG">
+            <node concept="3y3z36" id="74_l$W0Mh2u" role="3uHU7B">
+              <node concept="10Nm6u" id="74_l$W0MhML" role="3uHU7w" />
+              <node concept="2OqwBi" id="74_l$W0Mfkt" role="3uHU7B">
+                <node concept="13iPFW" id="74_l$W0MeZG" role="2Oq$k0" />
+                <node concept="3TrcHB" id="74_l$W0MfLp" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:7$DvC4gUq7E" resolve="text" />
+                </node>
               </node>
             </node>
-            <node concept="liA8E" id="jpyKDg34fz" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-              <node concept="37vLTw" id="jpyKDg34f$" role="37wK5m">
-                <ref role="3cqZAo" node="jpyKDg34et" resolve="text" />
+            <node concept="2OqwBi" id="jpyKDg34ft" role="3uHU7w">
+              <node concept="2OqwBi" id="jpyKDg34f1" role="2Oq$k0">
+                <node concept="13iPFW" id="jpyKDg34eG" role="2Oq$k0" />
+                <node concept="3TrcHB" id="jpyKDg34f7" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:7$DvC4gUq7E" resolve="text" />
+                </node>
+              </node>
+              <node concept="liA8E" id="jpyKDg34fz" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                <node concept="37vLTw" id="jpyKDg34f$" role="37wK5m">
+                  <ref role="3cqZAo" node="jpyKDg34et" resolve="text" />
+                </node>
               </node>
             </node>
           </node>
@@ -4265,17 +4298,28 @@
       <node concept="3Tm1VV" id="jpyKDg34kX" role="1B3o_S" />
       <node concept="3clFbS" id="jpyKDg34kY" role="3clF47">
         <node concept="3clFbF" id="jpyKDg34kZ" role="3cqZAp">
-          <node concept="2OqwBi" id="jpyKDg34l0" role="3clFbG">
-            <node concept="2OqwBi" id="jpyKDg34l1" role="2Oq$k0">
-              <node concept="13iPFW" id="jpyKDg34l2" role="2Oq$k0" />
-              <node concept="3TrcHB" id="jpyKDg34lv" role="2OqNvi">
-                <ref role="3TsBF5" to="2c95:4vQSg$ArKJS" resolve="text" />
+          <node concept="1Wc70l" id="74_l$W0Mic3" role="3clFbG">
+            <node concept="3y3z36" id="74_l$W0Mk2p" role="3uHU7B">
+              <node concept="10Nm6u" id="74_l$W0Mk2s" role="3uHU7w" />
+              <node concept="2OqwBi" id="74_l$W0Miw1" role="3uHU7B">
+                <node concept="13iPFW" id="74_l$W0Migg" role="2Oq$k0" />
+                <node concept="3TrcHB" id="74_l$W0MiLk" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:4vQSg$ArKJS" resolve="text" />
+                </node>
               </node>
             </node>
-            <node concept="liA8E" id="jpyKDg34lB" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-              <node concept="37vLTw" id="jpyKDg34lC" role="37wK5m">
-                <ref role="3cqZAo" node="jpyKDg34l6" resolve="text" />
+            <node concept="2OqwBi" id="jpyKDg34l0" role="3uHU7w">
+              <node concept="2OqwBi" id="jpyKDg34l1" role="2Oq$k0">
+                <node concept="13iPFW" id="jpyKDg34l2" role="2Oq$k0" />
+                <node concept="3TrcHB" id="jpyKDg34lv" role="2OqNvi">
+                  <ref role="3TsBF5" to="2c95:4vQSg$ArKJS" resolve="text" />
+                </node>
+              </node>
+              <node concept="liA8E" id="jpyKDg34lB" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                <node concept="37vLTw" id="jpyKDg34lC" role="37wK5m">
+                  <ref role="3cqZAo" node="jpyKDg34l6" resolve="text" />
+                </node>
               </node>
             </node>
           </node>

From 55fce676b1783c0a7cbb7bdba9c2fdbb62ca362b Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 15:41:30 +0100
Subject: [PATCH 35/38] core.base: add support for filtering nodes

---
 CHANGELOG.md                                  |   2 +-
 .../core/base/pluginSolution/plugin.mps       | 610 ++++++++++++++++++
 .../pluginSolution/pluginSolution.msd         |   1 +
 3 files changed, 612 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc26eb06775..8819adb2289 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 ### Changed
 
-- The mbeddr search tool was improved: It can now also search languages, the project and globally. It also got options for approximate searching with an error distance matching the case and searching by a regular expression. The UI was also improved.
+- The mbeddr search tool was improved: It can now also search languages, the project and globally. It also got options for approximate searching with an error distance matching the case and searching by a regular expression. Nodes that should or should not be filter, can now be customized through the extension point `SearchNodeFilter`. The UI was also improved.
 
 ## com.mbeddr.mpsutil
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index eb26fe9d6c9..b3bf44bbfe8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -20,6 +20,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -265,6 +266,9 @@
       <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
       <concept id="1153422105332" name="jetbrains.mps.baseLanguage.structure.RemExpression" flags="nn" index="2dk9JS" />
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
+        <child id="2323553266850475953" name="modifiers" index="2frcjj" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
@@ -292,6 +296,7 @@
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
+      <concept id="4678410916365116210" name="jetbrains.mps.baseLanguage.structure.DefaultModifier" flags="ng" index="2JFqV2" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -554,6 +559,15 @@
         <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
       </concept>
     </language>
+    <language id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension">
+      <concept id="3729007189729192406" name="jetbrains.mps.lang.extension.structure.ExtensionPointDeclaration" flags="ng" index="vrV6u">
+        <child id="8029776554053057803" name="objectType" index="luc8K" />
+      </concept>
+      <concept id="6626851894249711936" name="jetbrains.mps.lang.extension.structure.ExtensionPointExpression" flags="nn" index="2O5UvJ">
+        <reference id="6626851894249712469" name="extensionPoint" index="2O5UnU" />
+      </concept>
+      <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
+    </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
       <concept id="8738853969697765531" name="com.mbeddr.mpsutil.blutil.structure.GridConstraintsNextColumOperation" flags="ng" index="3QB_RT" />
     </language>
@@ -622,6 +636,9 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
+        <child id="1204834868751" name="expression" index="25KhWn" />
+      </concept>
       <concept id="3506770386464365589" name="jetbrains.mps.lang.smodel.structure.Model_PointerOperation" flags="ng" index="aIX43" />
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -633,6 +650,9 @@
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -755,6 +775,7 @@
       <concept id="1209727891789" name="jetbrains.mps.baseLanguage.collections.structure.ComparatorSortOperation" flags="nn" index="2DpFxk">
         <child id="1209727996925" name="ascending" index="2Dq5b$" />
       </concept>
+      <concept id="1226934395923" name="jetbrains.mps.baseLanguage.collections.structure.ClearSetOperation" flags="nn" index="2EZike" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -763,14 +784,19 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
+      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
+      <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
+        <child id="1201654602639" name="key" index="38cxEo" />
+      </concept>
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
+      <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -783,12 +809,25 @@
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
+      <concept id="1173946412755" name="jetbrains.mps.baseLanguage.collections.structure.RemoveAllElementsOperation" flags="nn" index="1kEaZ2" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
+      <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
+        <child id="1197687026896" name="keyType" index="3rHrn6" />
+        <child id="1197687035757" name="valueType" index="3rHtpV" />
+      </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
+      <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
+        <child id="1197932505799" name="map" index="3ElQJh" />
+        <child id="1197932525128" name="key" index="3ElVtu" />
+      </concept>
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
@@ -3247,6 +3286,81 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="3Aq_54EVrt5" role="3cqZAp">
+          <node concept="3cpWsn" id="3Aq_54EVrt6" role="3cpWs9">
+            <property role="TrG5h" value="filters" />
+            <node concept="_YKpA" id="3Aq_54EWvYh" role="1tU5fm">
+              <node concept="3uibUv" id="3Aq_54EWvYj" role="_ZDj9">
+                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="3Aq_54F4fAG" role="33vP2m">
+              <ref role="37wK5l" node="3Aq_54F139Q" resolve="getFilters" />
+              <ref role="1Pybhc" node="3Aq_54F0ZVR" resolve="SearchRootFilterConfig" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3Aq_54EVU2j" role="3cqZAp">
+          <node concept="3clFbS" id="3Aq_54EVU2l" role="3clFbx">
+            <node concept="3clFbF" id="2Ltn1$n32eM" role="3cqZAp">
+              <node concept="2OqwBi" id="2Ltn1$n35qy" role="3clFbG">
+                <node concept="37vLTw" id="2Ltn1$n32eK" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
+                </node>
+                <node concept="liA8E" id="2Ltn1$n385w" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+                  <node concept="2ShNRf" id="2Ltn1$n3f8n" role="37wK5m">
+                    <node concept="1pGfFk" id="2Ltn1$n3rLL" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="qkt:~Separator.&lt;init&gt;()" resolve="Separator" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3Aq_54EXaBL" role="3cqZAp">
+              <node concept="2OqwBi" id="3Aq_54EXfyQ" role="3clFbG">
+                <node concept="37vLTw" id="3Aq_54EXaBJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3Aq_54EVrt6" resolve="filters" />
+                </node>
+                <node concept="2es0OD" id="3Aq_54EXiKY" role="2OqNvi">
+                  <node concept="1bVj0M" id="3Aq_54EXiL0" role="23t8la">
+                    <node concept="3clFbS" id="3Aq_54EXiL1" role="1bW5cS">
+                      <node concept="3clFbF" id="3Aq_54EX_Kb" role="3cqZAp">
+                        <node concept="2OqwBi" id="3Aq_54EXBo$" role="3clFbG">
+                          <node concept="37vLTw" id="3Aq_54EX_Ka" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3sIEoj5P59E" resolve="group" />
+                          </node>
+                          <node concept="liA8E" id="3Aq_54EXL1Z" role="2OqNvi">
+                            <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+                            <node concept="2OqwBi" id="3Aq_54EY6Ud" role="37wK5m">
+                              <node concept="37vLTw" id="3Aq_54EY34B" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3Aq_54EXiL2" resolve="it" />
+                              </node>
+                              <node concept="liA8E" id="3Aq_54EYe66" role="2OqNvi">
+                                <ref role="37wK5l" node="a26E1jqaH_" resolve="getAction" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="gl6BB" id="3Aq_54EXiL2" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="3Aq_54EXiL3" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3Aq_54EW9ym" role="3clFbw">
+            <node concept="37vLTw" id="3Aq_54EW5d9" role="2Oq$k0">
+              <ref role="3cqZAo" node="3Aq_54EVrt6" resolve="filters" />
+            </node>
+            <node concept="3GX2aA" id="3Aq_54EWbPV" role="2OqNvi" />
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="3sIEoj5P59E" role="3clF46">
         <property role="TrG5h" value="group" />
@@ -4813,6 +4927,78 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3cpWs8" id="3Aq_54F4VVN" role="3cqZAp">
+                          <node concept="3cpWsn" id="3Aq_54F4VVO" role="3cpWs9">
+                            <property role="TrG5h" value="filters" />
+                            <node concept="_YKpA" id="3Aq_54F4UFA" role="1tU5fm">
+                              <node concept="3uibUv" id="3Aq_54F4UFD" role="_ZDj9">
+                                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="6lcJS77plj7" role="33vP2m">
+                              <node concept="2OqwBi" id="6lcJS77p60U" role="2Oq$k0">
+                                <node concept="2YIFZM" id="3Aq_54F4VVP" role="2Oq$k0">
+                                  <ref role="37wK5l" node="3Aq_54F139Q" resolve="getFilters" />
+                                  <ref role="1Pybhc" node="3Aq_54F0ZVR" resolve="SearchNodeFilterConfig" />
+                                </node>
+                                <node concept="3zZkjj" id="6lcJS77pbi4" role="2OqNvi">
+                                  <node concept="1bVj0M" id="6lcJS77pbi6" role="23t8la">
+                                    <node concept="3clFbS" id="6lcJS77pbi7" role="1bW5cS">
+                                      <node concept="3clFbF" id="6lcJS77pf3l" role="3cqZAp">
+                                        <node concept="2OqwBi" id="6lcJS77ph9y" role="3clFbG">
+                                          <node concept="37vLTw" id="6lcJS77pf3k" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="6lcJS77pbi8" resolve="it" />
+                                          </node>
+                                          <node concept="liA8E" id="6lcJS77piSH" role="2OqNvi">
+                                            <ref role="37wK5l" node="6lcJS77noe7" resolve="isEnabled" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="gl6BB" id="6lcJS77pbi8" role="1bW2Oz">
+                                      <property role="TrG5h" value="it" />
+                                      <node concept="2jxLKc" id="6lcJS77pbi9" role="1tU5fm" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="ANE8D" id="6lcJS77poUp" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="3Aq_54F4U2G" role="3cqZAp" />
+                        <node concept="3cpWs8" id="4pE0ZzOQKPt" role="3cqZAp">
+                          <node concept="3cpWsn" id="4pE0ZzOQKPw" role="3cpWs9">
+                            <property role="TrG5h" value="inclusionMode" />
+                            <node concept="10P_77" id="4pE0ZzOQKPr" role="1tU5fm" />
+                            <node concept="2OqwBi" id="4pE0ZzOQURm" role="33vP2m">
+                              <node concept="37vLTw" id="4pE0ZzOQR9o" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3Aq_54F4VVO" resolve="filters" />
+                              </node>
+                              <node concept="2HwmR7" id="4pE0ZzOQZel" role="2OqNvi">
+                                <node concept="1bVj0M" id="4pE0ZzOQZen" role="23t8la">
+                                  <node concept="3clFbS" id="4pE0ZzOQZeo" role="1bW5cS">
+                                    <node concept="3clFbF" id="4pE0ZzOR2L9" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4pE0ZzOR4GV" role="3clFbG">
+                                        <node concept="37vLTw" id="4pE0ZzOR2L8" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="4pE0ZzOQZep" resolve="it" />
+                                        </node>
+                                        <node concept="liA8E" id="4pE0ZzOR7_q" role="2OqNvi">
+                                          <ref role="37wK5l" node="3Aq_54F9aaO" resolve="isInclusionFilter" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="gl6BB" id="4pE0ZzOQZep" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="4pE0ZzOQZeq" role="1tU5fm" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="4pE0ZzOQBI2" role="3cqZAp" />
                         <node concept="2Gpval" id="vqDSp9Sb6J" role="3cqZAp">
                           <node concept="2GrKxI" id="vqDSp9Sb6L" role="2Gsz3X">
                             <property role="TrG5h" value="model" />
@@ -4834,6 +5020,33 @@
                                 </node>
                               </node>
                             </node>
+                            <node concept="3cpWs8" id="3Aq_54F6lV2" role="3cqZAp">
+                              <node concept="3cpWsn" id="3Aq_54F6lV5" role="3cpWs9">
+                                <property role="TrG5h" value="toBeRemoved" />
+                                <node concept="_YKpA" id="3Aq_54F6lUY" role="1tU5fm">
+                                  <node concept="3Tqbb2" id="3Aq_54F6oHG" role="_ZDj9" />
+                                </node>
+                                <node concept="2ShNRf" id="3Aq_54F6xsa" role="33vP2m">
+                                  <node concept="2Jqq0_" id="3Aq_54F6_mj" role="2ShVmc">
+                                    <node concept="3Tqbb2" id="3Aq_54F6C_C" role="HW$YZ" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs8" id="3Aq_54F9dTm" role="3cqZAp">
+                              <node concept="3cpWsn" id="3Aq_54F9dTn" role="3cpWs9">
+                                <property role="TrG5h" value="toBeKept" />
+                                <node concept="_YKpA" id="3Aq_54F9dTo" role="1tU5fm">
+                                  <node concept="3Tqbb2" id="3Aq_54F9dTp" role="_ZDj9" />
+                                </node>
+                                <node concept="2ShNRf" id="3Aq_54F9dTq" role="33vP2m">
+                                  <node concept="2Jqq0_" id="3Aq_54F9dTr" role="2ShVmc">
+                                    <node concept="3Tqbb2" id="3Aq_54F9dTs" role="HW$YZ" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="3Aq_54F4Oez" role="3cqZAp" />
                             <node concept="1QHqEK" id="7DRyZmDiVJv" role="3cqZAp">
                               <node concept="1QHqEC" id="7DRyZmDiVJx" role="1QHqEI">
                                 <node concept="3clFbS" id="7DRyZmDiVJz" role="1bW5cS">
@@ -4901,6 +5114,170 @@
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="3clFbH" id="6lcJS77lU7v" role="3cqZAp" />
+                                  <node concept="2Gpval" id="3Aq_54F5lQP" role="3cqZAp">
+                                    <node concept="2GrKxI" id="3Aq_54F5lQR" role="2Gsz3X">
+                                      <property role="TrG5h" value="filter" />
+                                    </node>
+                                    <node concept="37vLTw" id="3Aq_54F5wI7" role="2GsD0m">
+                                      <ref role="3cqZAo" node="3Aq_54F4VVO" resolve="filters" />
+                                    </node>
+                                    <node concept="3clFbS" id="3Aq_54F5lQV" role="2LFqv$">
+                                      <node concept="2Gpval" id="3Aq_54F5G3Y" role="3cqZAp">
+                                        <node concept="2GrKxI" id="3Aq_54F5G3Z" role="2Gsz3X">
+                                          <property role="TrG5h" value="concept" />
+                                        </node>
+                                        <node concept="2OqwBi" id="3Aq_54F5WPr" role="2GsD0m">
+                                          <node concept="2GrUjf" id="3Aq_54F5VCx" role="2Oq$k0">
+                                            <ref role="2Gs0qQ" node="3Aq_54F5lQR" resolve="filter" />
+                                          </node>
+                                          <node concept="liA8E" id="3Aq_54F5YrP" role="2OqNvi">
+                                            <ref role="37wK5l" node="3Aq_54EZAza" resolve="getApplicableConcepts" />
+                                          </node>
+                                        </node>
+                                        <node concept="3clFbS" id="3Aq_54F5G41" role="2LFqv$">
+                                          <node concept="3clFbF" id="3Aq_54F6IVr" role="3cqZAp">
+                                            <node concept="2OqwBi" id="3Aq_54F6KTM" role="3clFbG">
+                                              <node concept="2OqwBi" id="3Aq_54F65cw" role="2Oq$k0">
+                                                <node concept="37vLTw" id="3Aq_54F60xW" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                                </node>
+                                                <node concept="v3k3i" id="3Aq_54F68bm" role="2OqNvi">
+                                                  <node concept="25Kdxt" id="3Aq_54F69AK" role="v3oSu">
+                                                    <node concept="2GrUjf" id="3Aq_54F6bBK" role="25KhWn">
+                                                      <ref role="2Gs0qQ" node="3Aq_54F5G3Z" resolve="concept" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="2es0OD" id="3Aq_54F6MGb" role="2OqNvi">
+                                                <node concept="1bVj0M" id="3Aq_54F6MGd" role="23t8la">
+                                                  <node concept="3clFbS" id="3Aq_54F6MGe" role="1bW5cS">
+                                                    <node concept="3clFbJ" id="3Aq_54F6RBe" role="3cqZAp">
+                                                      <node concept="2OqwBi" id="3Aq_54F6W95" role="3clFbw">
+                                                        <node concept="2GrUjf" id="3Aq_54F6TEf" role="2Oq$k0">
+                                                          <ref role="2Gs0qQ" node="3Aq_54F5lQR" resolve="filter" />
+                                                        </node>
+                                                        <node concept="liA8E" id="3Aq_54F6YEu" role="2OqNvi">
+                                                          <ref role="37wK5l" node="a26E1jqbxF" resolve="filter" />
+                                                          <node concept="37vLTw" id="3Aq_54F71XF" role="37wK5m">
+                                                            <ref role="3cqZAo" node="3Aq_54F6MGf" resolve="it" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3clFbS" id="3Aq_54F6RBg" role="3clFbx">
+                                                        <node concept="3clFbJ" id="3Aq_54F9v5_" role="3cqZAp">
+                                                          <node concept="3clFbS" id="3Aq_54F9v5B" role="3clFbx">
+                                                            <node concept="3clFbF" id="3Aq_54F74qE" role="3cqZAp">
+                                                              <node concept="2OqwBi" id="3Aq_54F79uL" role="3clFbG">
+                                                                <node concept="37vLTw" id="3Aq_54F74qD" role="2Oq$k0">
+                                                                  <ref role="3cqZAo" node="3Aq_54F9dTn" resolve="toBeKept" />
+                                                                </node>
+                                                                <node concept="TSZUe" id="3Aq_54F7d9U" role="2OqNvi">
+                                                                  <node concept="37vLTw" id="3Aq_54F7fOn" role="25WWJ7">
+                                                                    <ref role="3cqZAo" node="3Aq_54F6MGf" resolve="it" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                          <node concept="9aQIb" id="3Aq_54F9J94" role="9aQIa">
+                                                            <node concept="3clFbS" id="3Aq_54F9J95" role="9aQI4">
+                                                              <node concept="3clFbF" id="3Aq_54F9Llb" role="3cqZAp">
+                                                                <node concept="2OqwBi" id="3Aq_54F9Qrv" role="3clFbG">
+                                                                  <node concept="37vLTw" id="3Aq_54F9Lla" role="2Oq$k0">
+                                                                    <ref role="3cqZAo" node="3Aq_54F6lV5" resolve="toBeRemoved" />
+                                                                  </node>
+                                                                  <node concept="TSZUe" id="3Aq_54F9VQi" role="2OqNvi">
+                                                                    <node concept="37vLTw" id="3Aq_54F9YBp" role="25WWJ7">
+                                                                      <ref role="3cqZAo" node="3Aq_54F6MGf" resolve="it" />
+                                                                    </node>
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                          <node concept="37vLTw" id="4pE0ZzORbU5" role="3clFbw">
+                                                            <ref role="3cqZAo" node="4pE0ZzOQKPw" resolve="inclusionMode" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="gl6BB" id="3Aq_54F6MGf" role="1bW2Oz">
+                                                    <property role="TrG5h" value="it" />
+                                                    <node concept="2jxLKc" id="3Aq_54F6MGg" role="1tU5fm" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="3Aq_54Fa7hE" role="3cqZAp">
+                                    <node concept="3clFbS" id="3Aq_54Fa7hG" role="3clFbx">
+                                      <node concept="3clFbF" id="3Aq_54Falvr" role="3cqZAp">
+                                        <node concept="2OqwBi" id="3Aq_54FaqhK" role="3clFbG">
+                                          <node concept="37vLTw" id="3Aq_54Falvp" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                          </node>
+                                          <node concept="2EZike" id="3Aq_54FaudY" role="2OqNvi" />
+                                        </node>
+                                      </node>
+                                      <node concept="3clFbF" id="3xvcks_BetW" role="3cqZAp">
+                                        <node concept="2OqwBi" id="3xvcks_BiQG" role="3clFbG">
+                                          <node concept="37vLTw" id="3xvcks_BetU" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                          </node>
+                                          <node concept="X8dFx" id="3xvcks_BoEA" role="2OqNvi">
+                                            <node concept="37vLTw" id="3xvcks_BqM5" role="25WWJ7">
+                                              <ref role="3cqZAo" node="3Aq_54F9dTn" resolve="toBeKept" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2OqwBi" id="3Aq_54Fafzl" role="3clFbw">
+                                      <node concept="37vLTw" id="3Aq_54Faag$" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3Aq_54F9dTn" resolve="toBeKept" />
+                                      </node>
+                                      <node concept="3GX2aA" id="3Aq_54FajiD" role="2OqNvi" />
+                                    </node>
+                                    <node concept="3eNFk2" id="4pE0ZzORrmf" role="3eNLev">
+                                      <node concept="37vLTw" id="4pE0ZzORuCe" role="3eO9$A">
+                                        <ref role="3cqZAo" node="4pE0ZzOQKPw" resolve="inclusionMode" />
+                                      </node>
+                                      <node concept="3clFbS" id="4pE0ZzORrmh" role="3eOfB_">
+                                        <node concept="3clFbF" id="4pE0ZzORxWG" role="3cqZAp">
+                                          <node concept="2OqwBi" id="4pE0ZzORAoY" role="3clFbG">
+                                            <node concept="37vLTw" id="4pE0ZzORxWF" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                            </node>
+                                            <node concept="2EZike" id="4pE0ZzOREm4" role="2OqNvi" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="9aQIb" id="3xvcks_BtwK" role="9aQIa">
+                                      <node concept="3clFbS" id="3xvcks_BtwL" role="9aQI4">
+                                        <node concept="3clFbF" id="3Aq_54F7icY" role="3cqZAp">
+                                          <node concept="2OqwBi" id="3Aq_54F7mWp" role="3clFbG">
+                                            <node concept="37vLTw" id="3Aq_54F7icW" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="7DRyZmDoGXa" resolve="toBeSearched" />
+                                            </node>
+                                            <node concept="1kEaZ2" id="3Aq_54F7pTm" role="2OqNvi">
+                                              <node concept="37vLTw" id="3Aq_54F7rZp" role="25WWJ7">
+                                                <ref role="3cqZAo" node="3Aq_54F6lV5" resolve="toBeRemoved" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbH" id="6lcJS77lU7w" role="3cqZAp" />
                                 </node>
                               </node>
                               <node concept="2OqwBi" id="3k8awrIlWr_" role="ukAjM">
@@ -4912,6 +5289,7 @@
                                 </node>
                               </node>
                             </node>
+                            <node concept="3clFbH" id="3Aq_54F9fER" role="3cqZAp" />
                             <node concept="3cpWs8" id="vqDSp9UErm" role="3cqZAp">
                               <node concept="3cpWsn" id="vqDSp9UErn" role="3cpWs9">
                                 <property role="TrG5h" value="subTask" />
@@ -25408,5 +25786,237 @@
       </node>
     </node>
   </node>
+  <node concept="vrV6u" id="a26E1jm$Fv">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchNodeFilter" />
+    <node concept="3uibUv" id="a26E1jqcd5" role="luc8K">
+      <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+    </node>
+  </node>
+  <node concept="3HP615" id="a26E1jqa3S">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="ISearchNodeFilter" />
+    <node concept="3clFb_" id="3Aq_54EZ_6B" role="jymVt">
+      <property role="TrG5h" value="getPriority" />
+      <node concept="3clFbS" id="3Aq_54EZ_6E" role="3clF47">
+        <node concept="3clFbF" id="3Aq_54EZ_xk" role="3cqZAp">
+          <node concept="3cmrfG" id="3Aq_54EZ_xj" role="3clFbG">
+            <property role="3cmrfH" value="0" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3Aq_54EZ_6F" role="1B3o_S" />
+      <node concept="10Oyi0" id="3Aq_54EZ_5S" role="3clF45" />
+      <node concept="2JFqV2" id="3Aq_54EZ_7F" role="2frcjj" />
+    </node>
+    <node concept="2tJIrI" id="3Aq_54EZ_yr" role="jymVt" />
+    <node concept="3clFb_" id="3Aq_54EZAza" role="jymVt">
+      <property role="TrG5h" value="getApplicableConcepts" />
+      <node concept="3clFbS" id="3Aq_54EZAzd" role="3clF47" />
+      <node concept="3Tm1VV" id="3Aq_54EZAze" role="1B3o_S" />
+      <node concept="2hMVRd" id="3Aq_54F2KDs" role="3clF45">
+        <node concept="3bZ5Sz" id="3Aq_54F2KLK" role="2hN53Y" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3Aq_54EZ$BV" role="jymVt" />
+    <node concept="3clFb_" id="a26E1jqaH_" role="jymVt">
+      <property role="TrG5h" value="getAction" />
+      <node concept="3clFbS" id="a26E1jqaHC" role="3clF47" />
+      <node concept="3Tm1VV" id="a26E1jqaHD" role="1B3o_S" />
+      <node concept="3uibUv" id="a26E1jqaHr" role="3clF45">
+        <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="a26E1jqaI2" role="jymVt" />
+    <node concept="3clFb_" id="3Aq_54F9aaO" role="jymVt">
+      <property role="TrG5h" value="isInclusionFilter" />
+      <node concept="3clFbS" id="3Aq_54F9aaR" role="3clF47" />
+      <node concept="3Tm1VV" id="3Aq_54F9aaS" role="1B3o_S" />
+      <node concept="10P_77" id="3Aq_54F9a9N" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="3Aq_54F99lC" role="jymVt" />
+    <node concept="3clFb_" id="a26E1jqbxF" role="jymVt">
+      <property role="TrG5h" value="filter" />
+      <node concept="3clFbS" id="a26E1jqbxI" role="3clF47" />
+      <node concept="3Tm1VV" id="a26E1jqbxJ" role="1B3o_S" />
+      <node concept="10P_77" id="a26E1jqbxg" role="3clF45" />
+      <node concept="37vLTG" id="a26E1jqc6Y" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="a26E1jqc6X" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3Aq_54EZ$8x" role="jymVt" />
+    <node concept="3clFb_" id="6lcJS77noe7" role="jymVt">
+      <property role="TrG5h" value="isEnabled" />
+      <node concept="3clFbS" id="6lcJS77noea" role="3clF47" />
+      <node concept="3Tm1VV" id="6lcJS77noeb" role="1B3o_S" />
+      <node concept="10P_77" id="6lcJS77nocP" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="a26E1jqa3T" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="3Aq_54F0ZVR">
+    <property role="3GE5qa" value="search" />
+    <property role="TrG5h" value="SearchNodeFilterConfig" />
+    <node concept="2YIFZL" id="3Aq_54F139Q" role="jymVt">
+      <property role="TrG5h" value="getFilters" />
+      <node concept="3clFbS" id="3Aq_54F139T" role="3clF47">
+        <node concept="3cpWs8" id="3Aq_54F13mC" role="3cqZAp">
+          <node concept="3cpWsn" id="3Aq_54F13mF" role="3cpWs9">
+            <property role="TrG5h" value="filterMap" />
+            <node concept="3rvAFt" id="3Aq_54F13m_" role="1tU5fm">
+              <node concept="3uibUv" id="3Aq_54F2rm1" role="3rvSg0">
+                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+              </node>
+              <node concept="2hMVRd" id="3Aq_54F2KM9" role="3rvQeY">
+                <node concept="3bZ5Sz" id="3Aq_54F2KMa" role="2hN53Y" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="3Aq_54F146w" role="33vP2m">
+              <node concept="3rGOSV" id="3Aq_54F1L$b" role="2ShVmc">
+                <node concept="3uibUv" id="3Aq_54F2rDm" role="3rHtpV">
+                  <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+                </node>
+                <node concept="2hMVRd" id="3Aq_54F2KXF" role="3rHrn6">
+                  <node concept="3bZ5Sz" id="3Aq_54F2KXG" role="2hN53Y" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="3Aq_54F1NIc" role="3cqZAp">
+          <node concept="2GrKxI" id="3Aq_54F1NIe" role="2Gsz3X">
+            <property role="TrG5h" value="filter" />
+          </node>
+          <node concept="3clFbS" id="3Aq_54F1NIi" role="2LFqv$">
+            <node concept="3cpWs8" id="3Aq_54F2UeW" role="3cqZAp">
+              <node concept="3cpWsn" id="3Aq_54F2UeX" role="3cpWs9">
+                <property role="TrG5h" value="key" />
+                <node concept="2hMVRd" id="3Aq_54F2Udu" role="1tU5fm">
+                  <node concept="3bZ5Sz" id="3Aq_54F2Udx" role="2hN53Y" />
+                </node>
+                <node concept="2OqwBi" id="3Aq_54F2UeY" role="33vP2m">
+                  <node concept="2GrUjf" id="3Aq_54F2UeZ" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="3Aq_54F1NIe" resolve="filter" />
+                  </node>
+                  <node concept="liA8E" id="3Aq_54F2Uf0" role="2OqNvi">
+                    <ref role="37wK5l" node="3Aq_54EZAza" resolve="getApplicableConcepts" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="3Aq_54F2r3D" role="3cqZAp">
+              <node concept="22lmx$" id="3Aq_54F32bI" role="3clFbw">
+                <node concept="3fqX7Q" id="3Aq_54F37N6" role="3uHU7B">
+                  <node concept="2OqwBi" id="3Aq_54F37N8" role="3fr31v">
+                    <node concept="37vLTw" id="3Aq_54F37N9" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3Aq_54F13mF" resolve="filterMap" />
+                    </node>
+                    <node concept="2Nt0df" id="3Aq_54F37Na" role="2OqNvi">
+                      <node concept="37vLTw" id="3Aq_54F37Nb" role="38cxEo">
+                        <ref role="3cqZAo" node="3Aq_54F2UeX" resolve="key" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1eOMI4" id="3Aq_54F324C" role="3uHU7w">
+                  <node concept="3eOSWO" id="3Aq_54F2T8_" role="1eOMHV">
+                    <node concept="2OqwBi" id="3Aq_54F2Wkd" role="3uHU7w">
+                      <node concept="3EllGN" id="3Aq_54F2Vjx" role="2Oq$k0">
+                        <node concept="37vLTw" id="3Aq_54F2W9O" role="3ElVtu">
+                          <ref role="3cqZAo" node="3Aq_54F2UeX" resolve="key" />
+                        </node>
+                        <node concept="37vLTw" id="3Aq_54F2TkB" role="3ElQJh">
+                          <ref role="3cqZAo" node="3Aq_54F13mF" resolve="filterMap" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3Aq_54F2W$3" role="2OqNvi">
+                        <ref role="37wK5l" node="3Aq_54EZ_6B" resolve="getPriority" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="3Aq_54F2QGT" role="3uHU7B">
+                      <node concept="2GrUjf" id="3Aq_54F2QCY" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="3Aq_54F1NIe" resolve="filter" />
+                      </node>
+                      <node concept="liA8E" id="3Aq_54F2QNC" role="2OqNvi">
+                        <ref role="37wK5l" node="3Aq_54EZ_6B" resolve="getPriority" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="3Aq_54F2r3F" role="3clFbx">
+                <node concept="3clFbF" id="3Aq_54F2WPG" role="3cqZAp">
+                  <node concept="37vLTI" id="3Aq_54F2YQ8" role="3clFbG">
+                    <node concept="2GrUjf" id="3Aq_54F2ZSW" role="37vLTx">
+                      <ref role="2Gs0qQ" node="3Aq_54F1NIe" resolve="filter" />
+                    </node>
+                    <node concept="3EllGN" id="3Aq_54F2Y3x" role="37vLTJ">
+                      <node concept="37vLTw" id="3Aq_54F2Yvc" role="3ElVtu">
+                        <ref role="3cqZAo" node="3Aq_54F2UeX" resolve="key" />
+                      </node>
+                      <node concept="37vLTw" id="3Aq_54F2WPF" role="3ElQJh">
+                        <ref role="3cqZAo" node="3Aq_54F13mF" resolve="filterMap" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3Aq_54F1NiD" role="2GsD0m">
+            <node concept="2O5UvJ" id="3Aq_54F1NiE" role="2Oq$k0">
+              <ref role="2O5UnU" node="a26E1jm$Fv" resolve="SearchRootFilter" />
+            </node>
+            <node concept="SfwO_" id="3Aq_54F1NiF" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="3Aq_54F38Ea" role="3cqZAp">
+          <node concept="2OqwBi" id="3Aq_54F3cIZ" role="3clFbG">
+            <node concept="2OqwBi" id="3Aq_54F3JoL" role="2Oq$k0">
+              <node concept="2OqwBi" id="3Aq_54F3a32" role="2Oq$k0">
+                <node concept="37vLTw" id="3Aq_54F38E8" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3Aq_54F13mF" resolve="filterMap" />
+                </node>
+                <node concept="T8wYR" id="3Aq_54F3bKt" role="2OqNvi" />
+              </node>
+              <node concept="2DpFxk" id="3Aq_54F3JAM" role="2OqNvi">
+                <node concept="1nlBCl" id="3Aq_54F3LjM" role="2Dq5b$" />
+                <node concept="1bVj0M" id="3Aq_54F3JAP" role="23t8la">
+                  <node concept="3clFbS" id="3Aq_54F3JAQ" role="1bW5cS">
+                    <node concept="3clFbF" id="3Aq_54F3Kao" role="3cqZAp">
+                      <node concept="2OqwBi" id="3Aq_54F3Kqu" role="3clFbG">
+                        <node concept="37vLTw" id="3Aq_54F3Kan" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3Aq_54F3JAR" resolve="a" />
+                        </node>
+                        <node concept="liA8E" id="3Aq_54F3KZU" role="2OqNvi">
+                          <ref role="37wK5l" node="3Aq_54EZ_6B" resolve="getPriority" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="gl6BB" id="3Aq_54F3JAR" role="1bW2Oz">
+                    <property role="TrG5h" value="a" />
+                    <node concept="2jxLKc" id="3Aq_54F3JAS" role="1tU5fm" />
+                  </node>
+                  <node concept="gl6BB" id="3Aq_54F3JAT" role="1bW2Oz">
+                    <property role="TrG5h" value="b" />
+                    <node concept="2jxLKc" id="3Aq_54F3JAU" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="3Aq_54F3dTx" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3Aq_54F10CE" role="1B3o_S" />
+      <node concept="_YKpA" id="3Aq_54F11M7" role="3clF45">
+        <node concept="3uibUv" id="3Aq_54F139O" role="_ZDj9">
+          <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="3Aq_54F0ZVS" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
index cb69c8aa6a9..9a968ecea1d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
@@ -47,6 +47,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <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" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />

From d948b7d09ae65de31197e13fc726b92b8511d5b4 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Dec 2024 22:07:19 +0100
Subject: [PATCH 36/38] force save all

---
 .../languageModels/editor.mps                 |   8 +-
 .../core/base/pluginSolution/plugin.mps       | 132 +++++++++---------
 .../com.mbeddr.spreadsheat/spreadsheat.mpl    |   7 +
 3 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
index 6feadeae48b..ccdfaa1ee31 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
@@ -5651,7 +5651,7 @@
               <node concept="1QGGSu" id="frftTuZdvm" role="1QGGTw">
                 <node concept="10M0yZ" id="frftTuZfzF" role="3xaMm5">
                   <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowUp" resolve="ArrowUp" />
-                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
                 </node>
               </node>
             </node>
@@ -5682,7 +5682,7 @@
               <node concept="1QGGSu" id="frftTv12qd" role="1QGGTw">
                 <node concept="10M0yZ" id="frftTv12OJ" role="3xaMm5">
                   <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowDown" resolve="ArrowDown" />
-                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
                 </node>
               </node>
             </node>
@@ -5713,7 +5713,7 @@
               <node concept="1QGGSu" id="frftTv13ee" role="1QGGTw">
                 <node concept="10M0yZ" id="frftTv13CL" role="3xaMm5">
                   <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowLeft" resolve="ArrowLeft" />
-                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
                 </node>
               </node>
             </node>
@@ -5744,7 +5744,7 @@
               <node concept="1QGGSu" id="frftTv142h" role="1QGGTw">
                 <node concept="10M0yZ" id="frftTv14sP" role="3xaMm5">
                   <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowRight" resolve="ArrowRight" />
-                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index b3bf44bbfe8..107bbd961d0 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -2339,7 +2339,7 @@
             <node concept="liA8E" id="2Gn1WTgMSe6" role="2OqNvi">
               <ref role="37wK5l" node="2Gn1WTgNQ7i" resolve="setModuleScope" />
               <node concept="37vLTw" id="2Gn1WTgMSe7" role="37wK5m">
-                <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
+                <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="module" />
               </node>
             </node>
           </node>
@@ -2364,7 +2364,7 @@
                           </node>
                           <node concept="2OqwBi" id="2Gn1WTgPlUK" role="3uHU7w">
                             <node concept="37vLTw" id="2Gn1WTgPlO3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="s" />
+                              <ref role="3cqZAo" node="2Gn1WTgMSek" resolve="module" />
                             </node>
                             <node concept="liA8E" id="2Gn1WTgPnEc" role="2OqNvi">
                               <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -2543,7 +2543,7 @@
     <node concept="1QGGSu" id="MipY_gaLSs" role="1nVCmq">
       <node concept="10M0yZ" id="MipY_gaOND" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -3005,7 +3005,7 @@
                         </node>
                       </node>
                       <node concept="2AHcQZ" id="2Ltn1$mtCF6" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" />
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                       </node>
                     </node>
                   </node>
@@ -3219,7 +3219,7 @@
               <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="2ShNRf" id="1GW3SvfRAwn" role="37wK5m">
                 <node concept="1pGfFk" id="1GW3SvfS72I" role="2ShVmc">
-                  <ref role="37wK5l" node="1GW3SvfRWTF" resolve="SearchAllToggleAction" />
+                  <ref role="37wK5l" node="1GW3SvfRWTF" resolve="SearchAllNodePresentationsToggleAction" />
                 </node>
               </node>
             </node>
@@ -3291,12 +3291,12 @@
             <property role="TrG5h" value="filters" />
             <node concept="_YKpA" id="3Aq_54EWvYh" role="1tU5fm">
               <node concept="3uibUv" id="3Aq_54EWvYj" role="_ZDj9">
-                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchNodeFilter" />
               </node>
             </node>
             <node concept="2YIFZM" id="3Aq_54F4fAG" role="33vP2m">
               <ref role="37wK5l" node="3Aq_54F139Q" resolve="getFilters" />
-              <ref role="1Pybhc" node="3Aq_54F0ZVR" resolve="SearchRootFilterConfig" />
+              <ref role="1Pybhc" node="3Aq_54F0ZVR" resolve="SearchNodeFilterConfig" />
             </node>
           </node>
         </node>
@@ -3425,7 +3425,7 @@
                 <property role="373rjd" value="true" />
                 <ref role="37wK5l" to="mte6:~ModulesScope.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModule...)" resolve="ModulesScope" />
                 <node concept="37vLTw" id="6KjVnJpa7LG" role="37wK5m">
-                  <ref role="3cqZAo" node="2Gn1WTgNQ7Y" resolve="solution" />
+                  <ref role="3cqZAo" node="2Gn1WTgNQ7Y" resolve="module" />
                 </node>
               </node>
             </node>
@@ -3678,7 +3678,7 @@
                     <property role="2bfB8j" value="true" />
                     <property role="373rjd" value="true" />
                     <ref role="1Y3XeK" node="7ipIhbnXbz3" resolve="SearchCallback" />
-                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                     <node concept="3Tm1VV" id="7ipIhbo7ma$" role="1B3o_S" />
                     <node concept="3clFb_" id="7ipIhbo7maX" role="jymVt">
                       <property role="TrG5h" value="resultsReceived" />
@@ -3777,7 +3777,7 @@
                         </node>
                       </node>
                       <node concept="2AHcQZ" id="7ipIhbo7mb6" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" />
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                       </node>
                     </node>
                   </node>
@@ -3894,12 +3894,12 @@
         <node concept="3clFbF" id="1GW3Svfs06s" role="3cqZAp">
           <node concept="2OqwBi" id="1GW3Svfs06t" role="3clFbG">
             <node concept="37vLTw" id="1GW3Svfs06u" role="2Oq$k0">
-              <ref role="3cqZAo" node="1GW3SvfiV6t" resolve="column" />
+              <ref role="3cqZAo" node="1GW3SvfiV6t" resolve="iconColumn" />
             </node>
             <node concept="liA8E" id="1GW3Svfs06v" role="2OqNvi">
               <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
               <node concept="37vLTw" id="1GW3Svg1bCj" role="37wK5m">
-                <ref role="3cqZAo" node="1GW3SvfZSD6" resolve="width" />
+                <ref role="3cqZAo" node="1GW3SvfZSD6" resolve="iconColumnWidth" />
               </node>
             </node>
           </node>
@@ -3907,12 +3907,12 @@
         <node concept="3clFbF" id="6wvhQs7np9T" role="3cqZAp">
           <node concept="2OqwBi" id="6wvhQs7np9U" role="3clFbG">
             <node concept="37vLTw" id="1GW3SvfiV6B" role="2Oq$k0">
-              <ref role="3cqZAo" node="1GW3SvfiV6t" resolve="column" />
+              <ref role="3cqZAo" node="1GW3SvfiV6t" resolve="iconColumn" />
             </node>
             <node concept="liA8E" id="6wvhQs7npa1" role="2OqNvi">
               <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
               <node concept="37vLTw" id="1GW3Svg1mJS" role="37wK5m">
-                <ref role="3cqZAo" node="1GW3SvfZSD6" resolve="width" />
+                <ref role="3cqZAo" node="1GW3SvfZSD6" resolve="iconColumnWidth" />
               </node>
             </node>
           </node>
@@ -4017,7 +4017,7 @@
             <node concept="3clFbF" id="3G2A$fxgof0" role="3cqZAp">
               <node concept="2OqwBi" id="3G2A$fxgof1" role="3clFbG">
                 <node concept="37vLTw" id="3G2A$fxgof2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3G2A$fxgoeO" resolve="IconColumn" />
+                  <ref role="3cqZAo" node="3G2A$fxgoeO" resolve="conceptColumn" />
                 </node>
                 <node concept="liA8E" id="3G2A$fxgof3" role="2OqNvi">
                   <ref role="37wK5l" to="c8ee:~TableColumn.setMaxWidth(int)" resolve="setMaxWidth" />
@@ -4030,7 +4030,7 @@
             <node concept="3clFbF" id="3G2A$fxgof5" role="3cqZAp">
               <node concept="2OqwBi" id="3G2A$fxgof6" role="3clFbG">
                 <node concept="37vLTw" id="3G2A$fxgof7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3G2A$fxgoeO" resolve="IconColumn" />
+                  <ref role="3cqZAo" node="3G2A$fxgoeO" resolve="conceptColumn" />
                 </node>
                 <node concept="liA8E" id="3G2A$fxgof8" role="2OqNvi">
                   <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
@@ -4455,7 +4455,7 @@
     <node concept="1QGGSu" id="MipY_gaPoV" role="3Uehp1">
       <node concept="10M0yZ" id="MipY_gaRyn" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -4561,7 +4561,7 @@
             <node concept="2OqwBi" id="6KjVnJoZcoG" role="37vLTJ">
               <node concept="Xjq3P" id="6KjVnJoZcga" role="2Oq$k0" />
               <node concept="2OwXpG" id="6KjVnJoZdsP" role="2OqNvi">
-                <ref role="2Oxat5" node="4Q2Vz3i_rqf" resolve="repository" />
+                <ref role="2Oxat5" node="4Q2Vz3i_rqf" resolve="project" />
               </node>
             </node>
             <node concept="37vLTw" id="6KjVnJp0501" role="37vLTx">
@@ -4636,7 +4636,7 @@
         </node>
         <node concept="3clFbF" id="4Q2Vz3iAVR5" role="3cqZAp">
           <node concept="1rXfSq" id="4Q2Vz3iAVR4" role="3clFbG">
-            <ref role="37wK5l" node="4Q2Vz3i$q3Z" resolve="searchModel" />
+            <ref role="37wK5l" node="4Q2Vz3i$q3Z" resolve="searchModels" />
             <node concept="37vLTw" id="vqDSp9RPi7" role="37wK5m">
               <ref role="3cqZAo" node="7ipIhbo22bV" resolve="models" />
             </node>
@@ -4731,8 +4731,8 @@
                 <node concept="YeOm9" id="4Q2Vz3i$q4f" role="2ShVmc">
                   <node concept="1Y3b0j" id="4Q2Vz3i$q4g" role="YeSDq">
                     <property role="2bfB8j" value="true" />
-                    <ref role="1Y3XeK" to="xygl:~Task$Backgroundable" resolve="Backgroundable" />
-                    <ref role="37wK5l" to="xygl:~Task$Backgroundable.&lt;init&gt;(com.intellij.openapi.project.Project,java.lang.String,boolean)" resolve="Backgroundable" />
+                    <ref role="1Y3XeK" to="xygl:~Task$Backgroundable" resolve="Task.Backgroundable" />
+                    <ref role="37wK5l" to="xygl:~Task$Backgroundable.&lt;init&gt;(com.intellij.openapi.project.Project,java.lang.String,boolean)" resolve="Task.Backgroundable" />
                     <node concept="3Tm1VV" id="4Q2Vz3i$q4h" role="1B3o_S" />
                     <node concept="2YIFZM" id="4Q2Vz3i$q4i" role="37wK5m">
                       <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
@@ -4932,7 +4932,7 @@
                             <property role="TrG5h" value="filters" />
                             <node concept="_YKpA" id="3Aq_54F4UFA" role="1tU5fm">
                               <node concept="3uibUv" id="3Aq_54F4UFD" role="_ZDj9">
-                                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+                                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchNodeFilter" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="6lcJS77plj7" role="33vP2m">
@@ -5681,7 +5681,7 @@
                                                 <node concept="1Wc70l" id="6ajFgCz$spO" role="3clFbw">
                                                   <node concept="2d3UOw" id="6ajFgCz$W8H" role="3uHU7w">
                                                     <node concept="37vLTw" id="6ajFgCz_Q$K" role="3uHU7B">
-                                                      <ref role="3cqZAo" node="6ajFgCz_Q$G" resolve="length" />
+                                                      <ref role="3cqZAo" node="6ajFgCz_Q$G" resolve="searchlength" />
                                                     </node>
                                                     <node concept="37vLTw" id="6ajFgCz$YT_" role="3uHU7w">
                                                       <ref role="3cqZAo" node="6ajFgCz_gVt" resolve="MEDIUM_SEARCH_MINIMUM" />
@@ -5984,7 +5984,7 @@
                                                     <node concept="37vLTI" id="vqDSpapn_Y" role="3clFbG">
                                                       <node concept="2dkUwp" id="vqDSpapEyY" role="37vLTx">
                                                         <node concept="37vLTw" id="vqDSpapGOT" role="3uHU7w">
-                                                          <ref role="3cqZAo" node="vqDSpamxv4" resolve="ALLOWED_DISTANCE" />
+                                                          <ref role="3cqZAo" node="vqDSpamxv4" resolve="MEDIUM_SEARCH_TOLERANCE" />
                                                         </node>
                                                         <node concept="2YIFZM" id="vqDSpapuVE" role="3uHU7B">
                                                           <ref role="37wK5l" node="vqDSpaiUHg" resolve="compute" />
@@ -6489,7 +6489,7 @@
                     <ref role="37wK5l" to="hwgx:6wvhQs7n_YM" resolve="namespace" />
                   </node>
                   <node concept="37vLTw" id="55oOaAG3xkZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="55oOaAG3t5s" resolve="namedConcepted" />
+                    <ref role="3cqZAo" node="55oOaAG3t5s" resolve="namedConcept" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="55oOaAFWQ3u" role="37vLTJ">
@@ -6500,7 +6500,7 @@
           </node>
           <node concept="2OqwBi" id="55oOaAG3hTM" role="3clFbw">
             <node concept="37vLTw" id="55oOaAG3t5z" role="2Oq$k0">
-              <ref role="3cqZAo" node="55oOaAG3t5s" resolve="ancestor" />
+              <ref role="3cqZAo" node="55oOaAG3t5s" resolve="namedConcept" />
             </node>
             <node concept="3x8VRR" id="55oOaAG3jN7" role="2OqNvi" />
           </node>
@@ -7724,7 +7724,7 @@
       </node>
     </node>
     <node concept="Zd509" id="2Gn1WTgWyDJ" role="Zd508">
-      <ref role="1bYAoF" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnSolution" />
+      <ref role="1bYAoF" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnModule" />
       <node concept="pLAjd" id="2Gn1WTgWyDK" role="Zd501">
         <property role="pLAjc" value="ctrl+alt" />
         <property role="pLAjf" value="VK_S" />
@@ -7853,7 +7853,7 @@
     <node concept="1QGGSu" id="5XU4dCzYtNG" role="3Uehp1">
       <node concept="10M0yZ" id="5XU4dCzYzH_" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Debugger.EvaluateExpression" resolve="EvaluateExpression" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Debugger" resolve="Debugger" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Debugger" resolve="AllIcons.Debugger" />
       </node>
     </node>
   </node>
@@ -8002,7 +8002,7 @@
     <node concept="1QGGSu" id="6ghi$I1WGcA" role="3Uehp1">
       <node concept="10M0yZ" id="6ghi$I1WHLW" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -14393,7 +14393,7 @@
               <node concept="2OqwBi" id="2Gn1WTgSFit" role="2XxRq1">
                 <node concept="2WthIp" id="2Gn1WTgSFiu" role="2Oq$k0" />
                 <node concept="1DTwFV" id="2Gn1WTgSFiv" role="2OqNvi">
-                  <ref role="2WH_rO" node="2Gn1WTgS$Yk" resolve="solution" />
+                  <ref role="2WH_rO" node="2Gn1WTgS$Yk" resolve="module" />
                 </node>
               </node>
             </node>
@@ -14404,7 +14404,7 @@
     <node concept="1QGGSu" id="MipY_gaSlR" role="3Uehp1">
       <node concept="10M0yZ" id="MipY_gaUVb" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -18270,7 +18270,7 @@
     <node concept="1QGGSu" id="1MQpRKewwvP" role="1nVCmq">
       <node concept="10M0yZ" id="MipY_g72gz" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$General.Tree" resolve="Tree" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
       </node>
     </node>
   </node>
@@ -18488,7 +18488,7 @@
     <node concept="1QGGSu" id="MipY_g8qdP" role="3Uehp1">
       <node concept="10M0yZ" id="MipY_g8tQO" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$General.Tree" resolve="Tree" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
       </node>
     </node>
   </node>
@@ -18770,7 +18770,7 @@
     <node concept="1QGGSu" id="MipY_g9wUo" role="3Uehp1">
       <node concept="10M0yZ" id="MipY_g9y34" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$General.Tree" resolve="Tree" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
       </node>
     </node>
   </node>
@@ -19060,7 +19060,7 @@
     <node concept="1QGGSu" id="2uR7kGChGPE" role="3Uehp1">
       <node concept="10M0yZ" id="2uR7kGChJ0n" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Refresh" resolve="Refresh" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -20540,7 +20540,7 @@
     <node concept="1QGGSu" id="2uR7kGChojb" role="3Uehp1">
       <node concept="10M0yZ" id="2uR7kGChqU4" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Back" resolve="Back" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -20602,7 +20602,7 @@
     <node concept="1QGGSu" id="2uR7kGChlug" role="3Uehp1">
       <node concept="10M0yZ" id="2uR7kGChnJ$" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Forward" resolve="Forward" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -21108,7 +21108,7 @@
     <node concept="1QGGSu" id="2uR7kGChrH9" role="3Uehp1">
       <node concept="10M0yZ" id="2uR7kGCh$mM" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Refresh" resolve="Refresh" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -22299,11 +22299,11 @@
                         <node concept="3cpWsn" id="2hPErkZEtBL" role="3cpWs9">
                           <property role="TrG5h" value="options" />
                           <node concept="3uibUv" id="2hPErkZEtBM" role="1tU5fm">
-                            <ref role="3uigEE" node="2hPErkZEgVS" resolve="ScreenshotOptions" />
+                            <ref role="3uigEE" node="2hPErkZEgVS" resolve="CellEditorScreenshooter.ScreenshotOptions" />
                           </node>
                           <node concept="2ShNRf" id="2hPErkZEub4" role="33vP2m">
                             <node concept="HV5vD" id="2hPErkZF270" role="2ShVmc">
-                              <ref role="HV5vE" node="2hPErkZEgVS" resolve="ScreenshotOptions" />
+                              <ref role="HV5vE" node="2hPErkZEgVS" resolve="CellEditorScreenshooter.ScreenshotOptions" />
                             </node>
                           </node>
                         </node>
@@ -23831,7 +23831,7 @@
     <node concept="1QGGSu" id="2uR7kGCiQgi" role="3Uehp1">
       <node concept="10M0yZ" id="2uR7kGCiUg8" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$General.Print" resolve="Print" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
       </node>
     </node>
   </node>
@@ -24302,7 +24302,7 @@
           </node>
           <node concept="10M0yZ" id="1GW3Svg2wzW" role="37wK5m">
             <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.InlayGlobe" resolve="InlayGlobe" />
-            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
           </node>
         </node>
       </node>
@@ -24370,7 +24370,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1GW3SvfRxfJ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="1GW3SvfRYl9" role="jymVt" />
@@ -24438,7 +24438,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1GW3SvfRxfW" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -24447,7 +24447,7 @@
     <property role="TrG5h" value="MbeddrSearchProjectGroup" />
     <node concept="ftmFs" id="6KjVnJoTXb1" role="ftER_">
       <node concept="tCFHf" id="6KjVnJoTXb2" role="ftvYc">
-        <ref role="tCJdB" node="6KjVnJoX4Fv" resolve="OpenSearchActionOnMProject" />
+        <ref role="tCJdB" node="6KjVnJoX4Fv" resolve="OpenSearchActionOnProject" />
       </node>
     </node>
     <node concept="tT9cl" id="6KjVnJoTXb3" role="2f5YQi">
@@ -24536,7 +24536,7 @@
     <node concept="1QGGSu" id="6KjVnJoX4FU" role="3Uehp1">
       <node concept="10M0yZ" id="6KjVnJoX4FV" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -24666,7 +24666,7 @@
     <node concept="1QGGSu" id="vqDSpa9D$H" role="3Uehp1">
       <node concept="10M0yZ" id="vqDSpa9D$I" role="3xaMm5">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
       </node>
     </node>
   </node>
@@ -24685,7 +24685,7 @@
           </node>
           <node concept="3cpWs3" id="vqDSparkz4" role="37wK5m">
             <node concept="10M0yZ" id="vqDSparmnU" role="3uHU7w">
-              <ref role="3cqZAo" node="vqDSpamxv4" resolve="ALLOWED_DISTANCE" />
+              <ref role="3cqZAo" node="vqDSpamxv4" resolve="MEDIUM_SEARCH_TOLERANCE" />
               <ref role="1PxDUh" node="2HzhasN$akP" resolve="SearchEngine" />
             </node>
             <node concept="Xl_RD" id="vqDSpafUb3" role="3uHU7B">
@@ -24694,7 +24694,7 @@
           </node>
           <node concept="10M0yZ" id="vqDSparo60" role="37wK5m">
             <ref role="3cqZAo" to="z2i8:~AllIcons$Nodes.Undeploy" resolve="Undeploy" />
-            <ref role="1PxDUh" to="z2i8:~AllIcons$Nodes" resolve="Nodes" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Nodes" resolve="AllIcons.Nodes" />
           </node>
         </node>
       </node>
@@ -24762,7 +24762,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="vqDSpafUbw" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="vqDSpafUbx" role="jymVt" />
@@ -24830,7 +24830,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="vqDSpafUbW" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -25238,7 +25238,7 @@
           </node>
           <node concept="10M0yZ" id="vqDSpauXFb" role="37wK5m">
             <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.MatchCase" resolve="MatchCase" />
-            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
           </node>
         </node>
       </node>
@@ -25306,7 +25306,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="vqDSpasZXL" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="vqDSpasZXM" role="jymVt" />
@@ -25374,7 +25374,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="vqDSpasZYd" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -25396,7 +25396,7 @@
     <property role="TrG5h" value="MbeddrSearchModuleGroup" />
     <node concept="ftmFs" id="6hfhqO7XuP2" role="ftER_">
       <node concept="tCFHf" id="6hfhqO7XuP3" role="ftvYc">
-        <ref role="tCJdB" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnSolution" />
+        <ref role="tCJdB" node="2Gn1WTgS$I7" resolve="OpenSearchActionOnModule" />
       </node>
     </node>
     <node concept="tT9cl" id="6hfhqO7XuP4" role="2f5YQi">
@@ -25505,7 +25505,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1gBxUY87gJi" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -25520,7 +25520,7 @@
           <ref role="37wK5l" to="qkt:~AnAction.&lt;init&gt;(javax.swing.Icon)" resolve="AnAction" />
           <node concept="10M0yZ" id="14DpnPo$XwL" role="37wK5m">
             <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
-            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
           </node>
         </node>
       </node>
@@ -25624,7 +25624,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="14DpnPo$Wvf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -25646,7 +25646,7 @@
           </node>
           <node concept="10M0yZ" id="55oOaAFbHWw" role="37wK5m">
             <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Regex" resolve="Regex" />
-            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
           </node>
         </node>
       </node>
@@ -25714,7 +25714,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="55oOaAFbF97" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="55oOaAFbF98" role="jymVt" />
@@ -25782,7 +25782,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="55oOaAFbF9z" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -25790,7 +25790,7 @@
     <property role="3GE5qa" value="search" />
     <property role="TrG5h" value="SearchNodeFilter" />
     <node concept="3uibUv" id="a26E1jqcd5" role="luc8K">
-      <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+      <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchNodeFilter" />
     </node>
   </node>
   <node concept="3HP615" id="a26E1jqa3S">
@@ -25865,7 +25865,7 @@
             <property role="TrG5h" value="filterMap" />
             <node concept="3rvAFt" id="3Aq_54F13m_" role="1tU5fm">
               <node concept="3uibUv" id="3Aq_54F2rm1" role="3rvSg0">
-                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+                <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchNodeFilter" />
               </node>
               <node concept="2hMVRd" id="3Aq_54F2KM9" role="3rvQeY">
                 <node concept="3bZ5Sz" id="3Aq_54F2KMa" role="2hN53Y" />
@@ -25874,7 +25874,7 @@
             <node concept="2ShNRf" id="3Aq_54F146w" role="33vP2m">
               <node concept="3rGOSV" id="3Aq_54F1L$b" role="2ShVmc">
                 <node concept="3uibUv" id="3Aq_54F2rDm" role="3rHtpV">
-                  <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+                  <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchNodeFilter" />
                 </node>
                 <node concept="2hMVRd" id="3Aq_54F2KXF" role="3rHrn6">
                   <node concept="3bZ5Sz" id="3Aq_54F2KXG" role="2hN53Y" />
@@ -25965,7 +25965,7 @@
           </node>
           <node concept="2OqwBi" id="3Aq_54F1NiD" role="2GsD0m">
             <node concept="2O5UvJ" id="3Aq_54F1NiE" role="2Oq$k0">
-              <ref role="2O5UnU" node="a26E1jm$Fv" resolve="SearchRootFilter" />
+              <ref role="2O5UnU" node="a26E1jm$Fv" resolve="SearchNodeFilter" />
             </node>
             <node concept="SfwO_" id="3Aq_54F1NiF" role="2OqNvi" />
           </node>
@@ -26012,7 +26012,7 @@
       <node concept="3Tm1VV" id="3Aq_54F10CE" role="1B3o_S" />
       <node concept="_YKpA" id="3Aq_54F11M7" role="3clF45">
         <node concept="3uibUv" id="3Aq_54F139O" role="_ZDj9">
-          <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchRootFilter" />
+          <ref role="3uigEE" node="a26E1jqa3S" resolve="ISearchNodeFilter" />
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
index 03189be9a6b..7c23061453e 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
@@ -51,6 +51,13 @@
       <library location="${module}/lib/poi-ooxml-5.0.0.jar" />
       <library location="${module}/lib/xmlbeans-4.0.0.jar" />
       <library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
+      <library location="${module}/lib/commons-codec-1.10.jar" />
+      <library location="${module}/lib/commons-collections4-4.1.jar" />
+      <library location="${module}/lib/curvesapi-1.04.jar" />
+      <library location="${module}/lib/poi-5.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-5.0.0.jar" />
+      <library location="${module}/lib/xmlbeans-4.0.0.jar" />
+      <library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
     </facet>
   </facets>
   <accessoryModels />

From 51fbe2f5754f0ee4203fe2e379bfc6abe9bd05e5 Mon Sep 17 00:00:00 2001
From: Niko Stotz <niko@nikostotz.de>
Date: Tue, 17 Dec 2024 14:29:28 +0100
Subject: [PATCH 37/38] use SoftMap instead of WeakMap to cache interpreters

WeakReference is killed any time the garbage collector runs,
whereas SoftReference is killed only if memory is low.

Should lead to more cached interpreters.
---
 .../com/mbeddr/mpsutil/interpreter/rt.mps      | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
index 80e361f9f24..cbadd8e8942 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
@@ -38,7 +38,7 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
     <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
-    <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
+    <import index="e8no" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.containers(MPS.IDEA/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -517,9 +517,6 @@
         <child id="1197687026896" name="keyType" index="3rHrn6" />
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
-      <concept id="1576845966386891367" name="jetbrains.mps.baseLanguage.collections.structure.CustomMapCreator" flags="nn" index="1u7pXE">
-        <reference id="1576845966386891370" name="containerDeclaration" index="1u7pXB" />
-      </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
@@ -13051,7 +13048,7 @@
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
       <property role="TrG5h" value="interpreterCache" />
-      <property role="3TUv4t" value="false" />
+      <property role="3TUv4t" value="true" />
       <node concept="3Tm6S6" id="48h5VLciYUH" role="1B3o_S" />
       <node concept="3rvAFt" id="48h5VLciZEY" role="1tU5fm">
         <node concept="17QB3L" id="48h5VLciZIl" role="3rvQeY" />
@@ -13059,14 +13056,9 @@
           <ref role="3uigEE" node="4X7QcQ36WR7" resolve="IInterpreter" />
         </node>
       </node>
-      <node concept="2ShNRf" id="48h5VLcj0tm" role="33vP2m">
-        <node concept="1u7pXE" id="48h5VLcj0s3" role="2ShVmc">
-          <ref role="1u7pXB" to="z8iw:3TJnG96iD$S" resolve="weakHashMap" />
-          <node concept="17QB3L" id="48h5VLcj0s4" role="3rHrn6" />
-          <node concept="3uibUv" id="48h5VLcj0s5" role="3rHtpV">
-            <ref role="3uigEE" node="4X7QcQ36WR7" resolve="IInterpreter" />
-          </node>
-        </node>
+      <node concept="2YIFZM" id="7MgIIhY_P7h" role="33vP2m">
+        <ref role="37wK5l" to="e8no:~ContainerUtil.createSoftValueMap()" resolve="createSoftValueMap" />
+        <ref role="1Pybhc" to="e8no:~ContainerUtil" resolve="ContainerUtil" />
       </node>
     </node>
     <node concept="2tJIrI" id="48h5VLciWra" role="jymVt" />

From b1c6f54c962aa9a75cf15bd9d8460760160f4227 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 18 Dec 2024 10:21:14 +0100
Subject: [PATCH 38/38] run migrations

---
 .../com.mbeddr.platform/models/com/mbeddr/platform/build.mps  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index b97da2ad087..8164d9a5d67 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -92,7 +92,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
@@ -120,7 +120,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="3717301156197626279" name="jetbrains.mps.lang.core.structure.BasePlaceholder" flags="ng" index="3DQ70j">