Skip to content

Commit

Permalink
Merge pull request #913 from JetBrains/bugfix/NullTreeInProjectView
Browse files Browse the repository at this point in the history 
Fixing several bugs in Project view
  • Loading branch information
@arimer
arimer authored Aug 6, 2024
2 parents ecff56d + 49da6b0 commit 2b1e2c0
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 25 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.

The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## August 2024

### Fixed

- *com.mbeddr.mpsutil.projectview.runtime*: Fixed several NPEs. See: [#903,](https://github.com/JetBrains/MPS-extensions/issues/903) [#904]((https://github.com/JetBrains/MPS-extensions/issues/904) , [#901](https://github.com/JetBrains/MPS-extensions/issues/901)

## July 2024

### Fixed
Expand Down
113 changes: 88 additions & 25 deletions ...mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand Down Expand Up @@ -2021,13 +2022,33 @@
<node concept="3Tm1VV" id="2ZGhpRfeyBd" role="1B3o_S" />
<node concept="17QB3L" id="2ZGhpRffgws" role="3clF45" />
<node concept="3clFbS" id="2ZGhpRfeyBh" role="3clF47">
<node concept="3cpWs8" id="4rAMcYzp4uW" role="3cqZAp">
<node concept="3cpWsn" id="4rAMcYzp4uX" role="3cpWs9">
<property role="TrG5h" value="label" />
<node concept="17QB3L" id="4rAMcYzoZEG" role="1tU5fm" />
<node concept="2EnYce" id="4rAMcYzp4uY" role="33vP2m">
<node concept="liA8E" id="4rAMcYzp4uZ" role="2OqNvi">
<ref role="37wK5l" to="imq3:VPgi8ei9p0" resolve="getLabel" />
</node>
<node concept="1rXfSq" id="4rAMcYzp4v0" role="2Oq$k0">
<ref role="37wK5l" node="5GuprjjgR5R" resolve="getMyViewDescriptor" />
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="16TtUNxFN8a" role="3cqZAp">
<node concept="2EnYce" id="16TtUNxFN8b" role="3cqZAk">
<node concept="liA8E" id="16TtUNxFN8c" role="2OqNvi">
<ref role="37wK5l" to="imq3:VPgi8ei9p0" resolve="getLabel" />
<node concept="3K4zz7" id="4rAMcYznTlv" role="3cqZAk">
<node concept="Xl_RD" id="4rAMcYzoUAl" role="3K4GZi">
<property role="Xl_RC" value="no title" />
</node>
<node concept="1rXfSq" id="16TtUNxFN8d" role="2Oq$k0">
<ref role="37wK5l" node="5GuprjjgR5R" resolve="getMyViewDescriptor" />
<node concept="2OqwBi" id="4rAMcYzojTR" role="3K4Cdx">
<node concept="37vLTw" id="4rAMcYzp4v1" role="2Oq$k0">
<ref role="3cqZAo" node="4rAMcYzp4uX" resolve="label" />
</node>
<node concept="17RvpY" id="4rAMcYzoxUs" role="2OqNvi" />
</node>
<node concept="37vLTw" id="4rAMcYzp4v2" role="3K4E3e">
<ref role="3cqZAo" node="4rAMcYzp4uX" resolve="label" />
</node>
</node>
</node>
Expand Down Expand Up @@ -5042,12 +5063,6 @@
</node>
<node concept="3clFbS" id="4gq8yQBZ6V4" role="3clF47">
<node concept="3clFbJ" id="4gq8yQBZ6V9" role="3cqZAp">
<node concept="3y3z36" id="4gq8yQBZ6Va" role="3clFbw">
<node concept="37vLTw" id="4gq8yQBZ6Vb" role="3uHU7B">
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.myTree" resolve="myTree" />
</node>
<node concept="10Nm6u" id="4gq8yQBZ6Vc" role="3uHU7w" />
</node>
<node concept="3clFbS" id="4gq8yQBZ6Vn" role="3clFbx">
<node concept="3cpWs8" id="1zw8Mi3ZBVR" role="3cqZAp">
<node concept="3cpWsn" id="1zw8Mi3ZBVS" role="3cpWs9">
Expand Down Expand Up @@ -5131,6 +5146,30 @@
</node>
</node>
</node>
<node concept="1Wc70l" id="4rAMcYzpLen" role="3clFbw">
<node concept="3y3z36" id="4rAMcYzqVaM" role="3uHU7w">
<node concept="10Nm6u" id="4rAMcYzr50e" role="3uHU7w" />
<node concept="2OqwBi" id="4rAMcYzqyRs" role="3uHU7B">
<node concept="2OqwBi" id="4rAMcYzqcnI" role="2Oq$k0">
<node concept="37vLTw" id="4rAMcYzq12I" role="2Oq$k0">
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.myTree" resolve="myTree" />
</node>
<node concept="liA8E" id="4rAMcYzqpCu" role="2OqNvi">
<ref role="37wK5l" to="dxuu:~JTree.getModel()" resolve="getModel" />
</node>
</node>
<node concept="liA8E" id="4rAMcYzqM$r" role="2OqNvi">
<ref role="37wK5l" to="rgfa:~TreeModel.getRoot()" resolve="getRoot" />
</node>
</node>
</node>
<node concept="3y3z36" id="4gq8yQBZ6Va" role="3uHU7B">
<node concept="37vLTw" id="4gq8yQBZ6Vb" role="3uHU7B">
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.myTree" resolve="myTree" />
</node>
<node concept="10Nm6u" id="4gq8yQBZ6Vc" role="3uHU7w" />
</node>
</node>
</node>
</node>
<node concept="3Tmbuc" id="4gq8yQBZ6VE" role="1B3o_S" />
Expand Down Expand Up @@ -9504,6 +9543,7 @@
<ref role="1Pybhc" node="1CDgnklJqNP" resolve="FolderStructureBuilder" />
<ref role="37wK5l" node="1CDgnklK5W1" resolve="build" />
<node concept="2OqwBi" id="Ggg0Z6Y9u0" role="37wK5m">
<node concept="ANE8D" id="Ggg0Z6Y9uc" role="2OqNvi" />
<node concept="2OqwBi" id="Ggg0Z6Y9u1" role="2Oq$k0">
<node concept="37vLTw" id="Ggg0Z6Y9uy" role="2Oq$k0">
<ref role="3cqZAo" node="Ggg0Z6Y9uv" resolve="queryResult" />
Expand All @@ -9529,7 +9569,6 @@
</node>
</node>
</node>
<node concept="ANE8D" id="Ggg0Z6Y9uc" role="2OqNvi" />
</node>
<node concept="Xjq3P" id="Ggg0Z6Y9ud" role="37wK5m" />
</node>
Expand Down Expand Up @@ -15041,9 +15080,6 @@
<node concept="3clFbS" id="7PuCnEL_TSP" role="3clF47">
<node concept="3clFbF" id="7PuCnELBxCb" role="3cqZAp">
<node concept="2OqwBi" id="7PuCnELBxL$" role="3clFbG">
<node concept="37vLTw" id="7PuCnELBxCa" role="2Oq$k0">
<ref role="3cqZAo" node="7PuCnEL_XWZ" resolve="parentTreeNodes" />
</node>
<node concept="2es0OD" id="7PuCnELByiD" role="2OqNvi">
<node concept="1bVj0M" id="7PuCnELByiF" role="23t8la">
<node concept="3clFbS" id="7PuCnELByiG" role="1bW5cS">
Expand All @@ -15062,6 +15098,9 @@
</node>
</node>
</node>
<node concept="37vLTw" id="6rydjJtONCQ" role="2Oq$k0">
<ref role="3cqZAo" node="7PuCnEL_XWZ" resolve="parentTreeNodes" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -15095,13 +15134,25 @@
</node>
<node concept="3clFbJ" id="58b0Q1$shCO" role="3cqZAp">
<node concept="3clFbS" id="58b0Q1$shCQ" role="3clFbx">
<node concept="3clFbF" id="7PuCnELBtuq" role="3cqZAp">
<node concept="2OqwBi" id="7PuCnELBtAA" role="3clFbG">
<node concept="37vLTw" id="7PuCnELBtup" role="2Oq$k0">
<node concept="3clFbJ" id="4rAMcYzlevq" role="3cqZAp">
<node concept="3clFbS" id="4rAMcYzlevs" role="3clFbx">
<node concept="3clFbF" id="7PuCnELBtuq" role="3cqZAp">
<node concept="2OqwBi" id="7PuCnELBtAA" role="3clFbG">
<node concept="37vLTw" id="7PuCnELBtup" role="2Oq$k0">
<ref role="3cqZAo" node="7PuCnELAhCw" resolve="parentTreeNode" />
</node>
<node concept="liA8E" id="7PuCnELBul$" role="2OqNvi">
<ref role="37wK5l" to="7e8u:~MPSTreeNode.updateSubTree()" resolve="updateSubTree" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="4rAMcYzkalG" role="3clFbw">
<node concept="37vLTw" id="4rAMcYzk6Fc" role="2Oq$k0">
<ref role="3cqZAo" node="7PuCnELAhCw" resolve="parentTreeNode" />
</node>
<node concept="liA8E" id="7PuCnELBul$" role="2OqNvi">
<ref role="37wK5l" to="7e8u:~MPSTreeNode.updateSubTree()" resolve="updateSubTree" />
<node concept="liA8E" id="4rAMcYzkfHL" role="2OqNvi">
<ref role="37wK5l" node="Ggg0Z743sM" resolve="isInTree" />
</node>
</node>
</node>
Expand Down Expand Up @@ -15206,13 +15257,25 @@
</node>
</node>
</node>
<node concept="3clFbF" id="7PuCnELBuB8" role="3cqZAp">
<node concept="2OqwBi" id="7PuCnELBuJ$" role="3clFbG">
<node concept="37vLTw" id="7PuCnELBuB7" role="2Oq$k0">
<node concept="3clFbJ" id="4rAMcYzmca9" role="3cqZAp">
<node concept="3clFbS" id="4rAMcYzmcab" role="3clFbx">
<node concept="3clFbF" id="7PuCnELBuB8" role="3cqZAp">
<node concept="2OqwBi" id="7PuCnELBuJ$" role="3clFbG">
<node concept="37vLTw" id="7PuCnELBuB7" role="2Oq$k0">
<ref role="3cqZAo" node="7PuCnELAm3c" resolve="treeNode" />
</node>
<node concept="liA8E" id="7PuCnELBvuy" role="2OqNvi">
<ref role="37wK5l" to="7e8u:~MPSTreeNode.renewPresentation()" resolve="renewPresentation" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="4rAMcYzmotO" role="3clFbw">
<node concept="37vLTw" id="4rAMcYzmhV9" role="2Oq$k0">
<ref role="3cqZAo" node="7PuCnELAm3c" resolve="treeNode" />
</node>
<node concept="liA8E" id="7PuCnELBvuy" role="2OqNvi">
<ref role="37wK5l" to="7e8u:~MPSTreeNode.renewPresentation()" resolve="renewPresentation" />
<node concept="liA8E" id="4rAMcYzmtGT" role="2OqNvi">
<ref role="37wK5l" node="Ggg0Z743sM" resolve="isInTree" />
</node>
</node>
</node>
Expand Down
58 changes: 58 additions & 0 deletions ...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,64 @@
</node>
</node>
</node>
<node concept="15bmVD" id="4rAMcYzsxpI" role="15bmVC">
<node concept="15ShDW" id="4rAMcYzsxpJ" role="15bq2Y">
<property role="15ShDY" value="Po4Z58IgAR/August" />
<property role="15ShDw" value="2024" />
</node>
<node concept="15bAme" id="4rAMcYzsxpK" role="15bAlL">
<node concept="2DRihI" id="4rAMcYzsxpL" role="15bAlk">
<node concept="2hgSXJ" id="4rAMcYzsxpM" role="1PaTwD">
<node concept="1PaTwC" id="4rAMcYzsxpN" role="2hiFM$">
<node concept="15Ami3" id="4rAMcYzsxpO" role="1PaTwD">
<node concept="37shsh" id="4rAMcYzsxpP" role="15Aodc">
<node concept="1dCxOk" id="4rAMcYzsxWf" role="37shsm">
<property role="1XweGW" value="732373f1-0d48-4122-bb43-c1606db4baca" />
<property role="1XxBO9" value="com.mbeddr.mpsutil.projectview.runtime" />
</node>
</node>
</node>
<node concept="3oM_SD" id="4rAMcYzsxpR" role="1PaTwD">
<property role="3oM_SC" value=":" />
</node>
</node>
</node>
<node concept="3oM_SD" id="4rAMcYzsy26" role="1PaTwD">
<property role="3oM_SC" value="Fixed" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy2e" role="1PaTwD">
<property role="3oM_SC" value="" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy54" role="1PaTwD">
<property role="3oM_SC" value="several" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy2n" role="1PaTwD">
<property role="3oM_SC" value="NPEs." />
</node>
<node concept="3oM_SD" id="4rAMcYzsy6J" role="1PaTwD">
<property role="3oM_SC" value="See:" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy6Y" role="1PaTwD">
<property role="3oM_SC" value="" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy3y" role="1PaTwD">
<property role="3oM_SC" value="#903," />
<property role="1X82VU" value="https://github.com/JetBrains/MPS-extensions/issues/903" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy3z" role="1PaTwD">
<property role="3oM_SC" value="#904" />
<property role="1X82VU" value="(https://github.com/JetBrains/MPS-extensions/issues/904" />
</node>
<node concept="3oM_SD" id="4rAMcYzsy7e" role="1PaTwD">
<property role="3oM_SC" value="," />
</node>
<node concept="3oM_SD" id="4rAMcYzsy3$" role="1PaTwD">
<property role="3oM_SC" value="#901" />
<property role="1X82VU" value="https://github.com/JetBrains/MPS-extensions/issues/901" />
</node>
</node>
</node>
</node>
<node concept="15bmVD" id="2CZpRVi8gx5" role="15bmVC">
<node concept="15ShDW" id="2CZpRVi8gx2" role="15bq2Y">
<property role="15ShDY" value="Po4Z58IgAJ/July" />
Expand Down

0 comments on commit 2b1e2c0

Please sign in to comment.