Merge pull request #813 from JetBrains/bugfix/querylist_regression

querylist.runtime: check for empty nodes in the query condition (regression)
JetBrains · Mar 28, 2024 · 4c2e451 · 4c2e451
2 parents e1413ea + 0fea75a
commit 4c2e451
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - de.slisson.mps.conditionalEditor: Support for editor components with parameters was added.
 - com.mbeddr.mpsutil.grammarcells: Read-only model accessory cells can now also be used in places where constant cells are supported.
 
+### Fixed
+
+- com.mbeddr.mpsutil.editor.querylist: return null in the query shows the empty cell again (regression).
+
 ## February 2024
 
 ### Changed

diff --git a/...r.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/...r.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
@@ -1721,18 +1721,28 @@
                 <node concept="1bVj0M" id="5bKNAZ5i3K$" role="23t8la">
                   <node concept="3clFbS" id="5bKNAZ5i3K_" role="1bW5cS">
                     <node concept="3clFbF" id="5bKNAZ5i3R_" role="3cqZAp">
-                      <node concept="22lmx$" id="5vc9Xxa_D9z" role="3clFbG">
-                        <node concept="37vLTw" id="5vc9Xxa_QNU" role="3uHU7w">
-                          <ref role="3cqZAo" node="5vc9Xxa$Y6e" resolve="myReadOnly" />
+                      <node concept="1Wc70l" id="1pBVZRTgSH9" role="3clFbG">
+                        <node concept="3y3z36" id="1pBVZRTgXRH" role="3uHU7B">
+                          <node concept="10Nm6u" id="1pBVZRTgYW8" role="3uHU7w" />
+                          <node concept="37vLTw" id="1pBVZRTgVIp" role="3uHU7B">
+                            <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                          </node>
                         </node>
-                        <node concept="3y3z36" id="5bKNAZ5i4oI" role="3uHU7B">
-                          <node concept="2OqwBi" id="5bKNAZ5i3Ya" role="3uHU7B">
-                            <node concept="37vLTw" id="5bKNAZ5i3R$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                        <node concept="1eOMI4" id="1pBVZRTh49H" role="3uHU7w">
+                          <node concept="22lmx$" id="5vc9Xxa_D9z" role="1eOMHV">
+                            <node concept="3y3z36" id="5bKNAZ5i4oI" role="3uHU7B">
+                              <node concept="2OqwBi" id="5bKNAZ5i3Ya" role="3uHU7B">
+                                <node concept="37vLTw" id="5bKNAZ5i3R$" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                                </node>
+                                <node concept="I4A8Y" id="5bKNAZ5i44q" role="2OqNvi" />
+                              </node>
+                              <node concept="10Nm6u" id="5bKNAZ5i4uL" role="3uHU7w" />
+                            </node>
+                            <node concept="37vLTw" id="5vc9Xxa_QNU" role="3uHU7w">
+                              <ref role="3cqZAo" node="5vc9Xxa$Y6e" resolve="myReadOnly" />
                             </node>
-                            <node concept="I4A8Y" id="5bKNAZ5i44q" role="2OqNvi" />
                           </node>
-                          <node concept="10Nm6u" id="5bKNAZ5i4uL" role="3uHU7w" />
                         </node>
                       </node>
                     </node>